diff --git a/.classpath b/.classpath
index 7982963..6b22d32 100644
--- a/.classpath
+++ b/.classpath
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="test/src">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -35,5 +15,31 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/testResources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index 498e3c0..1e02cb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,16 +218,16 @@
 		</dependency>
 	</dependencies>
 	<build>
-		<sourceDirectory>src</sourceDirectory>
+		<sourceDirectory>src/main</sourceDirectory>
 		<resources>
 			<resource>
 				<directory>${basedir}/src/resources</directory>
 			</resource>
 		</resources>
-		<testSourceDirectory>test/src</testSourceDirectory>
+		<testSourceDirectory>src/test</testSourceDirectory>
 		<testResources>
 			<testResource>
-				<directory>${basedir}/test/resources</directory>
+				<directory>${basedir}/src/testResources</directory>
 			</testResource>
 		</testResources>
 		<plugins>
diff --git a/src/org/atriasoft/archidata/UpdateJwtPublicKey.java b/src/main/org/atriasoft/archidata/UpdateJwtPublicKey.java
similarity index 100%
rename from src/org/atriasoft/archidata/UpdateJwtPublicKey.java
rename to src/main/org/atriasoft/archidata/UpdateJwtPublicKey.java
diff --git a/src/org/atriasoft/archidata/annotation/AnnotationTools.java b/src/main/org/atriasoft/archidata/annotation/AnnotationTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/AnnotationTools.java
rename to src/main/org/atriasoft/archidata/annotation/AnnotationTools.java
diff --git a/src/org/atriasoft/archidata/annotation/CreationTimestamp.java b/src/main/org/atriasoft/archidata/annotation/CreationTimestamp.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/CreationTimestamp.java
rename to src/main/org/atriasoft/archidata/annotation/CreationTimestamp.java
diff --git a/src/org/atriasoft/archidata/annotation/DataDeleted.java b/src/main/org/atriasoft/archidata/annotation/DataDeleted.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/DataDeleted.java
rename to src/main/org/atriasoft/archidata/annotation/DataDeleted.java
diff --git a/src/org/atriasoft/archidata/annotation/DataIfNotExists.java b/src/main/org/atriasoft/archidata/annotation/DataIfNotExists.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/DataIfNotExists.java
rename to src/main/org/atriasoft/archidata/annotation/DataIfNotExists.java
diff --git a/src/org/atriasoft/archidata/annotation/DataJson.java b/src/main/org/atriasoft/archidata/annotation/DataJson.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/DataJson.java
rename to src/main/org/atriasoft/archidata/annotation/DataJson.java
diff --git a/src/org/atriasoft/archidata/annotation/DataNotRead.java b/src/main/org/atriasoft/archidata/annotation/DataNotRead.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/DataNotRead.java
rename to src/main/org/atriasoft/archidata/annotation/DataNotRead.java
diff --git a/src/org/atriasoft/archidata/annotation/UpdateTimestamp.java b/src/main/org/atriasoft/archidata/annotation/UpdateTimestamp.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/UpdateTimestamp.java
rename to src/main/org/atriasoft/archidata/annotation/UpdateTimestamp.java
diff --git a/src/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java b/src/main/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java
rename to src/main/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java
diff --git a/src/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java b/src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java
rename to src/main/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java b/src/main/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java b/src/main/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/Checker.java b/src/main/org/atriasoft/archidata/annotation/checker/Checker.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/Checker.java
rename to src/main/org/atriasoft/archidata/annotation/checker/Checker.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java b/src/main/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java
rename to src/main/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java b/src/main/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java
rename to src/main/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java
diff --git a/src/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java b/src/main/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java
rename to src/main/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java
diff --git a/src/org/atriasoft/archidata/annotation/method/ARCHIVE.java b/src/main/org/atriasoft/archidata/annotation/method/ARCHIVE.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/method/ARCHIVE.java
rename to src/main/org/atriasoft/archidata/annotation/method/ARCHIVE.java
diff --git a/src/org/atriasoft/archidata/annotation/method/RESTORE.java b/src/main/org/atriasoft/archidata/annotation/method/RESTORE.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/method/RESTORE.java
rename to src/main/org/atriasoft/archidata/annotation/method/RESTORE.java
diff --git a/src/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java b/src/main/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java
similarity index 100%
rename from src/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java
rename to src/main/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java
diff --git a/src/org/atriasoft/archidata/api/DataResource.java b/src/main/org/atriasoft/archidata/api/DataResource.java
similarity index 100%
rename from src/org/atriasoft/archidata/api/DataResource.java
rename to src/main/org/atriasoft/archidata/api/DataResource.java
diff --git a/src/org/atriasoft/archidata/api/FrontGeneric.java b/src/main/org/atriasoft/archidata/api/FrontGeneric.java
similarity index 100%
rename from src/org/atriasoft/archidata/api/FrontGeneric.java
rename to src/main/org/atriasoft/archidata/api/FrontGeneric.java
diff --git a/src/org/atriasoft/archidata/api/MediaStreamer.java b/src/main/org/atriasoft/archidata/api/MediaStreamer.java
similarity index 100%
rename from src/org/atriasoft/archidata/api/MediaStreamer.java
rename to src/main/org/atriasoft/archidata/api/MediaStreamer.java
diff --git a/src/org/atriasoft/archidata/api/ProxyResource.java b/src/main/org/atriasoft/archidata/api/ProxyResource.java
similarity index 100%
rename from src/org/atriasoft/archidata/api/ProxyResource.java
rename to src/main/org/atriasoft/archidata/api/ProxyResource.java
diff --git a/src/org/atriasoft/archidata/api/openApiResource.java b/src/main/org/atriasoft/archidata/api/openApiResource.java
similarity index 100%
rename from src/org/atriasoft/archidata/api/openApiResource.java
rename to src/main/org/atriasoft/archidata/api/openApiResource.java
diff --git a/src/org/atriasoft/archidata/backup/BackupEngine.java b/src/main/org/atriasoft/archidata/backup/BackupEngine.java
similarity index 100%
rename from src/org/atriasoft/archidata/backup/BackupEngine.java
rename to src/main/org/atriasoft/archidata/backup/BackupEngine.java
diff --git a/src/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/ExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/ExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/ExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/ExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/FailExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/FailExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/FailExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/FailExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/GenericCatcher.java b/src/main/org/atriasoft/archidata/catcher/GenericCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/GenericCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/GenericCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/InputExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/InputExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/InputExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/InputExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/RestErrorResponse.java b/src/main/org/atriasoft/archidata/catcher/RestErrorResponse.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/RestErrorResponse.java
rename to src/main/org/atriasoft/archidata/catcher/RestErrorResponse.java
diff --git a/src/org/atriasoft/archidata/catcher/RestInputError.java b/src/main/org/atriasoft/archidata/catcher/RestInputError.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/RestInputError.java
rename to src/main/org/atriasoft/archidata/catcher/RestInputError.java
diff --git a/src/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java b/src/main/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java
similarity index 100%
rename from src/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java
rename to src/main/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java
diff --git a/src/org/atriasoft/archidata/checker/CheckJPA.java b/src/main/org/atriasoft/archidata/checker/CheckJPA.java
similarity index 100%
rename from src/org/atriasoft/archidata/checker/CheckJPA.java
rename to src/main/org/atriasoft/archidata/checker/CheckJPA.java
diff --git a/src/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java b/src/main/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java
rename to src/main/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java
diff --git a/src/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java b/src/main/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java
rename to src/main/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/DateDeserializer.java b/src/main/org/atriasoft/archidata/converter/jackson/DateDeserializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/DateDeserializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/DateDeserializer.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/DateSerializer.java b/src/main/org/atriasoft/archidata/converter/jackson/DateSerializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/DateSerializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/DateSerializer.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/JacksonModules.java b/src/main/org/atriasoft/archidata/converter/jackson/JacksonModules.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/JacksonModules.java
rename to src/main/org/atriasoft/archidata/converter/jackson/JacksonModules.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java b/src/main/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java b/src/main/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java b/src/main/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java
diff --git a/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java b/src/main/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java
rename to src/main/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java
diff --git a/src/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java b/src/main/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java
similarity index 100%
rename from src/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java
rename to src/main/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java
diff --git a/src/org/atriasoft/archidata/dataAccess/CountInOut.java b/src/main/org/atriasoft/archidata/dataAccess/CountInOut.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/CountInOut.java
rename to src/main/org/atriasoft/archidata/dataAccess/CountInOut.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DBAccess.java b/src/main/org/atriasoft/archidata/dataAccess/DBAccess.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DBAccess.java
rename to src/main/org/atriasoft/archidata/dataAccess/DBAccess.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java b/src/main/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java
rename to src/main/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DBAccessSQL.java b/src/main/org/atriasoft/archidata/dataAccess/DBAccessSQL.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DBAccessSQL.java
rename to src/main/org/atriasoft/archidata/dataAccess/DBAccessSQL.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DataAccess.java b/src/main/org/atriasoft/archidata/dataAccess/DataAccess.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DataAccess.java
rename to src/main/org/atriasoft/archidata/dataAccess/DataAccess.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DataExport.java b/src/main/org/atriasoft/archidata/dataAccess/DataExport.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DataExport.java
rename to src/main/org/atriasoft/archidata/dataAccess/DataExport.java
diff --git a/src/org/atriasoft/archidata/dataAccess/DataFactory.java b/src/main/org/atriasoft/archidata/dataAccess/DataFactory.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/DataFactory.java
rename to src/main/org/atriasoft/archidata/dataAccess/DataFactory.java
diff --git a/src/org/atriasoft/archidata/dataAccess/Foreign.java b/src/main/org/atriasoft/archidata/dataAccess/Foreign.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/Foreign.java
rename to src/main/org/atriasoft/archidata/dataAccess/Foreign.java
diff --git a/src/org/atriasoft/archidata/dataAccess/LazyGetter.java b/src/main/org/atriasoft/archidata/dataAccess/LazyGetter.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/LazyGetter.java
rename to src/main/org/atriasoft/archidata/dataAccess/LazyGetter.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryAnd.java b/src/main/org/atriasoft/archidata/dataAccess/QueryAnd.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryAnd.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryAnd.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryCondition.java b/src/main/org/atriasoft/archidata/dataAccess/QueryCondition.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryCondition.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryCondition.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryInList.java b/src/main/org/atriasoft/archidata/dataAccess/QueryInList.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryInList.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryInList.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryItem.java b/src/main/org/atriasoft/archidata/dataAccess/QueryItem.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryItem.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryItem.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryNoInList.java b/src/main/org/atriasoft/archidata/dataAccess/QueryNoInList.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryNoInList.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryNoInList.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryNotNull.java b/src/main/org/atriasoft/archidata/dataAccess/QueryNotNull.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryNotNull.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryNotNull.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryNull.java b/src/main/org/atriasoft/archidata/dataAccess/QueryNull.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryNull.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryNull.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryOptions.java b/src/main/org/atriasoft/archidata/dataAccess/QueryOptions.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryOptions.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryOptions.java
diff --git a/src/org/atriasoft/archidata/dataAccess/QueryOr.java b/src/main/org/atriasoft/archidata/dataAccess/QueryOr.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/QueryOr.java
rename to src/main/org/atriasoft/archidata/dataAccess/QueryOr.java
diff --git a/src/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java b/src/main/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java
rename to src/main/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java b/src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java b/src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java b/src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java b/src/main/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java
diff --git a/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java b/src/main/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java
rename to src/main/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java
diff --git a/src/org/atriasoft/archidata/dataAccess/exportTools/README.md b/src/main/org/atriasoft/archidata/dataAccess/exportTools/README.md
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/exportTools/README.md
rename to src/main/org/atriasoft/archidata/dataAccess/exportTools/README.md
diff --git a/src/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java b/src/main/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java
rename to src/main/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java
diff --git a/src/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java b/src/main/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java
rename to src/main/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java b/src/main/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/CheckFunction.java b/src/main/org/atriasoft/archidata/dataAccess/options/CheckFunction.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/CheckFunction.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/CheckFunction.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java b/src/main/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java b/src/main/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/Condition.java b/src/main/org/atriasoft/archidata/dataAccess/options/Condition.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/Condition.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/Condition.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java b/src/main/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java b/src/main/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java b/src/main/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/FilterValue.java b/src/main/org/atriasoft/archidata/dataAccess/options/FilterValue.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/FilterValue.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/FilterValue.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/GroupBy.java b/src/main/org/atriasoft/archidata/dataAccess/options/GroupBy.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/GroupBy.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/GroupBy.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/Limit.java b/src/main/org/atriasoft/archidata/dataAccess/options/Limit.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/Limit.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/Limit.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java b/src/main/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java b/src/main/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/OrderBy.java b/src/main/org/atriasoft/archidata/dataAccess/options/OrderBy.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/OrderBy.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/OrderBy.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/OrderItem.java b/src/main/org/atriasoft/archidata/dataAccess/options/OrderItem.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/OrderItem.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/OrderItem.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java b/src/main/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/QueryOption.java b/src/main/org/atriasoft/archidata/dataAccess/options/QueryOption.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/QueryOption.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/QueryOption.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java b/src/main/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java
diff --git a/src/org/atriasoft/archidata/dataAccess/options/TransmitKey.java b/src/main/org/atriasoft/archidata/dataAccess/options/TransmitKey.java
similarity index 100%
rename from src/org/atriasoft/archidata/dataAccess/options/TransmitKey.java
rename to src/main/org/atriasoft/archidata/dataAccess/options/TransmitKey.java
diff --git a/src/org/atriasoft/archidata/db/DbConfig.java b/src/main/org/atriasoft/archidata/db/DbConfig.java
similarity index 100%
rename from src/org/atriasoft/archidata/db/DbConfig.java
rename to src/main/org/atriasoft/archidata/db/DbConfig.java
diff --git a/src/org/atriasoft/archidata/db/DbIo.java b/src/main/org/atriasoft/archidata/db/DbIo.java
similarity index 100%
rename from src/org/atriasoft/archidata/db/DbIo.java
rename to src/main/org/atriasoft/archidata/db/DbIo.java
diff --git a/src/org/atriasoft/archidata/db/DbIoFactory.java b/src/main/org/atriasoft/archidata/db/DbIoFactory.java
similarity index 100%
rename from src/org/atriasoft/archidata/db/DbIoFactory.java
rename to src/main/org/atriasoft/archidata/db/DbIoFactory.java
diff --git a/src/org/atriasoft/archidata/db/DbIoMorphia.java b/src/main/org/atriasoft/archidata/db/DbIoMorphia.java
similarity index 100%
rename from src/org/atriasoft/archidata/db/DbIoMorphia.java
rename to src/main/org/atriasoft/archidata/db/DbIoMorphia.java
diff --git a/src/org/atriasoft/archidata/db/DbIoSql.java b/src/main/org/atriasoft/archidata/db/DbIoSql.java
similarity index 100%
rename from src/org/atriasoft/archidata/db/DbIoSql.java
rename to src/main/org/atriasoft/archidata/db/DbIoSql.java
diff --git a/src/org/atriasoft/archidata/exception/DataAccessException.java b/src/main/org/atriasoft/archidata/exception/DataAccessException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/DataAccessException.java
rename to src/main/org/atriasoft/archidata/exception/DataAccessException.java
diff --git a/src/org/atriasoft/archidata/exception/FailException.java b/src/main/org/atriasoft/archidata/exception/FailException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/FailException.java
rename to src/main/org/atriasoft/archidata/exception/FailException.java
diff --git a/src/org/atriasoft/archidata/exception/InputException.java b/src/main/org/atriasoft/archidata/exception/InputException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/InputException.java
rename to src/main/org/atriasoft/archidata/exception/InputException.java
diff --git a/src/org/atriasoft/archidata/exception/NotFoundException.java b/src/main/org/atriasoft/archidata/exception/NotFoundException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/NotFoundException.java
rename to src/main/org/atriasoft/archidata/exception/NotFoundException.java
diff --git a/src/org/atriasoft/archidata/exception/RESTErrorResponseException.java b/src/main/org/atriasoft/archidata/exception/RESTErrorResponseException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/RESTErrorResponseException.java
rename to src/main/org/atriasoft/archidata/exception/RESTErrorResponseException.java
diff --git a/src/org/atriasoft/archidata/exception/SystemException.java b/src/main/org/atriasoft/archidata/exception/SystemException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/SystemException.java
rename to src/main/org/atriasoft/archidata/exception/SystemException.java
diff --git a/src/org/atriasoft/archidata/exception/UnAuthorizedException.java b/src/main/org/atriasoft/archidata/exception/UnAuthorizedException.java
similarity index 100%
rename from src/org/atriasoft/archidata/exception/UnAuthorizedException.java
rename to src/main/org/atriasoft/archidata/exception/UnAuthorizedException.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java b/src/main/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java
rename to src/main/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java b/src/main/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java
rename to src/main/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java b/src/main/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java
rename to src/main/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java b/src/main/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java
rename to src/main/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java b/src/main/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java
rename to src/main/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java b/src/main/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java
rename to src/main/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java b/src/main/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java
rename to src/main/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ApiModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ApiModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ApiModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ApiModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ApiTool.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ApiTool.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ApiTool.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ApiTool.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ClassModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ClassModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ClassModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ClassModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java b/src/main/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java b/src/main/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java
rename to src/main/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java b/src/main/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java
rename to src/main/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java b/src/main/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java
rename to src/main/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java
diff --git a/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java b/src/main/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java
similarity index 100%
rename from src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java
rename to src/main/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java
diff --git a/src/org/atriasoft/archidata/filter/AuthenticationFilter.java b/src/main/org/atriasoft/archidata/filter/AuthenticationFilter.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/AuthenticationFilter.java
rename to src/main/org/atriasoft/archidata/filter/AuthenticationFilter.java
diff --git a/src/org/atriasoft/archidata/filter/CORSFilter.java b/src/main/org/atriasoft/archidata/filter/CORSFilter.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/CORSFilter.java
rename to src/main/org/atriasoft/archidata/filter/CORSFilter.java
diff --git a/src/org/atriasoft/archidata/filter/GenericContext.java b/src/main/org/atriasoft/archidata/filter/GenericContext.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/GenericContext.java
rename to src/main/org/atriasoft/archidata/filter/GenericContext.java
diff --git a/src/org/atriasoft/archidata/filter/MySecurityContext.java b/src/main/org/atriasoft/archidata/filter/MySecurityContext.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/MySecurityContext.java
rename to src/main/org/atriasoft/archidata/filter/MySecurityContext.java
diff --git a/src/org/atriasoft/archidata/filter/OptionFilter.java b/src/main/org/atriasoft/archidata/filter/OptionFilter.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/OptionFilter.java
rename to src/main/org/atriasoft/archidata/filter/OptionFilter.java
diff --git a/src/org/atriasoft/archidata/filter/PartRight.java b/src/main/org/atriasoft/archidata/filter/PartRight.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/PartRight.java
rename to src/main/org/atriasoft/archidata/filter/PartRight.java
diff --git a/src/org/atriasoft/archidata/filter/RightSafeCaster.java b/src/main/org/atriasoft/archidata/filter/RightSafeCaster.java
similarity index 100%
rename from src/org/atriasoft/archidata/filter/RightSafeCaster.java
rename to src/main/org/atriasoft/archidata/filter/RightSafeCaster.java
diff --git a/src/org/atriasoft/archidata/migration/AsyncCall.java b/src/main/org/atriasoft/archidata/migration/AsyncCall.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/AsyncCall.java
rename to src/main/org/atriasoft/archidata/migration/AsyncCall.java
diff --git a/src/org/atriasoft/archidata/migration/MigrationEngine.java b/src/main/org/atriasoft/archidata/migration/MigrationEngine.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/MigrationEngine.java
rename to src/main/org/atriasoft/archidata/migration/MigrationEngine.java
diff --git a/src/org/atriasoft/archidata/migration/MigrationException.java b/src/main/org/atriasoft/archidata/migration/MigrationException.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/MigrationException.java
rename to src/main/org/atriasoft/archidata/migration/MigrationException.java
diff --git a/src/org/atriasoft/archidata/migration/MigrationInterface.java b/src/main/org/atriasoft/archidata/migration/MigrationInterface.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/MigrationInterface.java
rename to src/main/org/atriasoft/archidata/migration/MigrationInterface.java
diff --git a/src/org/atriasoft/archidata/migration/MigrationSqlStep.java b/src/main/org/atriasoft/archidata/migration/MigrationSqlStep.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/MigrationSqlStep.java
rename to src/main/org/atriasoft/archidata/migration/MigrationSqlStep.java
diff --git a/src/org/atriasoft/archidata/migration/model/Migration.java b/src/main/org/atriasoft/archidata/migration/model/Migration.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/model/Migration.java
rename to src/main/org/atriasoft/archidata/migration/model/Migration.java
diff --git a/src/org/atriasoft/archidata/migration/model/Migration1.java b/src/main/org/atriasoft/archidata/migration/model/Migration1.java
similarity index 100%
rename from src/org/atriasoft/archidata/migration/model/Migration1.java
rename to src/main/org/atriasoft/archidata/migration/model/Migration1.java
diff --git a/src/org/atriasoft/archidata/model/Data.java b/src/main/org/atriasoft/archidata/model/Data.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/Data.java
rename to src/main/org/atriasoft/archidata/model/Data.java
diff --git a/src/org/atriasoft/archidata/model/GenericData.java b/src/main/org/atriasoft/archidata/model/GenericData.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/GenericData.java
rename to src/main/org/atriasoft/archidata/model/GenericData.java
diff --git a/src/org/atriasoft/archidata/model/GenericDataSoftDelete.java b/src/main/org/atriasoft/archidata/model/GenericDataSoftDelete.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/GenericDataSoftDelete.java
rename to src/main/org/atriasoft/archidata/model/GenericDataSoftDelete.java
diff --git a/src/org/atriasoft/archidata/model/GenericTiming.java b/src/main/org/atriasoft/archidata/model/GenericTiming.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/GenericTiming.java
rename to src/main/org/atriasoft/archidata/model/GenericTiming.java
diff --git a/src/org/atriasoft/archidata/model/GenericToken.java b/src/main/org/atriasoft/archidata/model/GenericToken.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/GenericToken.java
rename to src/main/org/atriasoft/archidata/model/GenericToken.java
diff --git a/src/org/atriasoft/archidata/model/GetToken.java b/src/main/org/atriasoft/archidata/model/GetToken.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/GetToken.java
rename to src/main/org/atriasoft/archidata/model/GetToken.java
diff --git a/src/org/atriasoft/archidata/model/OIDGenericData.java b/src/main/org/atriasoft/archidata/model/OIDGenericData.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/OIDGenericData.java
rename to src/main/org/atriasoft/archidata/model/OIDGenericData.java
diff --git a/src/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java b/src/main/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java
rename to src/main/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java
diff --git a/src/org/atriasoft/archidata/model/Token.java b/src/main/org/atriasoft/archidata/model/Token.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/Token.java
rename to src/main/org/atriasoft/archidata/model/Token.java
diff --git a/src/org/atriasoft/archidata/model/UUIDGenericData.java b/src/main/org/atriasoft/archidata/model/UUIDGenericData.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/UUIDGenericData.java
rename to src/main/org/atriasoft/archidata/model/UUIDGenericData.java
diff --git a/src/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java b/src/main/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java
rename to src/main/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java
diff --git a/src/org/atriasoft/archidata/model/User.java b/src/main/org/atriasoft/archidata/model/User.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/User.java
rename to src/main/org/atriasoft/archidata/model/User.java
diff --git a/src/org/atriasoft/archidata/model/UserByToken.java b/src/main/org/atriasoft/archidata/model/UserByToken.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/UserByToken.java
rename to src/main/org/atriasoft/archidata/model/UserByToken.java
diff --git a/src/org/atriasoft/archidata/model/token/JwtHeader.java b/src/main/org/atriasoft/archidata/model/token/JwtHeader.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/token/JwtHeader.java
rename to src/main/org/atriasoft/archidata/model/token/JwtHeader.java
diff --git a/src/org/atriasoft/archidata/model/token/JwtPayload.java b/src/main/org/atriasoft/archidata/model/token/JwtPayload.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/token/JwtPayload.java
rename to src/main/org/atriasoft/archidata/model/token/JwtPayload.java
diff --git a/src/org/atriasoft/archidata/model/token/JwtToken.java b/src/main/org/atriasoft/archidata/model/token/JwtToken.java
similarity index 100%
rename from src/org/atriasoft/archidata/model/token/JwtToken.java
rename to src/main/org/atriasoft/archidata/model/token/JwtToken.java
diff --git a/src/org/atriasoft/archidata/tools/AnnotationCreator.java b/src/main/org/atriasoft/archidata/tools/AnnotationCreator.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/AnnotationCreator.java
rename to src/main/org/atriasoft/archidata/tools/AnnotationCreator.java
diff --git a/src/org/atriasoft/archidata/tools/ConfigBaseVariable.java b/src/main/org/atriasoft/archidata/tools/ConfigBaseVariable.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/ConfigBaseVariable.java
rename to src/main/org/atriasoft/archidata/tools/ConfigBaseVariable.java
diff --git a/src/org/atriasoft/archidata/tools/ContextGenericTools.java b/src/main/org/atriasoft/archidata/tools/ContextGenericTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/ContextGenericTools.java
rename to src/main/org/atriasoft/archidata/tools/ContextGenericTools.java
diff --git a/src/org/atriasoft/archidata/tools/DataTools.java b/src/main/org/atriasoft/archidata/tools/DataTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/DataTools.java
rename to src/main/org/atriasoft/archidata/tools/DataTools.java
diff --git a/src/org/atriasoft/archidata/tools/DateTools.java b/src/main/org/atriasoft/archidata/tools/DateTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/DateTools.java
rename to src/main/org/atriasoft/archidata/tools/DateTools.java
diff --git a/src/org/atriasoft/archidata/tools/JWTWrapper.java b/src/main/org/atriasoft/archidata/tools/JWTWrapper.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/JWTWrapper.java
rename to src/main/org/atriasoft/archidata/tools/JWTWrapper.java
diff --git a/src/org/atriasoft/archidata/tools/ListTools.java b/src/main/org/atriasoft/archidata/tools/ListTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/ListTools.java
rename to src/main/org/atriasoft/archidata/tools/ListTools.java
diff --git a/src/org/atriasoft/archidata/tools/PublicKey.java b/src/main/org/atriasoft/archidata/tools/PublicKey.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/PublicKey.java
rename to src/main/org/atriasoft/archidata/tools/PublicKey.java
diff --git a/src/org/atriasoft/archidata/tools/RESTApi.java b/src/main/org/atriasoft/archidata/tools/RESTApi.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/RESTApi.java
rename to src/main/org/atriasoft/archidata/tools/RESTApi.java
diff --git a/src/org/atriasoft/archidata/tools/RESTApiRequest.java b/src/main/org/atriasoft/archidata/tools/RESTApiRequest.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/RESTApiRequest.java
rename to src/main/org/atriasoft/archidata/tools/RESTApiRequest.java
diff --git a/src/org/atriasoft/archidata/tools/StringTools.java b/src/main/org/atriasoft/archidata/tools/StringTools.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/StringTools.java
rename to src/main/org/atriasoft/archidata/tools/StringTools.java
diff --git a/src/org/atriasoft/archidata/tools/UuidUtils.java b/src/main/org/atriasoft/archidata/tools/UuidUtils.java
similarity index 100%
rename from src/org/atriasoft/archidata/tools/UuidUtils.java
rename to src/main/org/atriasoft/archidata/tools/UuidUtils.java
diff --git a/test/src/test/atriasoft/archidata/ConfigureDb.java b/src/test/test/atriasoft/archidata/ConfigureDb.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/ConfigureDb.java
rename to src/test/test/atriasoft/archidata/ConfigureDb.java
diff --git a/test/src/test/atriasoft/archidata/StepwiseExtension.java b/src/test/test/atriasoft/archidata/StepwiseExtension.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/StepwiseExtension.java
rename to src/test/test/atriasoft/archidata/StepwiseExtension.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/Common.java b/src/test/test/atriasoft/archidata/apiExtern/Common.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/Common.java
rename to src/test/test/atriasoft/archidata/apiExtern/Common.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/TestAPI.java b/src/test/test/atriasoft/archidata/apiExtern/TestAPI.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/TestAPI.java
rename to src/test/test/atriasoft/archidata/apiExtern/TestAPI.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java b/src/test/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java
rename to src/test/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/TestTime.java b/src/test/test/atriasoft/archidata/apiExtern/TestTime.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/TestTime.java
rename to src/test/test/atriasoft/archidata/apiExtern/TestTime.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/TestTimeParsing.java b/src/test/test/atriasoft/archidata/apiExtern/TestTimeParsing.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/TestTimeParsing.java
rename to src/test/test/atriasoft/archidata/apiExtern/TestTimeParsing.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/WebLauncher.java b/src/test/test/atriasoft/archidata/apiExtern/WebLauncher.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/WebLauncher.java
rename to src/test/test/atriasoft/archidata/apiExtern/WebLauncher.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/WebLauncherTest.java b/src/test/test/atriasoft/archidata/apiExtern/WebLauncherTest.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/WebLauncherTest.java
rename to src/test/test/atriasoft/archidata/apiExtern/WebLauncherTest.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java b/src/test/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java
rename to src/test/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java b/src/test/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java
rename to src/test/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/model/DataTimes.java b/src/test/test/atriasoft/archidata/apiExtern/model/DataTimes.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/model/DataTimes.java
rename to src/test/test/atriasoft/archidata/apiExtern/model/DataTimes.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java b/src/test/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java
rename to src/test/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/resource/TestResource.java b/src/test/test/atriasoft/archidata/apiExtern/resource/TestResource.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/resource/TestResource.java
rename to src/test/test/atriasoft/archidata/apiExtern/resource/TestResource.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java b/src/test/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java
rename to src/test/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java
diff --git a/test/src/test/atriasoft/archidata/apiExtern/resource/TimeResource.java b/src/test/test/atriasoft/archidata/apiExtern/resource/TimeResource.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/apiExtern/resource/TimeResource.java
rename to src/test/test/atriasoft/archidata/apiExtern/resource/TimeResource.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerEMail.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerEMail.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerEMail.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerEMail.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerMax.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerMax.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerMax.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerMax.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerMin.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerMin.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerMin.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerMin.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerPattern.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerPattern.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerPattern.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerPattern.java
diff --git a/test/src/test/atriasoft/archidata/checker/TestJPACheckerSize.java b/src/test/test/atriasoft/archidata/checker/TestJPACheckerSize.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/TestJPACheckerSize.java
rename to src/test/test/atriasoft/archidata/checker/TestJPACheckerSize.java
diff --git a/test/src/test/atriasoft/archidata/checker/model/JpaBaseModel.java b/src/test/test/atriasoft/archidata/checker/model/JpaBaseModel.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/checker/model/JpaBaseModel.java
rename to src/test/test/atriasoft/archidata/checker/model/JpaBaseModel.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestDataJson.java b/src/test/test/atriasoft/archidata/dataAccess/TestDataJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestDataJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestDataJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestJPAChecker.java b/src/test/test/atriasoft/archidata/dataAccess/TestJPAChecker.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestJPAChecker.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestJPAChecker.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestJson.java b/src/test/test/atriasoft/archidata/dataAccess/TestJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestListJson.java b/src/test/test/atriasoft/archidata/dataAccess/TestListJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestListJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestListJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java b/src/test/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java b/src/test/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java b/src/test/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java b/src/test/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestRawQuery.java b/src/test/test/atriasoft/archidata/dataAccess/TestRawQuery.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestRawQuery.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestRawQuery.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTable.java b/src/test/test/atriasoft/archidata/dataAccess/TestSimpleTable.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestSimpleTable.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestSimpleTable.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java b/src/test/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java b/src/test/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java b/src/test/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/TestTypes.java b/src/test/test/atriasoft/archidata/dataAccess/TestTypes.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/TestTypes.java
rename to src/test/test/atriasoft/archidata/dataAccess/TestTypes.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/DataInJson.java b/src/test/test/atriasoft/archidata/dataAccess/model/DataInJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/DataInJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/DataInJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/DataJsonList.java b/src/test/test/atriasoft/archidata/dataAccess/model/DataJsonList.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/DataJsonList.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/DataJsonList.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java b/src/test/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java b/src/test/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java b/src/test/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java b/src/test/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java b/src/test/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java b/src/test/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTable.java b/src/test/test/atriasoft/archidata/dataAccess/model/SimpleTable.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/SimpleTable.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/SimpleTable.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java b/src/test/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToManyUUIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java
diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/TypesTable.java b/src/test/test/atriasoft/archidata/dataAccess/model/TypesTable.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/dataAccess/model/TypesTable.java
rename to src/test/test/atriasoft/archidata/dataAccess/model/TypesTable.java
diff --git a/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java b/src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java
rename to src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java
diff --git a/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java b/src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java
rename to src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java
diff --git a/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java b/src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java
rename to src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java
diff --git a/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java b/src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java
rename to src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java
diff --git a/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java b/src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java
rename to src/test/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/TestValidator.java b/src/test/test/atriasoft/archidata/hybernateValidator/TestValidator.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/TestValidator.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/TestValidator.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncher.java b/src/test/test/atriasoft/archidata/hybernateValidator/WebLauncher.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/WebLauncher.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/WebLauncher.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java b/src/test/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java b/src/test/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java b/src/test/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java
diff --git a/test/src/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java b/src/test/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java
rename to src/test/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java
diff --git a/test/src/test/atriasoft/archidata/migration/InitializationCurrent.java b/src/test/test/atriasoft/archidata/migration/InitializationCurrent.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/InitializationCurrent.java
rename to src/test/test/atriasoft/archidata/migration/InitializationCurrent.java
diff --git a/test/src/test/atriasoft/archidata/migration/InitializationFirst.java b/src/test/test/atriasoft/archidata/migration/InitializationFirst.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/InitializationFirst.java
rename to src/test/test/atriasoft/archidata/migration/InitializationFirst.java
diff --git a/test/src/test/atriasoft/archidata/migration/Migration1.java b/src/test/test/atriasoft/archidata/migration/Migration1.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/Migration1.java
rename to src/test/test/atriasoft/archidata/migration/Migration1.java
diff --git a/test/src/test/atriasoft/archidata/migration/Migration2.java b/src/test/test/atriasoft/archidata/migration/Migration2.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/Migration2.java
rename to src/test/test/atriasoft/archidata/migration/Migration2.java
diff --git a/test/src/test/atriasoft/archidata/migration/MigrationFail.java b/src/test/test/atriasoft/archidata/migration/MigrationFail.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/MigrationFail.java
rename to src/test/test/atriasoft/archidata/migration/MigrationFail.java
diff --git a/test/src/test/atriasoft/archidata/migration/TestMigrationFail.java b/src/test/test/atriasoft/archidata/migration/TestMigrationFail.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/TestMigrationFail.java
rename to src/test/test/atriasoft/archidata/migration/TestMigrationFail.java
diff --git a/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInit.java b/src/test/test/atriasoft/archidata/migration/TestMigrationFirstInit.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/TestMigrationFirstInit.java
rename to src/test/test/atriasoft/archidata/migration/TestMigrationFirstInit.java
diff --git a/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java b/src/test/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java
rename to src/test/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java
diff --git a/test/src/test/atriasoft/archidata/migration/model/TypesMigration1.java b/src/test/test/atriasoft/archidata/migration/model/TypesMigration1.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/model/TypesMigration1.java
rename to src/test/test/atriasoft/archidata/migration/model/TypesMigration1.java
diff --git a/test/src/test/atriasoft/archidata/migration/model/TypesMigration2.java b/src/test/test/atriasoft/archidata/migration/model/TypesMigration2.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/model/TypesMigration2.java
rename to src/test/test/atriasoft/archidata/migration/model/TypesMigration2.java
diff --git a/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java b/src/test/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java
rename to src/test/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java
diff --git a/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java b/src/test/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java
similarity index 100%
rename from test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java
rename to src/test/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java
diff --git a/test/resources/simplelogger.properties b/src/testResources/simplelogger.properties
similarity index 100%
rename from test/resources/simplelogger.properties
rename to src/testResources/simplelogger.properties