diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2311e4c88b9a590dee434a49b2bbbc143f72ff4..ce88fd59f067c7bd4d3f92d6a9e3fb8f6fa04377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## Version 1.1.0
+
+* **Application has been renamed to TASMAN**
+* Managed multiple users configuration: now each user has his/her own credentials configuration and custom UCDs configuration.
+    * **XML configuration format is changed: if you update from previous version you will lost your previous configuration.**
+* Both new users and custom UCDs can now be added using the GUI.
+* Added "Rebuild UCD" functionality on the UCD insertion dialog.
+
 ## Version 1.0.4
 
 ### Updated ucdvalidator into Ucidy 1.0
diff --git a/TapSchemaManagerAPI/pom.xml b/TASMAN-core/pom.xml
similarity index 100%
rename from TapSchemaManagerAPI/pom.xml
rename to TASMAN-core/pom.xml
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ChildEntityImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ChildEntityImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ChildEntityImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ChildEntityImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ColumnImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ColumnImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ColumnImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ColumnImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ConsistencyChecks.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ConsistencyChecks.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ConsistencyChecks.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/ConsistencyChecks.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/Credentials.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/Credentials.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/Credentials.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/Credentials.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DBWrapper.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DBWrapper.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DBWrapper.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DBWrapper.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/Dao.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/Dao.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/Dao.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/Dao.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoColumn.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoColumn.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoColumn.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoColumn.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoKey.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoKey.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoKey.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoKey.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoSchema.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoSchema.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoSchema.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoSchema.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoTable.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoTable.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/DaoTable.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/DaoTable.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EditableProperty.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EditableProperty.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EditableProperty.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EditableProperty.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EntityProperty.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EntityProperty.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EntityProperty.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EntityProperty.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EntityPropertyInfo.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EntityPropertyInfo.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EntityPropertyInfo.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/EntityPropertyInfo.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/FixedEntityProperty.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/FixedEntityProperty.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/FixedEntityProperty.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/FixedEntityProperty.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InconsistentTapSchemaException.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InconsistentTapSchemaException.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InconsistentTapSchemaException.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InconsistentTapSchemaException.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InconsistentValue.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InconsistentValue.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InconsistentValue.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InconsistentValue.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InsertQueryBuilder.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InsertQueryBuilder.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InsertQueryBuilder.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/InsertQueryBuilder.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/KeyColumnImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/KeyColumnImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/KeyColumnImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/KeyColumnImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/KeyImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/KeyImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/KeyImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/KeyImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/SchemaImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/SchemaImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/SchemaImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/SchemaImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/SelectQueryBuilder.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/SelectQueryBuilder.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/SelectQueryBuilder.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/SelectQueryBuilder.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TSMUtil.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TSMUtil.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TSMUtil.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TSMUtil.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TableImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TableImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TableImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TableImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaEntityImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaEntityImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaEntityImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaEntityImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaFactory.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaFactory.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaFactory.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaFactory.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaImpl.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaImpl.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TapSchemaImpl.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/TapSchemaImpl.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/UpdateOperations.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/UpdateOperations.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/UpdateOperations.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/UpdateOperations.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/UpdateQueryBuilder.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/UpdateQueryBuilder.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/UpdateQueryBuilder.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/UpdateQueryBuilder.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/ChildEntity.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/ChildEntity.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/ChildEntity.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/ChildEntity.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Column.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Column.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Column.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Column.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/DatabaseType.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/DatabaseType.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/DatabaseType.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/DatabaseType.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/EntitiesContainer.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/EntitiesContainer.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/EntitiesContainer.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/EntitiesContainer.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Key.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Key.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Key.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Key.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/KeyColumn.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/KeyColumn.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/KeyColumn.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/KeyColumn.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Schema.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Schema.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Schema.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Schema.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Status.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Status.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Status.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Status.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Table.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Table.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/Table.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/Table.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchema.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchema.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchema.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchema.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaEntity.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaEntity.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaEntity.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaEntity.java
diff --git a/TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaVersion.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaVersion.java
similarity index 100%
rename from TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaVersion.java
rename to TASMAN-core/src/main/java/it/inaf/ia2/tsm/api/contract/TapSchemaVersion.java
diff --git a/TapSchemaManagerAPI/src/main/resources/log4j.properties b/TASMAN-core/src/main/resources/log4j.properties
similarity index 100%
rename from TapSchemaManagerAPI/src/main/resources/log4j.properties
rename to TASMAN-core/src/main/resources/log4j.properties
diff --git a/TapSchemaManagerAPI/src/test/java/it/inaf/ia2/tsm/api/TestAll.java b/TASMAN-core/src/test/java/it/inaf/ia2/tsm/api/TestAll.java
similarity index 100%
rename from TapSchemaManagerAPI/src/test/java/it/inaf/ia2/tsm/api/TestAll.java
rename to TASMAN-core/src/test/java/it/inaf/ia2/tsm/api/TestAll.java
diff --git a/TapSchemaManagerWebApp/pom.xml b/TASMAN-webapp/pom.xml
similarity index 100%
rename from TapSchemaManagerWebApp/pom.xml
rename to TASMAN-webapp/pom.xml
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ConfigurationData.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConfigurationData.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ConfigurationData.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConfigurationData.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ConsistencyChecksBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConsistencyChecksBean.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ConsistencyChecksBean.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConsistencyChecksBean.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsDialogResource.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsDialogResource.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsDialogResource.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsDialogResource.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsEditing.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsEditing.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsEditing.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsEditing.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CustomizedUCDParser.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CustomizedUCDParser.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/CustomizedUCDParser.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CustomizedUCDParser.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/FirstSetup.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/FirstSetup.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/FirstSetup.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/FirstSetup.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/Login.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/Login.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/Login.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/Login.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ParsedUCD.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ParsedUCD.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/ParsedUCD.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ParsedUCD.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SchemaSelectionBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SchemaSelectionBean.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SchemaSelectionBean.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SchemaSelectionBean.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCD.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCD.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCD.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCD.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCDDialog.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCDDialog.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCDDialog.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SearchUCDDialog.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SeparateCredentials.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SeparateCredentials.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/SeparateCredentials.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/SeparateCredentials.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDEditor.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDEditor.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDEditor.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDEditor.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDInfo.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDInfo.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDInfo.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDInfo.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDServiceException.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDServiceException.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UCDServiceException.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UCDServiceException.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/User.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/User.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/User.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/User.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UsersEditing.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UsersEditing.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/UsersEditing.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/UsersEditing.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/VOUnitValidator.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/VOUnitValidator.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/VOUnitValidator.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/VOUnitValidator.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/Version.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/Version.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/Version.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/Version.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/checker/FirstSetupChecker.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/checker/FirstSetupChecker.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/checker/FirstSetupChecker.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/checker/FirstSetupChecker.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/checker/LoggedInChecker.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/checker/LoggedInChecker.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/checker/LoggedInChecker.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/checker/LoggedInChecker.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/ApplicationConfig.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/ApplicationConfig.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/ApplicationConfig.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/ApplicationConfig.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialResponseWriter.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialResponseWriter.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialResponseWriter.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialResponseWriter.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextFactory.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextFactory.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextFactory.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextFactory.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextWrapper.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextWrapper.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextWrapper.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/CustomPartialViewContextWrapper.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/JSUpdateHandler.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/JSUpdateHandler.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/JSUpdateHandler.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/JSUpdateHandler.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveBean.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveBean.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveBean.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveResource.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveResource.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveResource.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/KeepAliveResource.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/NullOrEmptyConverter.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/NullOrEmptyConverter.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/NullOrEmptyConverter.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/NullOrEmptyConverter.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/TSMResourceHandlerWrapper.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/TSMResourceHandlerWrapper.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/env/TSMResourceHandlerWrapper.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/env/TSMResourceHandlerWrapper.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/Configuration.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/Configuration.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/Configuration.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/Configuration.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UCDConfiguration.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UCDConfiguration.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UCDConfiguration.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UCDConfiguration.java
diff --git a/TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UserConfiguration.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UserConfiguration.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UserConfiguration.java
rename to TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/xmlconfig/UserConfiguration.java
diff --git a/TapSchemaManagerWebApp/src/main/resources/log4j.properties b/TASMAN-webapp/src/main/resources/log4j.properties
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/resources/log4j.properties
rename to TASMAN-webapp/src/main/resources/log4j.properties
diff --git a/TapSchemaManagerWebApp/src/main/resources/version.txt b/TASMAN-webapp/src/main/resources/version.txt
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/resources/version.txt
rename to TASMAN-webapp/src/main/resources/version.txt
diff --git a/TapSchemaManagerWebApp/src/main/resources/webapp.properties b/TASMAN-webapp/src/main/resources/webapp.properties
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/resources/webapp.properties
rename to TASMAN-webapp/src/main/resources/webapp.properties
diff --git a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/beans.xml b/TASMAN-webapp/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/WEB-INF/beans.xml
rename to TASMAN-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/faces-config.xml b/TASMAN-webapp/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/WEB-INF/faces-config.xml
rename to TASMAN-webapp/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml b/TASMAN-webapp/src/main/webapp/WEB-INF/templates/master.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml
rename to TASMAN-webapp/src/main/webapp/WEB-INF/templates/master.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/web.xml b/TASMAN-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/WEB-INF/web.xml
rename to TASMAN-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml b/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml
rename to TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/credentialsEditing.xhtml b/TASMAN-webapp/src/main/webapp/credentialsEditing.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/credentialsEditing.xhtml
rename to TASMAN-webapp/src/main/webapp/credentialsEditing.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/expired.xhtml b/TASMAN-webapp/src/main/webapp/expired.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/expired.xhtml
rename to TASMAN-webapp/src/main/webapp/expired.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/index.xhtml b/TASMAN-webapp/src/main/webapp/index.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/index.xhtml
rename to TASMAN-webapp/src/main/webapp/index.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/css/animation.css b/TASMAN-webapp/src/main/webapp/resources/css/animation.css
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/css/animation.css
rename to TASMAN-webapp/src/main/webapp/resources/css/animation.css
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap-theme.min.css b/TASMAN-webapp/src/main/webapp/resources/css/bootstrap-theme.min.css
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap-theme.min.css
rename to TASMAN-webapp/src/main/webapp/resources/css/bootstrap-theme.min.css
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap.css b/TASMAN-webapp/src/main/webapp/resources/css/bootstrap.css
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap.css
rename to TASMAN-webapp/src/main/webapp/resources/css/bootstrap.css
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/css/fontello.css b/TASMAN-webapp/src/main/webapp/resources/css/fontello.css
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/css/fontello.css
rename to TASMAN-webapp/src/main/webapp/resources/css/fontello.css
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/css/style.css b/TASMAN-webapp/src/main/webapp/resources/css/style.css
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/css/style.css
rename to TASMAN-webapp/src/main/webapp/resources/css/style.css
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.eot b/TASMAN-webapp/src/main/webapp/resources/fonts/fontello.eot
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.eot
rename to TASMAN-webapp/src/main/webapp/resources/fonts/fontello.eot
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.svg b/TASMAN-webapp/src/main/webapp/resources/fonts/fontello.svg
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.svg
rename to TASMAN-webapp/src/main/webapp/resources/fonts/fontello.svg
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.ttf b/TASMAN-webapp/src/main/webapp/resources/fonts/fontello.ttf
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.ttf
rename to TASMAN-webapp/src/main/webapp/resources/fonts/fontello.ttf
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.woff b/TASMAN-webapp/src/main/webapp/resources/fonts/fontello.woff
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.woff
rename to TASMAN-webapp/src/main/webapp/resources/fonts/fontello.woff
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot b/TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot
rename to TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg b/TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg
rename to TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf b/TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf
rename to TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff b/TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff
rename to TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 b/TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2
rename to TASMAN-webapp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/credentials.js b/TASMAN-webapp/src/main/webapp/resources/js/credentials.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/credentials.js
rename to TASMAN-webapp/src/main/webapp/resources/js/credentials.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js b/TASMAN-webapp/src/main/webapp/resources/js/edit-tapschema.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js
rename to TASMAN-webapp/src/main/webapp/resources/js/edit-tapschema.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/keepalive.js b/TASMAN-webapp/src/main/webapp/resources/js/keepalive.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/keepalive.js
rename to TASMAN-webapp/src/main/webapp/resources/js/keepalive.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/bootstrap.min.js b/TASMAN-webapp/src/main/webapp/resources/js/lib/bootstrap.min.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/bootstrap.min.js
rename to TASMAN-webapp/src/main/webapp/resources/js/lib/bootstrap.min.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js b/TASMAN-webapp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js
rename to TASMAN-webapp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/login.js b/TASMAN-webapp/src/main/webapp/resources/js/login.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/login.js
rename to TASMAN-webapp/src/main/webapp/resources/js/login.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/script.js b/TASMAN-webapp/src/main/webapp/resources/js/script.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/script.js
rename to TASMAN-webapp/src/main/webapp/resources/js/script.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/ucd-editor.js b/TASMAN-webapp/src/main/webapp/resources/js/ucd-editor.js
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/js/ucd-editor.js
rename to TASMAN-webapp/src/main/webapp/resources/js/ucd-editor.js
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/tsm_components/ucd_editor.xhtml b/TASMAN-webapp/src/main/webapp/resources/tsm_components/ucd_editor.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/tsm_components/ucd_editor.xhtml
rename to TASMAN-webapp/src/main/webapp/resources/tsm_components/ucd_editor.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/tsm_components/user_navbar.xhtml b/TASMAN-webapp/src/main/webapp/resources/tsm_components/user_navbar.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/resources/tsm_components/user_navbar.xhtml
rename to TASMAN-webapp/src/main/webapp/resources/tsm_components/user_navbar.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml b/TASMAN-webapp/src/main/webapp/schemaSelection.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml
rename to TASMAN-webapp/src/main/webapp/schemaSelection.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/setup.xhtml b/TASMAN-webapp/src/main/webapp/setup.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/setup.xhtml
rename to TASMAN-webapp/src/main/webapp/setup.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml b/TASMAN-webapp/src/main/webapp/tapSchemaEditing.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml
rename to TASMAN-webapp/src/main/webapp/tapSchemaEditing.xhtml
diff --git a/TapSchemaManagerWebApp/src/main/webapp/usersEditing.xhtml b/TASMAN-webapp/src/main/webapp/usersEditing.xhtml
similarity index 100%
rename from TapSchemaManagerWebApp/src/main/webapp/usersEditing.xhtml
rename to TASMAN-webapp/src/main/webapp/usersEditing.xhtml
diff --git a/TapSchemaManagerWebApp/src/test/java/TapSchemaMangerTest.java b/TASMAN-webapp/src/test/java/TapSchemaMangerTest.java
similarity index 100%
rename from TapSchemaManagerWebApp/src/test/java/TapSchemaMangerTest.java
rename to TASMAN-webapp/src/test/java/TapSchemaMangerTest.java