diff --git a/.idea/.name b/.idea/.name
index 64fea47fb75767bb9671849b7e4f3af0d4c52036..f1d9be9503c177bd30ca9ff7f56f4c7722c773ad 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-CluMATE
\ No newline at end of file
+AMAS4DC
\ No newline at end of file
diff --git a/README.md b/README.md
index 2b020520c403e4bfc0e61bbfdae9c1ae7b81ff96..9c9720709357aa5c95577199daf9dbb2116f3cbf 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,35 @@
-# LxPlot
+# AMAS4DC
 
 A library for data clustering using multi-agent system
 
 ## Set up
 
-* Download CluMATE source
+* Download AMAS4DC source
 
-* Rename the extracted folder "clumate"
+* Rename the extracted folder "amas4dc"
 
-* Create a new gradle project in the same directory as CluMATE
+* Create a new gradle project in the same directory as AMAS4DC
 
 * In this new project, open build.gradle
 
-* Add CluMATE to the dependencies
+* Add AMAS4DC to the dependencies
 ```
 dependencies {
 
     // Add the two following lines
-    // CluMATE
-    implementation project(':clumate')
+    // AMAS4DC
+    implementation project(':amas4dc')
     
     ...
 }
 ```
 * Open settings.gradle
 
-* Add link to local CluMATE folder
-include ':clumate'
-project(':clumate').projectDir = new File(settingsDir, '../clumate')
+* Add link to local AMAS4DC folder
+```
+include ':amas4dc'
+project(':amas4dc').projectDir = new File(settingsDir, '../amas4dc')
+```
 
 * Click on the Gradle Refresh button
 
