diff --git a/.classpath b/.classpath
index c97c8e3..70f4612 100644
--- a/.classpath
+++ b/.classpath
@@ -22,12 +22,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="com.gwtplugins.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
@@ -36,5 +30,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5dd063a..2fa115f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,21 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-        
-    <wb-module deploy-name="messages-2.5.0-SNAPSHOT">
-                
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                
-        <property name="java-output-path" value="/message-conversations/target/message-conversations-0.0.1-SNAPSHOT/WEB-INF/classes"/>
-                
-        <property name="context-root" value="messages"/>
-            
-    </wb-module>
+                    
     
+    
+    
+    <wb-module deploy-name="messages">
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+                                        
+        
+        
+        
+        <property name="java-output-path" value="/message-conversations/target/message-conversations-0.0.1-SNAPSHOT/WEB-INF/classes"/>
+                                        
+        
+        
+        
+        <property name="context-root" value="messages"/>
+                                    
+    
+    
+    
+    </wb-module>
+                
+
+
+
 </project-modules>
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c83215e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,39 @@
+
+# Changelog for Share-Updates Portlet
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v2.5.0-SNAPSHOT] -2021-04-14
+
+- Ported to git
+
+- Remove HomeLibrary dependency and replace with storage hub one
+
+## [v2.4.0] -2019-10-25
+
+- Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below
+
+- Incident #17778 direct download attachment does not work
+
+## [v2.3.0] - 2019-02-28
+
+- Feature #10068, Request for enhancement: new Messages is error prone and challenging to use
+
+- Feature #16194, Isolate Gateway user list in Messages
+
+## [v2.1.0] - 2018-06-14"
+
+- Updated Workspace Explorer dependency
+
+- Added support for SendTo
+
+## [v2.0.0] -2 017-09-21
+
+- Improved look and feel
+
+- Responsive, works on mobile
+
+## [v1.0.0] - 2013-01-13
+
+- First release
diff --git a/FUNDING.md b/FUNDING.md
new file mode 100644
index 0000000..6fa9eac
--- /dev/null
+++ b/FUNDING.md
@@ -0,0 +1,26 @@
+# Acknowledgments
+
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme 
+    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index 2d9616a..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-${gcube.license}
\ No newline at end of file
diff --git a/distro/README b/distro/README
deleted file mode 100644
index 619958c..0000000
--- a/distro/README
+++ /dev/null
@@ -1,61 +0,0 @@
-The gCube System - ${name}
---------------------------------------------------
- 
-${description}
- 
- 
-${gcube.description}
- 
-${gcube.funding}
- 
- 
-Version
---------------------------------------------------
- 
-${version} (${buildDate})
- 
-Please see the file named "changelog.xml" in this directory for the release notes.
- 
- 
-Authors
---------------------------------------------------
- 
-* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
- 
-Maintainers
------------
- 
-* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
-* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
- 
-Download information
---------------------------------------------------
- 
-Source code is available from SVN: 
-    ${scm.url}
- 
-Binaries can be downloaded from the gCube website: 
-   ${gcube.website}
- 
- 
-Installation
---------------------------------------------------
-
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/Workspace
- 
-Support 
---------------------------------------------------
- 
-Bugs and support requests can be reported in the gCube issue tracking tool:
-    ${gcube.issueTracking}
- 
- 
-Licensing
---------------------------------------------------
- 
-This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index 506a2cc..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="org.gcube.portlets-user.messages.2-4-0"
-		date="2019-10-25">
-		<Change>Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below</Change>
-		<Change>Incident #17778 direct download attachment does not work</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.2-3-0"
-		date="2019-02-28">
-		<Change>Feature #10068, Request for enhancement: new Messages is error prone and challenging to use</Change>
-		<Change>Feature #16194, Isolate Gateway user list in Messages</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.2-1-0"
-		date="2018-06-14">
-		<Change>Updated Workspace Explorer dependency</Change>
-		<Change>Added support for SendTo</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.2-0-0"
-		date="2017-09-21">
-		<Change>Improved look and feel</Change>
-		<Change>Responsive, works on mobile</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.1-3-0"
-		date="2016-11-28">
-		<Change>Removed ASL Session</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-8-0"
-		date="2015-10-08">
-		<Change>[Feature #879] Message Improvements</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-7-0"
-		date="2015-06-05">
-		<Change>Upgraded to GWT 2.7</Change>
-		<Change>[Feature #129] Porting to HL 2.0</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-6-0"
-		date="2013-06-04">
-		<Change>Fixed bug on "reply all"</Change>
-		<Change>Changed icons</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-5-0"
-		date="2013-06-04">
-		<Change>Updated pom to support new gcube core (gcube release 3.2)
-		</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-4-0"
-		date="2013-10-21">
-		<Change>#Ticket 2223. This project was enhancements to gwt 2.5.1
-		</Change>
-		<Change>GCF dependency was removed</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-3-0"
-		date="2013-07-08">
-		<Change>Updated show attachments: this functionality now calls the
-			servlet contained in ws-tree
-		</Change>
-		<Change>Error management for attachments: it was added redirect
-			functionality in download servlet
-		</Change>
-		<Change>Fixed Ticket #1348</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portlets-user.messages.0-1-0"
-		date="2013-01-13">
-		<Change>First Release</Change>
-	</Changeset>
-</ReleaseNotes>
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index c597cd2..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-                                <include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-
-	</files>
-</assembly>
diff --git a/distro/profile.xml b/distro/profile.xml
deleted file mode 100644
index 51c3b6b..0000000
--- a/distro/profile.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID></ID>
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>PortletUser</Class>
-		<Name>${artifactId}</Name>
-		<Version>${version}</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>target/${build.finalName}.war</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>