diff --git a/pom.xml b/pom.xml
index 9e67153..e7cdd16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,27 @@
+<?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>ejson</artifactId>
   <version>0.1.0</version>
-	<properties>
-		<maven.compiler.version>3.13.0</maven.compiler.version>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-		<maven.dependency.version>3.1.1</maven.dependency.version>
-	</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>
 	    <id>gitea</id>
@@ -53,23 +65,23 @@
     </dependencies>
 
 	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test/src</testSourceDirectory>
+		<sourceDirectory>src/main</sourceDirectory>
+		<testSourceDirectory>src/test</testSourceDirectory>
 		<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>
diff --git a/src/org/atriasoft/ejson/Ejson.java b/src/main/org/atriasoft/ejson/Ejson.java
similarity index 100%
rename from src/org/atriasoft/ejson/Ejson.java
rename to src/main/org/atriasoft/ejson/Ejson.java
diff --git a/src/org/atriasoft/ejson/JsonMapper.java b/src/main/org/atriasoft/ejson/JsonMapper.java
similarity index 100%
rename from src/org/atriasoft/ejson/JsonMapper.java
rename to src/main/org/atriasoft/ejson/JsonMapper.java
diff --git a/src/org/atriasoft/ejson/builder/Builder.java b/src/main/org/atriasoft/ejson/builder/Builder.java
similarity index 100%
rename from src/org/atriasoft/ejson/builder/Builder.java
rename to src/main/org/atriasoft/ejson/builder/Builder.java
diff --git a/src/org/atriasoft/ejson/builder/BuilderGeneric.java b/src/main/org/atriasoft/ejson/builder/BuilderGeneric.java
similarity index 100%
rename from src/org/atriasoft/ejson/builder/BuilderGeneric.java
rename to src/main/org/atriasoft/ejson/builder/BuilderGeneric.java
diff --git a/src/org/atriasoft/ejson/builder/BuilderIntrospection.java b/src/main/org/atriasoft/ejson/builder/BuilderIntrospection.java
similarity index 100%
rename from src/org/atriasoft/ejson/builder/BuilderIntrospection.java
rename to src/main/org/atriasoft/ejson/builder/BuilderIntrospection.java
diff --git a/src/org/atriasoft/ejson/builder/IntrospectionObject.java b/src/main/org/atriasoft/ejson/builder/IntrospectionObject.java
similarity index 100%
rename from src/org/atriasoft/ejson/builder/IntrospectionObject.java
rename to src/main/org/atriasoft/ejson/builder/IntrospectionObject.java
diff --git a/src/org/atriasoft/ejson/exception/EjsonBuilderException.java b/src/main/org/atriasoft/ejson/exception/EjsonBuilderException.java
similarity index 100%
rename from src/org/atriasoft/ejson/exception/EjsonBuilderException.java
rename to src/main/org/atriasoft/ejson/exception/EjsonBuilderException.java
diff --git a/src/org/atriasoft/ejson/exception/EjsonException.java b/src/main/org/atriasoft/ejson/exception/EjsonException.java
similarity index 100%
rename from src/org/atriasoft/ejson/exception/EjsonException.java
rename to src/main/org/atriasoft/ejson/exception/EjsonException.java
diff --git a/src/org/atriasoft/ejson/exception/EjsonNodeDoesNotExist.java b/src/main/org/atriasoft/ejson/exception/EjsonNodeDoesNotExist.java
similarity index 100%
rename from src/org/atriasoft/ejson/exception/EjsonNodeDoesNotExist.java
rename to src/main/org/atriasoft/ejson/exception/EjsonNodeDoesNotExist.java
diff --git a/src/org/atriasoft/ejson/exception/EjsonParserError.java b/src/main/org/atriasoft/ejson/exception/EjsonParserError.java
similarity index 100%
rename from src/org/atriasoft/ejson/exception/EjsonParserError.java
rename to src/main/org/atriasoft/ejson/exception/EjsonParserError.java
diff --git a/src/org/atriasoft/ejson/exception/EjsonParserErrorMulti.java b/src/main/org/atriasoft/ejson/exception/EjsonParserErrorMulti.java
similarity index 100%
rename from src/org/atriasoft/ejson/exception/EjsonParserErrorMulti.java
rename to src/main/org/atriasoft/ejson/exception/EjsonParserErrorMulti.java
diff --git a/src/org/atriasoft/ejson/generator/GeneratorGeneric.java b/src/main/org/atriasoft/ejson/generator/GeneratorGeneric.java
similarity index 100%
rename from src/org/atriasoft/ejson/generator/GeneratorGeneric.java
rename to src/main/org/atriasoft/ejson/generator/GeneratorGeneric.java
diff --git a/src/org/atriasoft/ejson/model/JsonArray.java b/src/main/org/atriasoft/ejson/model/JsonArray.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonArray.java
rename to src/main/org/atriasoft/ejson/model/JsonArray.java
diff --git a/src/org/atriasoft/ejson/model/JsonBoolean.java b/src/main/org/atriasoft/ejson/model/JsonBoolean.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonBoolean.java
rename to src/main/org/atriasoft/ejson/model/JsonBoolean.java
diff --git a/src/org/atriasoft/ejson/model/JsonNode.java b/src/main/org/atriasoft/ejson/model/JsonNode.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonNode.java
rename to src/main/org/atriasoft/ejson/model/JsonNode.java
diff --git a/src/org/atriasoft/ejson/model/JsonNodeType.java b/src/main/org/atriasoft/ejson/model/JsonNodeType.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonNodeType.java
rename to src/main/org/atriasoft/ejson/model/JsonNodeType.java
diff --git a/src/org/atriasoft/ejson/model/JsonNull.java b/src/main/org/atriasoft/ejson/model/JsonNull.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonNull.java
rename to src/main/org/atriasoft/ejson/model/JsonNull.java
diff --git a/src/org/atriasoft/ejson/model/JsonNumber.java b/src/main/org/atriasoft/ejson/model/JsonNumber.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonNumber.java
rename to src/main/org/atriasoft/ejson/model/JsonNumber.java
diff --git a/src/org/atriasoft/ejson/model/JsonObject.java b/src/main/org/atriasoft/ejson/model/JsonObject.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonObject.java
rename to src/main/org/atriasoft/ejson/model/JsonObject.java
diff --git a/src/org/atriasoft/ejson/model/JsonString.java b/src/main/org/atriasoft/ejson/model/JsonString.java
similarity index 100%
rename from src/org/atriasoft/ejson/model/JsonString.java
rename to src/main/org/atriasoft/ejson/model/JsonString.java
diff --git a/src/org/atriasoft/ejson/parser/ParseJson.java b/src/main/org/atriasoft/ejson/parser/ParseJson.java
similarity index 100%
rename from src/org/atriasoft/ejson/parser/ParseJson.java
rename to src/main/org/atriasoft/ejson/parser/ParseJson.java
diff --git a/src/org/atriasoft/ejson/parser/ParsingProperty.java b/src/main/org/atriasoft/ejson/parser/ParsingProperty.java
similarity index 100%
rename from src/org/atriasoft/ejson/parser/ParsingProperty.java
rename to src/main/org/atriasoft/ejson/parser/ParsingProperty.java
diff --git a/src/org/atriasoft/ejson/parser/PositionParsing.java b/src/main/org/atriasoft/ejson/parser/PositionParsing.java
similarity index 100%
rename from src/org/atriasoft/ejson/parser/PositionParsing.java
rename to src/main/org/atriasoft/ejson/parser/PositionParsing.java
diff --git a/src/module-info.java b/src/module-info.java
deleted file mode 100644
index 411dab7..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.ejson {
-	exports org.atriasoft.ejson;
-	exports org.atriasoft.ejson.model;
-	exports org.atriasoft.ejson.exception;
-	exports org.atriasoft.ejson.builder;
-	exports org.atriasoft.ejson.parser;
-
-	requires transitive org.atriasoft.etk;
-	requires java.base;
-	requires org.atriasoft.aknot;
-
-}
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonLocal.java b/src/test/test/atriasoft/ejson/generic/EjsonLocal.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/generic/EjsonLocal.java
rename to src/test/test/atriasoft/ejson/generic/EjsonLocal.java
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonTestAll.java b/src/test/test/atriasoft/ejson/generic/EjsonTestAll.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/generic/EjsonTestAll.java
rename to src/test/test/atriasoft/ejson/generic/EjsonTestAll.java
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonTestBoolean.java b/src/test/test/atriasoft/ejson/generic/EjsonTestBoolean.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/generic/EjsonTestBoolean.java
rename to src/test/test/atriasoft/ejson/generic/EjsonTestBoolean.java
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonTestNull.java b/src/test/test/atriasoft/ejson/generic/EjsonTestNull.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/generic/EjsonTestNull.java
rename to src/test/test/atriasoft/ejson/generic/EjsonTestNull.java
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonTestNumber.java b/src/test/test/atriasoft/ejson/generic/EjsonTestNumber.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/generic/EjsonTestNumber.java
rename to src/test/test/atriasoft/ejson/generic/EjsonTestNumber.java
diff --git a/test/src/test/atriasoft/ejson/introspection/EjsonTestIntrospection.java b/src/test/test/atriasoft/ejson/introspection/EjsonTestIntrospection.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/EjsonTestIntrospection.java
rename to src/test/test/atriasoft/ejson/introspection/EjsonTestIntrospection.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassInversion.java b/src/test/test/atriasoft/ejson/introspection/model/ClassInversion.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassInversion.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassInversion.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassMethodEnum.java b/src/test/test/atriasoft/ejson/introspection/model/ClassMethodEnum.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassMethodEnum.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassMethodEnum.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassPublicChild.java b/src/test/test/atriasoft/ejson/introspection/model/ClassPublicChild.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassPublicChild.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassPublicChild.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassPublicMemberOnly.java b/src/test/test/atriasoft/ejson/introspection/model/ClassPublicMemberOnly.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassPublicMemberOnly.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassPublicMemberOnly.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodOnly.java b/src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodOnly.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodOnly.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodOnly.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodeNode.java b/src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodeNode.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodeNode.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodeNode.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodeStructured.java b/src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodeStructured.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/ClassPublicMethodeStructured.java
rename to src/test/test/atriasoft/ejson/introspection/model/ClassPublicMethodeStructured.java
diff --git a/test/src/test/atriasoft/ejson/introspection/model/SimpleEnum.java b/src/test/test/atriasoft/ejson/introspection/model/SimpleEnum.java
similarity index 100%
rename from test/src/test/atriasoft/ejson/introspection/model/SimpleEnum.java
rename to src/test/test/atriasoft/ejson/introspection/model/SimpleEnum.java