diff --git a/app/pom.xml b/app/pom.xml
index 189ade6..2bed1ea 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -149,11 +149,12 @@
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                         <arg>
                             -Xplugin:ErrorProne \
-                            -Xep:RestrictedApi:ERROR \
-                            -XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \
-                            -XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \
-                            -XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.
                         </arg>
+						<!--						TODO-->
+						<!--						-Xep:RestrictedApi:ERROR \-->
+						<!--						-XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \-->
+						<!--						-XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \-->
+						<!--						-XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.-->
                         <arg>-XDcompilePolicy=simple</arg>
                         <arg>--should-stop=ifError=FLOW</arg>
                     </compilerArgs>
diff --git a/framework/pom.xml b/framework/pom.xml
index b0e037c..5c1988d 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -161,12 +161,13 @@
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                         <arg>
-                            -Xplugin:ErrorProne \
-                            -Xep:RestrictedApi:ERROR \
-                            -XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \
-                            -XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \
-                            -XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.
+                            -Xplugin:ErrorProne
                         </arg>
+<!--						TODO-->
+<!--						-Xep:RestrictedApi:ERROR \-->
+<!--						-XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \-->
+<!--						-XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \-->
+<!--						-XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.-->
                         <arg>-XDcompilePolicy=simple</arg>
                         <arg>--should-stop=ifError=FLOW</arg>
                     </compilerArgs>
diff --git a/framework/src/main/java/org/toop/framework/audio/MusicManager.java b/framework/src/main/java/org/toop/framework/audio/MusicManager.java
index d6a40bb..1e5f691 100644
--- a/framework/src/main/java/org/toop/framework/audio/MusicManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/MusicManager.java
@@ -2,8 +2,9 @@ package org.toop.framework.audio;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.toop.framework.dispatch.interfaces.Dispatcher;
+import org.toop.framework.dispatch.JavaFXDispatcher;
 import org.toop.framework.annotations.TestsOnly;
-import org.toop.framework.audio.interfaces.Dispatcher;
 import org.toop.framework.resource.ResourceManager;
 import org.toop.framework.resource.resources.BaseResource;
 import org.toop.framework.resource.types.AudioResource;
diff --git a/framework/src/main/java/org/toop/framework/audio/interfaces/Dispatcher.java b/framework/src/main/java/org/toop/framework/audio/interfaces/Dispatcher.java
deleted file mode 100644
index 4013e44..0000000
--- a/framework/src/main/java/org/toop/framework/audio/interfaces/Dispatcher.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.toop.framework.audio.interfaces;
-
-// TODO isn't specific to audio
-public interface Dispatcher {
-    void run(Runnable task);
-}
diff --git a/framework/src/main/java/org/toop/framework/audio/JavaFXDispatcher.java b/framework/src/main/java/org/toop/framework/dispatch/JavaFXDispatcher.java
similarity index 60%
rename from framework/src/main/java/org/toop/framework/audio/JavaFXDispatcher.java
rename to framework/src/main/java/org/toop/framework/dispatch/JavaFXDispatcher.java
index 3346c08..6fd4d87 100644
--- a/framework/src/main/java/org/toop/framework/audio/JavaFXDispatcher.java
+++ b/framework/src/main/java/org/toop/framework/dispatch/JavaFXDispatcher.java
@@ -1,9 +1,8 @@
-package org.toop.framework.audio;
+package org.toop.framework.dispatch;
 
 import javafx.application.Platform;
-import org.toop.framework.audio.interfaces.Dispatcher;
+import org.toop.framework.dispatch.interfaces.Dispatcher;
 
-// TODO isn't specific to audio
 public class JavaFXDispatcher implements Dispatcher {
     @Override
     public void run(Runnable task) {
diff --git a/framework/src/main/java/org/toop/framework/dispatch/interfaces/Dispatcher.java b/framework/src/main/java/org/toop/framework/dispatch/interfaces/Dispatcher.java
new file mode 100644
index 0000000..17306d6
--- /dev/null
+++ b/framework/src/main/java/org/toop/framework/dispatch/interfaces/Dispatcher.java
@@ -0,0 +1,5 @@
+package org.toop.framework.dispatch.interfaces;
+
+public interface Dispatcher {
+    void run(Runnable task);
+}
diff --git a/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java b/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java
index 1e46274..815c401 100644
--- a/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java
+++ b/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java
@@ -2,7 +2,7 @@ package org.toop.framework.audio;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.framework.audio.interfaces.Dispatcher;
+import org.toop.framework.dispatch.interfaces.Dispatcher;
 import org.toop.framework.resource.resources.BaseResource;
 import org.toop.framework.resource.types.AudioResource;
 
diff --git a/game/pom.xml b/game/pom.xml
index efd9aaf..28a59b7 100644
--- a/game/pom.xml
+++ b/game/pom.xml
@@ -123,12 +123,13 @@
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                         <arg>
-                            -Xplugin:ErrorProne \
-                            -Xep:RestrictedApi:ERROR \
-                            -XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \
-                            -XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \
-                            -XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.
+                            -Xplugin:ErrorProne
                         </arg>
+						<!--						TODO-->
+						<!--						-Xep:RestrictedApi:ERROR \-->
+						<!--						-XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \-->
+						<!--						-XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \-->
+						<!--						-XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.-->
                         <arg>-XDcompilePolicy=simple</arg>
                         <arg>--should-stop=ifError=FLOW</arg>
                     </compilerArgs>
diff --git a/pom.xml b/pom.xml
index 8742145..ecc0238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,12 +131,13 @@
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                         <arg>
-                            -Xplugin:ErrorProne \
-                            -Xep:RestrictedApi:ERROR \
-                            -XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \
-                            -XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \
-                            -XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.
+                            -Xplugin:ErrorProne
                         </arg>
+						<!--						TODO-->
+						<!--						-Xep:RestrictedApi:ERROR \-->
+						<!--						-XepOpt:RestrictedApi:annotation=org.toop.framework.annotations.TestsOnly \-->
+						<!--						-XepOpt:RestrictedApi:allowlistRegex=(?s).*/src/test/java/.*|.*test\.java \-->
+						<!--						-XepOpt:RestrictedApi:message=This API is marked @TestsOnly and shouldn't be normally used.-->
                         <arg>-XDcompilePolicy=simple</arg>
                         <arg>--should-stop=ifError=FLOW</arg>
                     </compilerArgs>