diff --git a/pom.xml b/pom.xml
index 3d4e7f0..653a4eb 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>esignal</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>
@@ -36,7 +48,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>
@@ -48,24 +60,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>
@@ -79,7 +90,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>
@@ -98,7 +109,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>
@@ -112,7 +123,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/esignal/Connection.java b/src/main/org/atriasoft/esignal/Connection.java
similarity index 100%
rename from src/org/atriasoft/esignal/Connection.java
rename to src/main/org/atriasoft/esignal/Connection.java
diff --git a/src/org/atriasoft/esignal/ConnectionRemoveInterface.java b/src/main/org/atriasoft/esignal/ConnectionRemoveInterface.java
similarity index 100%
rename from src/org/atriasoft/esignal/ConnectionRemoveInterface.java
rename to src/main/org/atriasoft/esignal/ConnectionRemoveInterface.java
diff --git a/src/org/atriasoft/esignal/GenericSignal.java b/src/main/org/atriasoft/esignal/GenericSignal.java
similarity index 100%
rename from src/org/atriasoft/esignal/GenericSignal.java
rename to src/main/org/atriasoft/esignal/GenericSignal.java
diff --git a/src/org/atriasoft/esignal/GenericSignalInstrumented.java b/src/main/org/atriasoft/esignal/GenericSignalInstrumented.java
similarity index 100%
rename from src/org/atriasoft/esignal/GenericSignalInstrumented.java
rename to src/main/org/atriasoft/esignal/GenericSignalInstrumented.java
diff --git a/src/org/atriasoft/esignal/ISignal.java b/src/main/org/atriasoft/esignal/ISignal.java
similarity index 100%
rename from src/org/atriasoft/esignal/ISignal.java
rename to src/main/org/atriasoft/esignal/ISignal.java
diff --git a/src/org/atriasoft/esignal/ISignalEmpty.java b/src/main/org/atriasoft/esignal/ISignalEmpty.java
similarity index 100%
rename from src/org/atriasoft/esignal/ISignalEmpty.java
rename to src/main/org/atriasoft/esignal/ISignalEmpty.java
diff --git a/src/org/atriasoft/esignal/Signal.java b/src/main/org/atriasoft/esignal/Signal.java
similarity index 100%
rename from src/org/atriasoft/esignal/Signal.java
rename to src/main/org/atriasoft/esignal/Signal.java
diff --git a/src/org/atriasoft/esignal/SignalEmpty.java b/src/main/org/atriasoft/esignal/SignalEmpty.java
similarity index 100%
rename from src/org/atriasoft/esignal/SignalEmpty.java
rename to src/main/org/atriasoft/esignal/SignalEmpty.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementInterface.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementInterface.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementInterface.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementInterface.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumer.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumer.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumer.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumer.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakConnection.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakConnection.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakConnection.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakConnection.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakObject.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakObject.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakObject.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementTRefConsumerWeakObject.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementTWeakConsumer.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementTWeakConsumer.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementTWeakConsumer.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementTWeakConsumer.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObject.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObject.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObject.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObject.java
diff --git a/src/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObjectWeakConnection.java b/src/main/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObjectWeakConnection.java
similarity index 100%
rename from src/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObjectWeakConnection.java
rename to src/main/org/atriasoft/esignal/internal/ConnectedElementURefConsumerWeakObjectWeakConnection.java
diff --git a/src/module-info.java b/src/module-info.java
deleted file mode 100644
index 3389a32..0000000
--- a/src/module-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/** Basic module interface.
- *
- * @author Edouard DUPIN */
-
-open module org.atriasoft.esignal {
-	exports org.atriasoft.esignal;
-	
-	requires transitive org.atriasoft.etk;
-	requires com.github.spotbugs.annotations;
-}
diff --git a/test/src/test/atriasoft/esignal/TestISignal.java b/src/test/test/atriasoft/esignal/TestISignal.java
similarity index 100%
rename from test/src/test/atriasoft/esignal/TestISignal.java
rename to src/test/test/atriasoft/esignal/TestISignal.java
diff --git a/test/src/test/atriasoft/esignal/TestISignalEmpty.java b/src/test/test/atriasoft/esignal/TestISignalEmpty.java
similarity index 100%
rename from test/src/test/atriasoft/esignal/TestISignalEmpty.java
rename to src/test/test/atriasoft/esignal/TestISignalEmpty.java
diff --git a/test/src/test/atriasoft/esignal/TestSignal.java b/src/test/test/atriasoft/esignal/TestSignal.java
similarity index 100%
rename from test/src/test/atriasoft/esignal/TestSignal.java
rename to src/test/test/atriasoft/esignal/TestSignal.java
diff --git a/test/src/test/atriasoft/esignal/TestSignalEmpty.java b/src/test/test/atriasoft/esignal/TestSignalEmpty.java
similarity index 100%
rename from test/src/test/atriasoft/esignal/TestSignalEmpty.java
rename to src/test/test/atriasoft/esignal/TestSignalEmpty.java