diff --git a/pom.xml b/pom.xml
index 4e80282..d4d444c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.atriasoft</groupId>
   <artifactId>exml</artifactId>
   <version>0.1.0</version>
-	<properties>
-		<maven.compiler.version>3.11.0</maven.compiler.version>
-		<maven.compiler.source>20</maven.compiler.source>
-		<maven.compiler.target>20</maven.compiler.target>
-	</properties>
+	<licenses>
+		<license>
+			<name>Mozilla Public License 2.0</name>
+			<url>https://opensource.org/licenses/MPL-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>dev1</id>
+			<name>Edouard DUPIN</name>
+			<email>edouard.dupin@proton.me</email>
+			<roles>
+				<role>Lead Developer</role>
+			</roles>
+		</developer>
+	</developers>
 
 	<repositories>
 	  <repository>
@@ -40,7 +53,7 @@
 		<dependency>
 		    <groupId>org.junit.jupiter</groupId>
 		    <artifactId>junit-jupiter-api</artifactId>
-		    <version>5.11.0-M2</version>
+		    <version>5.11.0</version>
 		    <scope>test</scope>
 		</dependency>
 		<dependency>
@@ -52,23 +65,28 @@
     </dependencies>
 
 	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test/src</testSourceDirectory>
+		<sourceDirectory>src/main</sourceDirectory>
+		<testSourceDirectory>src/test</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>${basedir}/src/testResources</directory>
+			</testResource>
+		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven.compiler.version}</version>
+				<version>3.14.0</version>
 				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
-					<!--<encoding>${project.build.sourceEncoding}</encoding>-->
+					<source>21</source>
+					<target>21</target>
 				</configuration>
 			</plugin>
 			<!-- Create the source bundle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -82,7 +100,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.5</version>
 			</plugin>
 		    <plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -101,7 +119,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>private</show>
 					<nohelp>true</nohelp>
@@ -115,7 +133,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>public</show>
 				</configuration>