@@ -35,8 +37,8 @@ project(':clumate').projectDir = new File(settingsDir, '../clumate')
 ## Usage example 
 
 ```java
-var clumate = new CluMATE<CustomDataPoint>(new MASSettings(new CustomDataPointSimilarityScoreMethod(), 0.5f, EnumSet.noneOf(AMASOption), new CustomDataPointFuser()))
+var amas4dc = new AMAS4DC<CustomDataPoint>(new MASSettings(new CustomDataPointSimilarityScoreMethod(), 0.5f, EnumSet.noneOf(AMASOption), new CustomDataPointFuser()))
 
-clumate.fit([new CustomDataPoint(1), new CustomDataPoint(2)])
-var results = clumate.retrieveClusters()
+amas4dc.fit([new CustomDataPoint(1), new CustomDataPoint(2)])
+var results = amas4dc.retrieveClusters()
 ```
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 78213ff5772eb2a9d7e0a4bc297aa8ce0d15131f..d3f92fa60afd4b8809a5951c37855ad2497d547b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,8 +13,7 @@ repositories {
 
 dependencies {
     // AMAK (Only one of the next two lines should be uncommented. Also, settings.gradle file should also be modified)
-     implementation 'com.github.alexandreprl:amak:3.1.0'
-// Uncomment this line to get AMAK from git repository (The last part matches a tag, a commit hash or the last commit of a branch : branchName-SNAPSHOT
+     implementation 'com.github.alexandreprl:amak:3.1.0' // Uncomment this line to get AMAK from git repository (The last part matches a tag, a commit hash or the last commit of a branch : branchName-SNAPSHOT
 //    implementation project(':amak') // Uncomment this line to get AMAK from local
 
     
diff --git a/settings.gradle b/settings.gradle
index 751f796d2b7a7a131bb790a9d57e6df92860f948..6252cdbf25ab382b333aca53bb04ca297753c800 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'CluMATE'
+rootProject.name = 'AMAS4DC'
 
 // Uncomment the two next lines when building amak locally
 //include ':amak'
diff --git a/src/main/java/fr/irit/smac/amas4dc/AMAS4DC.java b/src/main/java/fr/irit/smac/amas4dc/AMAS4DC.java
new file mode 100644
index 0000000000000000000000000000000000000000..cdbab095a8f2c5104bec773f6ed0d352c27d22a2
--- /dev/null
+++ b/src/main/java/fr/irit/smac/amas4dc/AMAS4DC.java
@@ -0,0 +1,26 @@
+package fr.irit.smac.amas4dc;
+
+import fr.irit.smac.amas4dc.amas.MASSettings;
+import fr.irit.smac.amas4dc.amas.controller.AMAS4DCCommandAndQueryHandler;
+import fr.irit.smac.amas4dc.amas.controller.command.NewDataPointCommand;
+import fr.irit.smac.amas4dc.amas.controller.command.SolveCommand;
+import fr.irit.smac.amas4dc.amas.controller.query.Result;
+import fr.irit.smac.amas4dc.amas.controller.query.RetrieveClustersResultQuery;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
+
+import java.util.List;
+
+public class AMAS4DC<T extends DataPoint> {
+	private final AMAS4DCCommandAndQueryHandler<T> controller;
+
+	public AMAS4DC(MASSettings<T> masSettings) {
+		this.controller = new AMAS4DCCommandAndQueryHandler<T>(masSettings);
+	}
+	public void fit(List<T> data) {
+		controller.handle(new NewDataPointCommand<T>(data));
+		controller.handle(new SolveCommand());
+	}
+	public Result<T> retrieveClusters() {
+		return controller.handle(new RetrieveClustersResultQuery());
+	}
+}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/AMASOption.java b/src/main/java/fr/irit/smac/amas4dc/amas/AMASOption.java
similarity index 50%
rename from src/main/java/fr/irit/smac/clumate/amas/AMASOption.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/AMASOption.java
index 8d83d0a0d4572f748a7c88fe58c0b4f99df3d6a0..5e44aa488f3692a07be7c398ffea871c6e4e5330 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/AMASOption.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/AMASOption.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.amas;
+package fr.irit.smac.amas4dc.amas;
 
 public enum AMASOption {
 	Forget
diff --git a/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java b/src/main/java/fr/irit/smac/amas4dc/amas/ClusterAgent.java
similarity index 94%
rename from src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/ClusterAgent.java
index 7255ce5e32cbfb74aa01077fc50612e9473a3bc0..017ec176879aad564ce07864c39489e0de6cafbe 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/ClusterAgent.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/ClusterAgent.java
@@ -1,13 +1,12 @@
-package fr.irit.smac.clumate.amas;
+package fr.irit.smac.amas4dc.amas;
 
 import fr.irit.smac.amak.Agent;
-import fr.irit.smac.amak.event.EventStore;
-import fr.irit.smac.clumate.amas.messages.EvaluatedScoreMessage;
-import fr.irit.smac.clumate.amas.messages.RequestSimilarityMessage;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
-import fr.irit.smac.clumate.event.NewClusterEvent;
-import fr.irit.smac.clumate.event.RemoveClusterEvent;
+import fr.irit.smac.amas4dc.amas.messages.EvaluatedScoreMessage;
+import fr.irit.smac.amas4dc.amas.messages.RequestSimilarityMessage;
+import fr.irit.smac.amas4dc.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
+import fr.irit.smac.amas4dc.event.NewClusterEvent;
+import fr.irit.smac.amas4dc.event.RemoveClusterEvent;
 import lombok.Getter;
 
 import java.text.MessageFormat;
@@ -15,7 +14,7 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ClusterAgent<T extends DataPoint> extends Agent<ClusterAMAS<T>, ClusterEnvironment<T>> {
+public class ClusterAgent<T extends DataPoint> extends Agent<DynamicClusteringAMAS<T>, DynamicClusteringEnvironment<T>> {
 	private static final float FLOAT_COMPARISON_EPSILON = 0.000001f;
 	@Getter
 	private Cluster<T> cluster;
@@ -43,7 +42,7 @@ public class ClusterAgent<T extends DataPoint> extends Agent<ClusterAMAS<T>, Clu
 	private static final Logger logger = Logger.getLogger(ClusterAgent.class.getName());
 	private int amountOfCyclesWithTheSameState;
 
-	protected ClusterAgent(ClusterAMAS amas, T dataPoint) {
+	protected ClusterAgent(DynamicClusteringAMAS amas, T dataPoint) {
 		super(amas);
 		this.setCluster(new Cluster<T>(dataPoint));
 	}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/ClusterAMAS.java b/src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringAMAS.java
similarity index 77%
rename from src/main/java/fr/irit/smac/clumate/amas/ClusterAMAS.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringAMAS.java
index e127ef61e643595a52456e4c1246e63675ff149b..1ec5d63c109e4cbd0e55a4c1de8da448efe1df48 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/ClusterAMAS.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringAMAS.java
@@ -1,9 +1,7 @@
-package fr.irit.smac.clumate.amas;
+package fr.irit.smac.amas4dc.amas;
 
 import fr.irit.smac.amak.Amas;
-import fr.irit.smac.amak.event.EventStore;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,14 +9,14 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ClusterAMAS<T extends DataPoint> extends Amas<ClusterEnvironment<T>> {
-	private static final Logger logger = Logger.getLogger(ClusterAMAS.class.getName());
+public class DynamicClusteringAMAS<T extends DataPoint> extends Amas<DynamicClusteringEnvironment<T>> {
+	private static final Logger logger = Logger.getLogger(DynamicClusteringAMAS.class.getName());
 	@Setter
 	private Consumer<Integer> onCycleEnd;
 	@Getter
 	private final MASSettings<T> masSettings;
 
-	public ClusterAMAS(ClusterEnvironment<T> environment, MASSettings<T> masSettings) {
+	public DynamicClusteringAMAS(DynamicClusteringEnvironment<T> environment, MASSettings<T> masSettings) {
 		super(environment, 1, ExecutionPolicy.TWO_PHASES);
 		this.masSettings = masSettings;
 	}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/ClusterEnvironment.java b/src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringEnvironment.java
similarity index 83%
rename from src/main/java/fr/irit/smac/clumate/amas/ClusterEnvironment.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringEnvironment.java
index 64246ba55aaf81948e12fd5ba16ac45599398134..e51bceaa64a117c86b7643facfd91c7a2434ca5e 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/ClusterEnvironment.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/DynamicClusteringEnvironment.java
@@ -1,7 +1,7 @@
-package fr.irit.smac.clumate.amas;
+package fr.irit.smac.amas4dc.amas;
 
 import fr.irit.smac.amak.Environment;
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 import lombok.Getter;
 
 import java.util.*;
@@ -9,10 +9,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Logger;
 
-public class ClusterEnvironment<T extends DataPoint> extends Environment {
+public class DynamicClusteringEnvironment<T extends DataPoint> extends Environment {
 
 	private final Queue<T> pendingAdditionDataPoints = new ConcurrentLinkedQueue<>();
-	private static final Logger logger = Logger.getLogger(ClusterEnvironment.class.getName());
+	private static final Logger logger = Logger.getLogger(DynamicClusteringEnvironment.class.getName());
 	@Getter
 	private T lastPolledPendingDataPoint = null;
 	private final Map<Integer, List<ClusterAgent<T>>> buckets = new ConcurrentHashMap<>();
diff --git a/src/main/java/fr/irit/smac/clumate/amas/MASSettings.java b/src/main/java/fr/irit/smac/amas4dc/amas/MASSettings.java
similarity index 69%
rename from src/main/java/fr/irit/smac/clumate/amas/MASSettings.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/MASSettings.java
index 9adf5359a75872e749a78c84dcf99137a6ea8884..f4a04b84aae0374bcccd8af17e5e9a5e9f03a752 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/MASSettings.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/MASSettings.java
@@ -1,10 +1,10 @@
-package fr.irit.smac.clumate.amas;
+package fr.irit.smac.amas4dc.amas;
 
 import fr.irit.smac.amak.event.EventStore;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
-import fr.irit.smac.clumate.cluster.DataPointFuser;
-import fr.irit.smac.clumate.cluster.SimilarityScoreMethod;
+import fr.irit.smac.amas4dc.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.DataPointFuser;
+import fr.irit.smac.amas4dc.cluster.SimilarityScoreMethod;
 
 import java.util.EnumSet;
 
diff --git a/src/main/java/fr/irit/smac/amas4dc/amas/controller/AMAS4DCCommandAndQueryHandler.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/AMAS4DCCommandAndQueryHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..c5a94a81e7e79d76efb8d73d1f7e4b3c33560c74
--- /dev/null
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/AMAS4DCCommandAndQueryHandler.java
@@ -0,0 +1,51 @@
+package fr.irit.smac.amas4dc.amas.controller;
+
+import fr.irit.smac.amak.scheduling.Scheduler;
+import fr.irit.smac.amas4dc.amas.controller.command.NewDataPointCommand;
+import fr.irit.smac.amas4dc.amas.controller.command.ShutdownCommand;
+import fr.irit.smac.amas4dc.amas.controller.command.SolveCommand;
+import fr.irit.smac.amas4dc.amas.controller.query.Result;
+import fr.irit.smac.amas4dc.amas.controller.query.RetrieveClustersResultQuery;
+import fr.irit.smac.amas4dc.amas.DynamicClusteringAMAS;
+import fr.irit.smac.amas4dc.amas.ClusterAgent;
+import fr.irit.smac.amas4dc.amas.DynamicClusteringEnvironment;
+import fr.irit.smac.amas4dc.amas.MASSettings;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
+import lombok.Getter;
+
+import java.util.concurrent.Executors;
+
+public class AMAS4DCCommandAndQueryHandler<T extends DataPoint> {
+	@Getter
+	private final DynamicClusteringEnvironment<T> environment;
+	@Getter
+	private final MASSettings<T> masSettings;
+	@Getter
+	private final DynamicClusteringAMAS<T> amas;
+	@Getter
+	private final Scheduler scheduler;
+
+	public AMAS4DCCommandAndQueryHandler(MASSettings<T> masSettings) {
+		this.masSettings = masSettings;
+		environment = new DynamicClusteringEnvironment<T>();
+		amas = new DynamicClusteringAMAS<T>(environment, masSettings);
+		scheduler = new Scheduler(Executors.newSingleThreadExecutor(), amas, environment);
+	}
+
+	public void handle(NewDataPointCommand<T> newDataPointCommand) {
+		environment.addDataPoints(newDataPointCommand.newDataPoints());
+	}
+
+	public void handle(SolveCommand solveCommand) {
+		scheduler.startWithSleepSync(0);
+	}
+
+	public void handle(ShutdownCommand shutdownCommand) {
+		scheduler.stop();
+	}
+
+	public Result<T> handle(RetrieveClustersResultQuery retrieveClustersResultQuery) {
+		var clusters = amas.getAgents(ClusterAgent.class).stream().map(agent -> ((ClusterAgent<T>) agent).getCluster()).toList();
+		return new Result<T>(clusters, masSettings);
+	}
+}
diff --git a/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/Command.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/Command.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a1afa235677c7157d227522503f3acd79c7360e
--- /dev/null
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/Command.java
@@ -0,0 +1,4 @@
+package fr.irit.smac.amas4dc.amas.controller.command;
+
+public interface Command {
+}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/command/NewDataPointCommand.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/NewDataPointCommand.java
similarity index 55%
rename from src/main/java/fr/irit/smac/clumate/amas/controller/command/NewDataPointCommand.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/controller/command/NewDataPointCommand.java
index 1ec497ca9e5527c694631590d89f2a6c0af8f5e8..70c99e2b3721342e7429d2ce8351a42048fc0658 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/command/NewDataPointCommand.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/NewDataPointCommand.java
@@ -1,6 +1,6 @@
-package fr.irit.smac.clumate.amas.controller.command;
+package fr.irit.smac.amas4dc.amas.controller.command;
 
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 
 import java.util.List;
 
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/command/ShutdownCommand.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/ShutdownCommand.java
similarity index 50%
rename from src/main/java/fr/irit/smac/clumate/amas/controller/command/ShutdownCommand.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/controller/command/ShutdownCommand.java
index 2345a49d312a4812b7a8eff62dc6aeb463ad337a..564f1151018ef26ce1d33b35d6375fdbde554a32 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/command/ShutdownCommand.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/ShutdownCommand.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.amas.controller.command;
+package fr.irit.smac.amas4dc.amas.controller.command;
 
 public record ShutdownCommand() implements Command {
 }
diff --git a/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/SolveCommand.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/SolveCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..512d2cd9165eb82dceb3c3acde02aad745880d0e
--- /dev/null
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/command/SolveCommand.java
@@ -0,0 +1,4 @@
+package fr.irit.smac.amas4dc.amas.controller.command;
+
+public record SolveCommand() implements Command {
+}
diff --git a/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Query.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Query.java
new file mode 100644
index 0000000000000000000000000000000000000000..0c3a75a7b531942141336514cac0f5b3d248a888
--- /dev/null
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Query.java
@@ -0,0 +1,4 @@
+package fr.irit.smac.amas4dc.amas.controller.query;
+
+public interface Query {
+}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/query/Result.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Result.java
similarity index 75%
rename from src/main/java/fr/irit/smac/clumate/amas/controller/query/Result.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Result.java
index aa5fba7217d5fb7496cdb9024b37c924ba6d11ce..500d99ec68f3873b87fb5b9bc5098053c1e31e29 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/query/Result.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/Result.java
@@ -1,8 +1,8 @@
-package fr.irit.smac.clumate.amas.controller.query;
+package fr.irit.smac.amas4dc.amas.controller.query;
 
-import fr.irit.smac.clumate.amas.MASSettings;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.amas.MASSettings;
+import fr.irit.smac.amas4dc.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 
 import java.util.List;
 
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/query/RetrieveClustersResultQuery.java b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/RetrieveClustersResultQuery.java
similarity index 55%
rename from src/main/java/fr/irit/smac/clumate/amas/controller/query/RetrieveClustersResultQuery.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/controller/query/RetrieveClustersResultQuery.java
index efe797e20912a6edf9102769ca7e134919673b53..72ed58cc06c0907ca98c0015a15cc4a8021b0bc6 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/query/RetrieveClustersResultQuery.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/controller/query/RetrieveClustersResultQuery.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.amas.controller.query;
+package fr.irit.smac.amas4dc.amas.controller.query;
 
 public record RetrieveClustersResultQuery() implements Query {
 }
diff --git a/src/main/java/fr/irit/smac/clumate/amas/messages/EvaluatedScoreMessage.java b/src/main/java/fr/irit/smac/amas4dc/amas/messages/EvaluatedScoreMessage.java
similarity index 89%
rename from src/main/java/fr/irit/smac/clumate/amas/messages/EvaluatedScoreMessage.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/messages/EvaluatedScoreMessage.java
index 67a311e75912267a01b8441a607a06f3ba92ad35..f2a381b37d31cf10ff80c9306d57c9ff59fea5e4 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/messages/EvaluatedScoreMessage.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/messages/EvaluatedScoreMessage.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.amas.messages;
+package fr.irit.smac.amas4dc.amas.messages;
 
 import fr.irit.smac.amak.Agent;
 import fr.irit.smac.amak.messaging.Message;
diff --git a/src/main/java/fr/irit/smac/clumate/amas/messages/RequestSimilarityMessage.java b/src/main/java/fr/irit/smac/amas4dc/amas/messages/RequestSimilarityMessage.java
similarity index 77%
rename from src/main/java/fr/irit/smac/clumate/amas/messages/RequestSimilarityMessage.java
rename to src/main/java/fr/irit/smac/amas4dc/amas/messages/RequestSimilarityMessage.java
index 4cae77f7d33a52dd534cddb4151f93bdc64c904b..f2846dd4cd721171a1c1e133b4c05c03b3561119 100644
--- a/src/main/java/fr/irit/smac/clumate/amas/messages/RequestSimilarityMessage.java
+++ b/src/main/java/fr/irit/smac/amas4dc/amas/messages/RequestSimilarityMessage.java
@@ -1,6 +1,6 @@
-package fr.irit.smac.clumate.amas.messages;
+package fr.irit.smac.amas4dc.amas.messages;
 
-import fr.irit.smac.clumate.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.Cluster;
 import fr.irit.smac.amak.Agent;
 import fr.irit.smac.amak.messaging.Message;
 import lombok.Getter;
diff --git a/src/main/java/fr/irit/smac/clumate/cluster/Cluster.java b/src/main/java/fr/irit/smac/amas4dc/cluster/Cluster.java
similarity index 92%
rename from src/main/java/fr/irit/smac/clumate/cluster/Cluster.java
rename to src/main/java/fr/irit/smac/amas4dc/cluster/Cluster.java
index bf5eb79b62168c1331b0e6a1f29d8634b3263989..a17bbc964d9f49a3080c9205d05f1eb10273a9ba 100644
--- a/src/main/java/fr/irit/smac/clumate/cluster/Cluster.java
+++ b/src/main/java/fr/irit/smac/amas4dc/cluster/Cluster.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.cluster;
+package fr.irit.smac.amas4dc.cluster;
 
 import lombok.Getter;
 import lombok.ToString;
diff --git a/src/main/java/fr/irit/smac/clumate/cluster/DataPoint.java b/src/main/java/fr/irit/smac/amas4dc/cluster/DataPoint.java
similarity index 66%
rename from src/main/java/fr/irit/smac/clumate/cluster/DataPoint.java
rename to src/main/java/fr/irit/smac/amas4dc/cluster/DataPoint.java
index 923b8b17491b3d3e1c36d40a8e793c0366fbdb7d..ac62dcb46e59f528551a865778050668281af5b4 100644
--- a/src/main/java/fr/irit/smac/clumate/cluster/DataPoint.java
+++ b/src/main/java/fr/irit/smac/amas4dc/cluster/DataPoint.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.cluster;
+package fr.irit.smac.amas4dc.cluster;
 
 public interface DataPoint {
 	default int getBucketId() {
diff --git a/src/main/java/fr/irit/smac/clumate/cluster/DataPointFuser.java b/src/main/java/fr/irit/smac/amas4dc/cluster/DataPointFuser.java
similarity index 76%
rename from src/main/java/fr/irit/smac/clumate/cluster/DataPointFuser.java
rename to src/main/java/fr/irit/smac/amas4dc/cluster/DataPointFuser.java
index 2a64227d3c42e3ff5d65d2f955db261807500b4f..9d833f06bc8df0bc087a46e821ac03939c93214e 100644
--- a/src/main/java/fr/irit/smac/clumate/cluster/DataPointFuser.java
+++ b/src/main/java/fr/irit/smac/amas4dc/cluster/DataPointFuser.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.cluster;
+package fr.irit.smac.amas4dc.cluster;
 
 import java.util.function.BiFunction;
 
diff --git a/src/main/java/fr/irit/smac/clumate/cluster/SimilarityScoreMethod.java b/src/main/java/fr/irit/smac/amas4dc/cluster/SimilarityScoreMethod.java
similarity index 82%
rename from src/main/java/fr/irit/smac/clumate/cluster/SimilarityScoreMethod.java
rename to src/main/java/fr/irit/smac/amas4dc/cluster/SimilarityScoreMethod.java
index 59a6410f0e0e2e76838845f83806924e6bb8e00e..a6e40d90a87b9e5a22d7336e8ffff230324ac53b 100644
--- a/src/main/java/fr/irit/smac/clumate/cluster/SimilarityScoreMethod.java
+++ b/src/main/java/fr/irit/smac/amas4dc/cluster/SimilarityScoreMethod.java
@@ -1,4 +1,4 @@
-package fr.irit.smac.clumate.cluster;
+package fr.irit.smac.amas4dc.cluster;
 
 
 public interface SimilarityScoreMethod<T extends DataPoint> {
diff --git a/src/main/java/fr/irit/smac/clumate/event/NewClusterEvent.java b/src/main/java/fr/irit/smac/amas4dc/event/NewClusterEvent.java
similarity index 50%
rename from src/main/java/fr/irit/smac/clumate/event/NewClusterEvent.java
rename to src/main/java/fr/irit/smac/amas4dc/event/NewClusterEvent.java
index 2ef7580c464cde43d50f40e5d2aa0837ba8a00b6..8c71881c7ca017a509a6b2bfe33897bba5d89d38 100644
--- a/src/main/java/fr/irit/smac/clumate/event/NewClusterEvent.java
+++ b/src/main/java/fr/irit/smac/amas4dc/event/NewClusterEvent.java
@@ -1,8 +1,8 @@
-package fr.irit.smac.clumate.event;
+package fr.irit.smac.amas4dc.event;
 
 import fr.irit.smac.amak.event.Event;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 
 public record NewClusterEvent<T extends DataPoint>(Cluster<T> cluster) implements Event {
 }
diff --git a/src/main/java/fr/irit/smac/clumate/event/RemoveClusterEvent.java b/src/main/java/fr/irit/smac/amas4dc/event/RemoveClusterEvent.java
similarity index 51%
rename from src/main/java/fr/irit/smac/clumate/event/RemoveClusterEvent.java
rename to src/main/java/fr/irit/smac/amas4dc/event/RemoveClusterEvent.java
index 6137a81cc5f11fc1a609f951fa8697da25dee27e..be840a534fc8f4da526c7952090ea3bbce024e2d 100644
--- a/src/main/java/fr/irit/smac/clumate/event/RemoveClusterEvent.java
+++ b/src/main/java/fr/irit/smac/amas4dc/event/RemoveClusterEvent.java
@@ -1,8 +1,8 @@
-package fr.irit.smac.clumate.event;
+package fr.irit.smac.amas4dc.event;
 
 import fr.irit.smac.amak.event.Event;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
+import fr.irit.smac.amas4dc.cluster.Cluster;
+import fr.irit.smac.amas4dc.cluster.DataPoint;
 
 public record RemoveClusterEvent<T extends DataPoint>(Cluster<T> cluster) implements Event {
 }
diff --git a/src/main/java/fr/irit/smac/clumate/CluMATE.java b/src/main/java/fr/irit/smac/clumate/CluMATE.java
deleted file mode 100644
index 8dfbabf4d57ab48f5d0c6e00b90e1c6c5b5cf769..0000000000000000000000000000000000000000
--- a/src/main/java/fr/irit/smac/clumate/CluMATE.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fr.irit.smac.clumate;
-
-import fr.irit.smac.amak.event.EventStore;
-import fr.irit.smac.clumate.amas.MASSettings;
-import fr.irit.smac.clumate.amas.controller.CluMATEController;
-import fr.irit.smac.clumate.amas.controller.command.NewDataPointCommand;
-import fr.irit.smac.clumate.amas.controller.command.SolveCommand;
-import fr.irit.smac.clumate.amas.controller.query.Result;
-import fr.irit.smac.clumate.amas.controller.query.RetrieveClustersResultQuery;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
-
-import java.util.List;
-
-public class CluMATE<T extends DataPoint> {
-	private final CluMATEController<T> controller;
-
-	public CluMATE(MASSettings<T> masSettings) {
-		this.controller = new CluMATEController<T>(masSettings);
-	}
-	public void fit(List<T> data) {
-		controller.handle(new NewDataPointCommand<T>(data));
-		controller.handle(new SolveCommand());
-	}
-	public Result<T> retrieveClusters() {
-		return controller.handle(new RetrieveClustersResultQuery());
-	}
-}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/CluMATEController.java b/src/main/java/fr/irit/smac/clumate/amas/controller/CluMATEController.java
deleted file mode 100644
index 7f14015c434ea16995b8c53ccf899218a97f12fe..0000000000000000000000000000000000000000
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/CluMATEController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package fr.irit.smac.clumate.amas.controller;
-
-import fr.irit.smac.amak.event.EventStore;
-import fr.irit.smac.amak.scheduling.Scheduler;
-import fr.irit.smac.clumate.amas.controller.command.NewDataPointCommand;
-import fr.irit.smac.clumate.amas.controller.command.ShutdownCommand;
-import fr.irit.smac.clumate.amas.controller.command.SolveCommand;
-import fr.irit.smac.clumate.amas.controller.query.Result;
-import fr.irit.smac.clumate.amas.controller.query.RetrieveClustersResultQuery;
-import fr.irit.smac.clumate.amas.ClusterAMAS;
-import fr.irit.smac.clumate.amas.ClusterAgent;
-import fr.irit.smac.clumate.amas.ClusterEnvironment;
-import fr.irit.smac.clumate.amas.MASSettings;
-import fr.irit.smac.clumate.cluster.Cluster;
-import fr.irit.smac.clumate.cluster.DataPoint;
-import lombok.Getter;
-
-import java.util.concurrent.Executors;
-
-public class CluMATEController<T extends DataPoint> {
-	@Getter
-	private final ClusterEnvironment<T> environment;
-	@Getter
-	private final MASSettings<T> masSettings;
-	@Getter
-	private final ClusterAMAS<T> amas;
-	@Getter
-	private final Scheduler scheduler;
-
-	public CluMATEController(MASSettings<T> masSettings) {
-		this.masSettings = masSettings;
-		environment = new ClusterEnvironment<T>();
-		amas = new ClusterAMAS<T>(environment, masSettings);
-		scheduler = new Scheduler(Executors.newSingleThreadExecutor(), amas, environment);
-	}
-
-	public void handle(NewDataPointCommand<T> newDataPointCommand) {
-		environment.addDataPoints(newDataPointCommand.newDataPoints());
-	}
-
-	public void handle(SolveCommand solveCommand) {
-		scheduler.startWithSleepSync(0);
-	}
-
-	public void handle(ShutdownCommand shutdownCommand) {
-		scheduler.stop();
-	}
-
-	public Result<T> handle(RetrieveClustersResultQuery retrieveClustersResultQuery) {
-		var clusters = amas.getAgents(ClusterAgent.class).stream().map(agent -> ((ClusterAgent<T>) agent).getCluster()).toList();
-		return new Result<T>(clusters, masSettings);
-	}
-}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/command/Command.java b/src/main/java/fr/irit/smac/clumate/amas/controller/command/Command.java
deleted file mode 100644
index ed8e0ada6c718f87aa9efaeae6b3eb97813030f1..0000000000000000000000000000000000000000
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/command/Command.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package fr.irit.smac.clumate.amas.controller.command;
-
-public interface Command {
-}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/command/SolveCommand.java b/src/main/java/fr/irit/smac/clumate/amas/controller/command/SolveCommand.java
deleted file mode 100644
index 7af6bdf5d371c834d9988bd75d6172c814142eb2..0000000000000000000000000000000000000000
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/command/SolveCommand.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package fr.irit.smac.clumate.amas.controller.command;
-
-public record SolveCommand() implements Command {
-}
diff --git a/src/main/java/fr/irit/smac/clumate/amas/controller/query/Query.java b/src/main/java/fr/irit/smac/clumate/amas/controller/query/Query.java
deleted file mode 100644
index c6ae431415beefca372910ed824007eb0aebb330..0000000000000000000000000000000000000000
--- a/src/main/java/fr/irit/smac/clumate/amas/controller/query/Query.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package fr.irit.smac.clumate.amas.controller.query;
-
-public interface Query {
-}
diff --git a/src/test/groovy/SimpleClusteringIT.groovy b/src/test/groovy/SimpleClusteringIT.groovy
index a27cd58c67dec12643b6c0ed9f0840e72d82965c..ced6dec1e065aaa9704edafd51f4943a86e0da47 100644
--- a/src/test/groovy/SimpleClusteringIT.groovy
+++ b/src/test/groovy/SimpleClusteringIT.groovy
@@ -1,22 +1,20 @@
-import fr.irit.smac.amak.event.EventStore
-import fr.irit.smac.clumate.CluMATE
-import fr.irit.smac.clumate.amas.AMASOption
-import fr.irit.smac.clumate.amas.MASSettings
-import fr.irit.smac.clumate.cluster.Cluster
-import fr.irit.smac.clumate.cluster.DataPoint
-import fr.irit.smac.clumate.cluster.SimilarityScoreMethod
+import fr.irit.smac.amas4dc.AMAS4DC
+import fr.irit.smac.amas4dc.amas.AMASOption
+import fr.irit.smac.amas4dc.amas.MASSettings
+import fr.irit.smac.amas4dc.cluster.DataPoint
+import fr.irit.smac.amas4dc.cluster.SimilarityScoreMethod
 import spock.lang.Specification
 
 class SimpleClusteringIT extends Specification {
 	def "Clustering of two similar 1D objects"() {
 		given:
-		def clumate = new CluMATE<OneDDataPoint>(new MASSettings(new OneDSimilarityScoreMethod(), 0.5f, EnumSet.noneOf(AMASOption), (OneDDataPoint dp1, OneDDataPoint dp2) -> {
+		def amas4dc = new AMAS4DC<OneDDataPoint>(new MASSettings(new OneDSimilarityScoreMethod(), 0.5f, EnumSet.noneOf(AMASOption), (OneDDataPoint dp1, OneDDataPoint dp2) -> {
 			return new OneDDataPoint(dp1.value + (dp2.value - dp1.value) * 0.1f)
 		}))
 
 		when:
-		clumate.fit([new OneDDataPoint(1), new OneDDataPoint(2)])
-		var results = clumate.retrieveClusters()
+		amas4dc.fit([new OneDDataPoint(1), new OneDDataPoint(2)])
+		var results = amas4dc.retrieveClusters()
 
 		then:
 		results.clusters().size() == 1
diff --git a/src/test/groovy/fr/irit/smac/clumate/amas/ClusterAgentTest.groovy b/src/test/groovy/fr/irit/smac/amas4dc/amas/ClusterAgentTest.groovy
similarity index 69%
rename from src/test/groovy/fr/irit/smac/clumate/amas/ClusterAgentTest.groovy
rename to src/test/groovy/fr/irit/smac/amas4dc/amas/ClusterAgentTest.groovy
index 699e79bbdbd4a30cff20a5eecc963f737f55b5be..c858fd57f69270ca4e87189b84ce08f109071313 100644
--- a/src/test/groovy/fr/irit/smac/clumate/amas/ClusterAgentTest.groovy
+++ b/src/test/groovy/fr/irit/smac/amas4dc/amas/ClusterAgentTest.groovy
@@ -1,14 +1,13 @@
-package fr.irit.smac.clumate.amas
+package fr.irit.smac.amas4dc.amas
+
 
-import fr.irit.smac.amak.event.EventStore
 import fr.irit.smac.amak.messaging.Mailbox
-import fr.irit.smac.amak.messaging.Message
-import fr.irit.smac.clumate.amas.messages.EvaluatedScoreMessage
-import fr.irit.smac.clumate.amas.messages.RequestSimilarityMessage
-import fr.irit.smac.clumate.cluster.Cluster
-import fr.irit.smac.clumate.cluster.DataPoint
-import fr.irit.smac.clumate.cluster.DataPointFuser
-import fr.irit.smac.clumate.cluster.SimilarityScoreMethod
+import fr.irit.smac.amas4dc.amas.messages.EvaluatedScoreMessage
+import fr.irit.smac.amas4dc.amas.messages.RequestSimilarityMessage
+import fr.irit.smac.amas4dc.cluster.Cluster
+import fr.irit.smac.amas4dc.cluster.DataPoint
+import fr.irit.smac.amas4dc.cluster.DataPointFuser
+import fr.irit.smac.amas4dc.cluster.SimilarityScoreMethod
 import spock.lang.Specification
 import spock.util.concurrent.BlockingVariable
 
@@ -20,9 +19,9 @@ class ClusterAgentTest extends Specification {
 		def similarityScoreMethodMock = Mock(SimilarityScoreMethod)
 		similarityScoreMethodMock.apply(_, _) >> 0.3
 
-		def amasMock = Mock(ClusterAMAS<DataPoint>)
+		def amasMock = Mock(DynamicClusteringAMAS<DataPoint>)
 		amasMock.getMasSettings() >> new MASSettings(similarityScoreMethodMock, 0.5f, EnumSet.noneOf(AMASOption), Mock(DataPointFuser))
-		amasMock.getEnvironment() >> Mock(ClusterEnvironment)
+		amasMock.getEnvironment() >> Mock(DynamicClusteringEnvironment)
 
 		def agent = new ClusterAgent(amasMock, Mock(DataPoint))
 		agent.state = ClusterAgent.State.DORMANT