diff --git a/src/org/atriasoft/exml/Exml.java b/src/main/org/atriasoft/exml/Exml.java
similarity index 100%
rename from src/org/atriasoft/exml/Exml.java
rename to src/main/org/atriasoft/exml/Exml.java
diff --git a/src/org/atriasoft/exml/XmlMapper.java b/src/main/org/atriasoft/exml/XmlMapper.java
similarity index 100%
rename from src/org/atriasoft/exml/XmlMapper.java
rename to src/main/org/atriasoft/exml/XmlMapper.java
diff --git a/src/org/atriasoft/exml/builder/Builder.java b/src/main/org/atriasoft/exml/builder/Builder.java
similarity index 100%
rename from src/org/atriasoft/exml/builder/Builder.java
rename to src/main/org/atriasoft/exml/builder/Builder.java
diff --git a/src/org/atriasoft/exml/builder/BuilderGeneric.java b/src/main/org/atriasoft/exml/builder/BuilderGeneric.java
similarity index 100%
rename from src/org/atriasoft/exml/builder/BuilderGeneric.java
rename to src/main/org/atriasoft/exml/builder/BuilderGeneric.java
diff --git a/src/org/atriasoft/exml/builder/BuilderIntrospection.java b/src/main/org/atriasoft/exml/builder/BuilderIntrospection.java
similarity index 100%
rename from src/org/atriasoft/exml/builder/BuilderIntrospection.java
rename to src/main/org/atriasoft/exml/builder/BuilderIntrospection.java
diff --git a/src/org/atriasoft/exml/builder/IntrospectionObject.java b/src/main/org/atriasoft/exml/builder/IntrospectionObject.java
similarity index 100%
rename from src/org/atriasoft/exml/builder/IntrospectionObject.java
rename to src/main/org/atriasoft/exml/builder/IntrospectionObject.java
diff --git a/src/org/atriasoft/exml/exception/ExmlAttributeDoesNotExist.java b/src/main/org/atriasoft/exml/exception/ExmlAttributeDoesNotExist.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlAttributeDoesNotExist.java
rename to src/main/org/atriasoft/exml/exception/ExmlAttributeDoesNotExist.java
diff --git a/src/org/atriasoft/exml/exception/ExmlBuilderException.java b/src/main/org/atriasoft/exml/exception/ExmlBuilderException.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlBuilderException.java
rename to src/main/org/atriasoft/exml/exception/ExmlBuilderException.java
diff --git a/src/org/atriasoft/exml/exception/ExmlException.java b/src/main/org/atriasoft/exml/exception/ExmlException.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlException.java
rename to src/main/org/atriasoft/exml/exception/ExmlException.java
diff --git a/src/org/atriasoft/exml/exception/ExmlNodeDoesNotExist.java b/src/main/org/atriasoft/exml/exception/ExmlNodeDoesNotExist.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlNodeDoesNotExist.java
rename to src/main/org/atriasoft/exml/exception/ExmlNodeDoesNotExist.java
diff --git a/src/org/atriasoft/exml/exception/ExmlParserError.java b/src/main/org/atriasoft/exml/exception/ExmlParserError.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlParserError.java
rename to src/main/org/atriasoft/exml/exception/ExmlParserError.java
diff --git a/src/org/atriasoft/exml/exception/ExmlParserErrorMulti.java b/src/main/org/atriasoft/exml/exception/ExmlParserErrorMulti.java
similarity index 100%
rename from src/org/atriasoft/exml/exception/ExmlParserErrorMulti.java
rename to src/main/org/atriasoft/exml/exception/ExmlParserErrorMulti.java
diff --git a/src/org/atriasoft/exml/generator/Generator.java b/src/main/org/atriasoft/exml/generator/Generator.java
similarity index 100%
rename from src/org/atriasoft/exml/generator/Generator.java
rename to src/main/org/atriasoft/exml/generator/Generator.java
diff --git a/src/org/atriasoft/exml/generator/GeneratorGeneric.java b/src/main/org/atriasoft/exml/generator/GeneratorGeneric.java
similarity index 100%
rename from src/org/atriasoft/exml/generator/GeneratorGeneric.java
rename to src/main/org/atriasoft/exml/generator/GeneratorGeneric.java
diff --git a/src/org/atriasoft/exml/generator/GeneratorIntrospection.java b/src/main/org/atriasoft/exml/generator/GeneratorIntrospection.java
similarity index 100%
rename from src/org/atriasoft/exml/generator/GeneratorIntrospection.java
rename to src/main/org/atriasoft/exml/generator/GeneratorIntrospection.java
diff --git a/src/org/atriasoft/exml/model/XmlAttribute.java b/src/main/org/atriasoft/exml/model/XmlAttribute.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlAttribute.java
rename to src/main/org/atriasoft/exml/model/XmlAttribute.java
diff --git a/src/org/atriasoft/exml/model/XmlAttributeList.java b/src/main/org/atriasoft/exml/model/XmlAttributeList.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlAttributeList.java
rename to src/main/org/atriasoft/exml/model/XmlAttributeList.java
diff --git a/src/org/atriasoft/exml/model/XmlComment.java b/src/main/org/atriasoft/exml/model/XmlComment.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlComment.java
rename to src/main/org/atriasoft/exml/model/XmlComment.java
diff --git a/src/org/atriasoft/exml/model/XmlDeclaration.java b/src/main/org/atriasoft/exml/model/XmlDeclaration.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlDeclaration.java
rename to src/main/org/atriasoft/exml/model/XmlDeclaration.java
diff --git a/src/org/atriasoft/exml/model/XmlElement.java b/src/main/org/atriasoft/exml/model/XmlElement.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlElement.java
rename to src/main/org/atriasoft/exml/model/XmlElement.java
diff --git a/src/org/atriasoft/exml/model/XmlNode.java b/src/main/org/atriasoft/exml/model/XmlNode.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlNode.java
rename to src/main/org/atriasoft/exml/model/XmlNode.java
diff --git a/src/org/atriasoft/exml/model/XmlNodeType.java b/src/main/org/atriasoft/exml/model/XmlNodeType.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlNodeType.java
rename to src/main/org/atriasoft/exml/model/XmlNodeType.java
diff --git a/src/org/atriasoft/exml/model/XmlText.java b/src/main/org/atriasoft/exml/model/XmlText.java
similarity index 100%
rename from src/org/atriasoft/exml/model/XmlText.java
rename to src/main/org/atriasoft/exml/model/XmlText.java
diff --git a/src/org/atriasoft/exml/parser/ParseXml.java b/src/main/org/atriasoft/exml/parser/ParseXml.java
similarity index 100%
rename from src/org/atriasoft/exml/parser/ParseXml.java
rename to src/main/org/atriasoft/exml/parser/ParseXml.java
diff --git a/src/org/atriasoft/exml/parser/ParsingProperty.java b/src/main/org/atriasoft/exml/parser/ParsingProperty.java
similarity index 100%
rename from src/org/atriasoft/exml/parser/ParsingProperty.java
rename to src/main/org/atriasoft/exml/parser/ParsingProperty.java
diff --git a/src/org/atriasoft/exml/parser/PositionParsing.java b/src/main/org/atriasoft/exml/parser/PositionParsing.java
similarity index 100%
rename from src/org/atriasoft/exml/parser/PositionParsing.java
rename to src/main/org/atriasoft/exml/parser/PositionParsing.java
diff --git a/src/module-info.java b/src/module-info.java
deleted file mode 100644
index 29177aa..0000000
--- a/src/module-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2021, Edouard DUPIN, all right reserved
- * @license MPL v2.0 (see license file)
- */
-
-open module org.atriasoft.exml {
-	exports org.atriasoft.exml;
-	exports org.atriasoft.exml.model;
-	exports org.atriasoft.exml.exception;
-	exports org.atriasoft.exml.builder;
-	exports org.atriasoft.exml.parser;
-	
-	requires transitive org.atriasoft.etk;
-	requires transitive org.atriasoft.aknot;
-	requires java.base;
-	
-}
diff --git a/test/src/test/atriasoft/exml/generic/ExmlLocal.java b/src/test/test/atriasoft/exml/generic/ExmlLocal.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/ExmlLocal.java
rename to src/test/test/atriasoft/exml/generic/ExmlLocal.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlAll.java b/src/test/test/atriasoft/exml/generic/TestExmlAll.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlAll.java
rename to src/test/test/atriasoft/exml/generic/TestExmlAll.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlAttribute.java b/src/test/test/atriasoft/exml/generic/TestExmlAttribute.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlAttribute.java
rename to src/test/test/atriasoft/exml/generic/TestExmlAttribute.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlCData.java b/src/test/test/atriasoft/exml/generic/TestExmlCData.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlCData.java
rename to src/test/test/atriasoft/exml/generic/TestExmlCData.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlComment.java b/src/test/test/atriasoft/exml/generic/TestExmlComment.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlComment.java
rename to src/test/test/atriasoft/exml/generic/TestExmlComment.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlDeclarationXML.java b/src/test/test/atriasoft/exml/generic/TestExmlDeclarationXML.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlDeclarationXML.java
rename to src/test/test/atriasoft/exml/generic/TestExmlDeclarationXML.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlElement.java b/src/test/test/atriasoft/exml/generic/TestExmlElement.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlElement.java
rename to src/test/test/atriasoft/exml/generic/TestExmlElement.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlParseAttribute.java b/src/test/test/atriasoft/exml/generic/TestExmlParseAttribute.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlParseAttribute.java
rename to src/test/test/atriasoft/exml/generic/TestExmlParseAttribute.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlParseComment.java b/src/test/test/atriasoft/exml/generic/TestExmlParseComment.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlParseComment.java
rename to src/test/test/atriasoft/exml/generic/TestExmlParseComment.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlParseDeclaration.java b/src/test/test/atriasoft/exml/generic/TestExmlParseDeclaration.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlParseDeclaration.java
rename to src/test/test/atriasoft/exml/generic/TestExmlParseDeclaration.java
diff --git a/test/src/test/atriasoft/exml/generic/TestExmlParseElement.java b/src/test/test/atriasoft/exml/generic/TestExmlParseElement.java
similarity index 100%
rename from test/src/test/atriasoft/exml/generic/TestExmlParseElement.java
rename to src/test/test/atriasoft/exml/generic/TestExmlParseElement.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospection.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospection.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospection.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospection.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionBoolean.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionBoolean.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionBoolean.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionBoolean.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionBooleanNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionBooleanNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionBooleanNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionBooleanNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionByte.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionByte.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionByte.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionByte.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionByteNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionByteNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionByteNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionByteNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorAttribute.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorAttribute.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorAttribute.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorAttribute.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorCaseSensitive.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorCaseSensitive.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorCaseSensitive.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorCaseSensitive.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorManaged.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorManaged.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorManaged.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorManaged.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorNames.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorNames.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorNames.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorNames.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorOptionnal.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorOptionnal.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorOptionnal.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDecoratorOptionnal.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDouble.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDouble.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDouble.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDouble.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDoubleNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDoubleNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionDoubleNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionDoubleNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionEnum.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionEnum.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionEnum.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionEnum.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionFloat.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionFloat.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionFloat.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionFloat.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionFloatNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionFloatNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionFloatNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionFloatNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionGenerate.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionGenerate.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionGenerate.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionGenerate.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionInteger.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionInteger.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionInteger.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionInteger.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionIntegerNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionIntegerNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionIntegerNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionIntegerNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionObject.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionObject.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionObject.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionObject.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionObjectConstructor.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionObjectConstructor.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionObjectConstructor.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionObjectConstructor.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionRecord.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionRecord.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionRecord.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionRecord.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionShort.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionShort.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionShort.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionShort.java
diff --git a/test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionShortNative.java b/src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionShortNative.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/TestExmlIntrospectionShortNative.java
rename to src/test/test/atriasoft/exml/introspection/TestExmlIntrospectionShortNative.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassInversion.java b/src/test/test/atriasoft/exml/introspection/model/ClassInversion.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassInversion.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassInversion.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassMethodEnum.java b/src/test/test/atriasoft/exml/introspection/model/ClassMethodEnum.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassMethodEnum.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassMethodEnum.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassPublicMemberOnly.java b/src/test/test/atriasoft/exml/introspection/model/ClassPublicMemberOnly.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassPublicMemberOnly.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassPublicMemberOnly.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodOnly.java b/src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodOnly.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodOnly.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodOnly.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodeNode.java b/src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodeNode.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodeNode.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodeNode.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodeStructured.java b/src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodeStructured.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/ClassPublicMethodeStructured.java
rename to src/test/test/atriasoft/exml/introspection/model/ClassPublicMethodeStructured.java
diff --git a/test/src/test/atriasoft/exml/introspection/model/SimpleEnum.java b/src/test/test/atriasoft/exml/introspection/model/SimpleEnum.java
similarity index 100%
rename from test/src/test/atriasoft/exml/introspection/model/SimpleEnum.java
rename to src/test/test/atriasoft/exml/introspection/model/SimpleEnum.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