diff --git a/app/pom.xml b/app/pom.xml
index 4c6e173..be10369 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -6,7 +6,7 @@
 	<version>1.0-SNAPSHOT</version>
 
 	<properties>
-		<main-class>org.toop.Main</main-class>
+		<main-class>org.toop.app.Main</main-class>
 	</properties>
 
 	<build>
diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/app/Main.java
similarity index 100%
rename from app/src/main/java/org/toop/Main.java
rename to app/src/main/java/org/toop/app/Main.java
diff --git a/app/src/main/java/org/toop/gui/BackgroundPanel.java b/app/src/main/java/org/toop/app/gui/BackgroundPanel.java
similarity index 100%
rename from app/src/main/java/org/toop/gui/BackgroundPanel.java
rename to app/src/main/java/org/toop/app/gui/BackgroundPanel.java
diff --git a/app/src/main/java/org/toop/gui/LocalGameSelector.form b/app/src/main/java/org/toop/app/gui/LocalGameSelector.form
similarity index 100%
rename from app/src/main/java/org/toop/gui/LocalGameSelector.form
rename to app/src/main/java/org/toop/app/gui/LocalGameSelector.form
diff --git a/app/src/main/java/org/toop/gui/LocalGameSelector.java b/app/src/main/java/org/toop/app/gui/LocalGameSelector.java
similarity index 97%
rename from app/src/main/java/org/toop/gui/LocalGameSelector.java
rename to app/src/main/java/org/toop/app/gui/LocalGameSelector.java
index ff11be8..cf4a44b 100644
--- a/app/src/main/java/org/toop/gui/LocalGameSelector.java
+++ b/app/src/main/java/org/toop/app/gui/LocalGameSelector.java
@@ -4,8 +4,8 @@ import java.awt.*;
 import javax.swing.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.app.tictactoe.LocalTicTacToe;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.LocalTicTacToe;
+import org.toop.tictactoe.gui.UIGameBoard;
 
 public class LocalGameSelector extends JFrame {
     private static final Logger logger = LogManager.getLogger(LocalGameSelector.class);
diff --git a/app/src/main/java/org/toop/gui/LocalServerSelector.form b/app/src/main/java/org/toop/app/gui/LocalServerSelector.form
similarity index 100%
rename from app/src/main/java/org/toop/gui/LocalServerSelector.form
rename to app/src/main/java/org/toop/app/gui/LocalServerSelector.form
diff --git a/app/src/main/java/org/toop/gui/LocalServerSelector.java b/app/src/main/java/org/toop/app/gui/LocalServerSelector.java
similarity index 100%
rename from app/src/main/java/org/toop/gui/LocalServerSelector.java
rename to app/src/main/java/org/toop/app/gui/LocalServerSelector.java
diff --git a/app/src/main/java/org/toop/gui/RemoteGameSelector.form b/app/src/main/java/org/toop/app/gui/RemoteGameSelector.form
similarity index 100%
rename from app/src/main/java/org/toop/gui/RemoteGameSelector.form
rename to app/src/main/java/org/toop/app/gui/RemoteGameSelector.form
diff --git a/app/src/main/java/org/toop/gui/RemoteGameSelector.java b/app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
similarity index 98%
rename from app/src/main/java/org/toop/gui/RemoteGameSelector.java
rename to app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
index de8e869..4ed6ee3 100644
--- a/app/src/main/java/org/toop/gui/RemoteGameSelector.java
+++ b/app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
@@ -10,9 +10,9 @@ import org.apache.logging.log4j.Logger;
 import org.toop.framework.eventbus.events.Events;
 import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.eventbus.events.NetworkEvents;
-import org.toop.app.tictactoe.LocalTicTacToe;
+import org.toop.tictactoe.LocalTicTacToe;
 import org.toop.framework.networking.NetworkingGameClientHandler;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.gui.UIGameBoard;
 
 public class RemoteGameSelector {
     private static final Logger logger = LogManager.getLogger(RemoteGameSelector.class);
diff --git a/app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java b/app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
index a3bc0ee..aef50e9 100644
--- a/app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
+++ b/app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
@@ -1,17 +1,16 @@
-package org.toop.app.tictactoe;
+package org.toop.tictactoe;
 
 import java.util.concurrent.*;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.eventbus.EventPublisher;
+import org.toop.framework.eventbus.EventPublisher;
 import org.toop.framework.eventbus.events.Events;
 import org.toop.framework.eventbus.events.NetworkEvents;
-import org.toop.app.tictactoe.gui.UIGameBoard;
+import org.toop.tictactoe.gui.UIGameBoard;
 import org.toop.framework.networking.NetworkingGameClientHandler;
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
 import org.toop.game.tictactoe.ai.MinMaxTicTacToe;
-import org.toop.games.tictactoe.TicTacToe;
 
 import java.util.function.Supplier;
 
diff --git a/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form
index 192a038..b69fad4 100644
--- a/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form
+++ b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.toop.app.tictactoe.gui.UIGameBoard">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.toop.tictactoe.gui.UIGameBoard">
   <grid id="27dc6" binding="tttPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
diff --git a/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
index 701354a..aa9ee5c 100644
--- a/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
+++ b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
@@ -1,4 +1,4 @@
-package org.toop.app.tictactoe.gui;
+package org.toop.tictactoe.gui;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -7,8 +7,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.toop.app.gui.LocalGameSelector;
 import org.toop.app.gui.RemoteGameSelector;
-import org.toop.app.tictactoe.LocalTicTacToe;
-import org.toop.games.GameBase;
+import org.toop.tictactoe.LocalTicTacToe;
+import org.toop.game.GameBase;
 
 public class UIGameBoard {
     private static final int TICTACTOE_SIZE = 3;
diff --git a/framework/src/main/java/org/toop/Logging.java b/framework/src/main/java/org/toop/framework/Logging.java
similarity index 100%
rename from framework/src/main/java/org/toop/Logging.java
rename to framework/src/main/java/org/toop/framework/Logging.java
diff --git a/framework/src/main/java/org/toop/eventbus/EventFlow.java b/framework/src/main/java/org/toop/framework/eventbus/EventFlow.java
similarity index 100%
rename from framework/src/main/java/org/toop/eventbus/EventFlow.java
rename to framework/src/main/java/org/toop/framework/eventbus/EventFlow.java
diff --git a/framework/src/main/java/org/toop/eventbus/GlobalEventBus.java b/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
similarity index 100%
rename from framework/src/main/java/org/toop/eventbus/GlobalEventBus.java
rename to framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
diff --git a/framework/src/main/java/org/toop/eventbus/events/EventWithUuid.java b/framework/src/main/java/org/toop/framework/eventbus/events/EventWithUuid.java
similarity index 100%
rename from framework/src/main/java/org/toop/eventbus/events/EventWithUuid.java
rename to framework/src/main/java/org/toop/framework/eventbus/events/EventWithUuid.java
diff --git a/framework/src/main/java/org/toop/eventbus/events/Events.java b/framework/src/main/java/org/toop/framework/eventbus/events/Events.java
similarity index 96%
rename from framework/src/main/java/org/toop/eventbus/events/Events.java
rename to framework/src/main/java/org/toop/framework/eventbus/events/Events.java
index 6ba3327..eb733a5 100644
--- a/framework/src/main/java/org/toop/eventbus/events/Events.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/events/Events.java
@@ -16,7 +16,7 @@ public class Events implements IEvent {
      * @throws Exception
      */
     public static Object get(String eventName, Object... args) throws Exception {
-        Class<?> clazz = Class.forName("org.toop.eventbus.events.Events$ServerEvents$" + eventName);
+        Class<?> clazz = Class.forName("org.toop.framework.eventbus.events.Events$ServerEvents$" + eventName);
         Class<?>[] paramTypes = Arrays.stream(args).map(Object::getClass).toArray(Class<?>[]::new);
         Constructor<?> constructor = clazz.getConstructor(paramTypes);
         return constructor.newInstance(args);
@@ -34,7 +34,7 @@ public class Events implements IEvent {
     public static Object get(String eventCategory, String eventName, Object... args)
             throws Exception {
         Class<?> clazz =
-                Class.forName("org.toop.eventbus.events.Events$" + eventCategory + "$" + eventName);
+                Class.forName("org.toop.framework.eventbus.events.Events$" + eventCategory + "$" + eventName);
         Class<?>[] paramTypes = Arrays.stream(args).map(Object::getClass).toArray(Class<?>[]::new);
         Constructor<?> constructor = clazz.getConstructor(paramTypes);
         return constructor.newInstance(args);
diff --git a/framework/src/main/java/org/toop/eventbus/events/IEvent.java b/framework/src/main/java/org/toop/framework/eventbus/events/IEvent.java
similarity index 100%
rename from framework/src/main/java/org/toop/eventbus/events/IEvent.java
rename to framework/src/main/java/org/toop/framework/eventbus/events/IEvent.java
diff --git a/framework/src/main/java/org/toop/eventbus/events/NetworkEvents.java b/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
similarity index 99%
rename from framework/src/main/java/org/toop/eventbus/events/NetworkEvents.java
rename to framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
index 7b9dbbd..ae7d190 100644
--- a/framework/src/main/java/org/toop/eventbus/events/NetworkEvents.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
@@ -50,7 +50,7 @@ public class NetworkEvents extends Events {
      * @param ip             The IP address of the server to connect to.
      * @param port           The port number of the server to connect to.
      * @param eventId        A unique identifier for this event, typically injected
-     *                       automatically by the {@link org.toop.eventbus.EventPublisher}.
+     *                       automatically by the {@link org.toop.framework.eventbus.EventPublisher}.
      */
     public record StartClient(
             Supplier<? extends NetworkingGameClientHandler> handlerFactory,
diff --git a/framework/src/main/java/org/toop/eventbus/events/ServerEvents.java b/framework/src/main/java/org/toop/framework/eventbus/events/ServerEvents.java
similarity index 100%
rename from framework/src/main/java/org/toop/eventbus/events/ServerEvents.java
rename to framework/src/main/java/org/toop/framework/eventbus/events/ServerEvents.java
diff --git a/framework/src/main/java/org/toop/networking/NetworkingClient.java b/framework/src/main/java/org/toop/framework/networking/NetworkingClient.java
similarity index 100%
rename from framework/src/main/java/org/toop/networking/NetworkingClient.java
rename to framework/src/main/java/org/toop/framework/networking/NetworkingClient.java
diff --git a/framework/src/main/java/org/toop/networking/NetworkingClientManager.java b/framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
similarity index 99%
rename from framework/src/main/java/org/toop/networking/NetworkingClientManager.java
rename to framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
index d11a9ff..e2772f9 100644
--- a/framework/src/main/java/org/toop/networking/NetworkingClientManager.java
+++ b/framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
@@ -6,7 +6,7 @@ import java.util.function.Supplier;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.eventbus.EventPublisher;
+import org.toop.framework.eventbus.EventPublisher;
 import org.toop.framework.eventbus.events.NetworkEvents;
 
 public class NetworkingClientManager {
diff --git a/framework/src/main/java/org/toop/networking/NetworkingGameClientHandler.java b/framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java
similarity index 100%
rename from framework/src/main/java/org/toop/networking/NetworkingGameClientHandler.java
rename to framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java
diff --git a/framework/src/main/java/org/toop/networking/handlers/NetworkingTicTacToeClientHandler.java b/framework/src/main/java/org/toop/framework/networking/handlers/NetworkingTicTacToeClientHandler.java
similarity index 100%
rename from framework/src/main/java/org/toop/networking/handlers/NetworkingTicTacToeClientHandler.java
rename to framework/src/main/java/org/toop/framework/networking/handlers/NetworkingTicTacToeClientHandler.java
diff --git a/framework/src/test/eventbus/EventPublisherSpeedTest.java b/framework/src/test/eventbus/EventPublisherSpeedTest.java
index 4653036..cf9b257 100644
--- a/framework/src/test/eventbus/EventPublisherSpeedTest.java
+++ b/framework/src/test/eventbus/EventPublisherSpeedTest.java
@@ -1,7 +1,6 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Test;
-import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.eventbus.events.EventWithUuid;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/framework/src/test/eventbus/EventPublisherStressTest.java b/framework/src/test/eventbus/EventPublisherStressTest.java
index 1bbca31..bd5219f 100644
--- a/framework/src/test/eventbus/EventPublisherStressTest.java
+++ b/framework/src/test/eventbus/EventPublisherStressTest.java
@@ -1,4 +1,4 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
diff --git a/framework/src/test/eventbus/EventPublisherTest.java b/framework/src/test/eventbus/EventPublisherTest.java
index 9602009..91d8d28 100644
--- a/framework/src/test/eventbus/EventPublisherTest.java
+++ b/framework/src/test/eventbus/EventPublisherTest.java
@@ -1,4 +1,4 @@
-package org.toop.eventbus;
+package org.toop.framework.eventbus;
 
 import org.junit.jupiter.api.Test;
 import org.toop.framework.eventbus.events.EventWithUuid;
diff --git a/framework/src/test/eventbus/GlobalEventBusTest.java b/framework/src/test/eventbus/GlobalEventBusTest.java
index 4bc6b02..4ed8d8b 100644
--- a/framework/src/test/eventbus/GlobalEventBusTest.java
+++ b/framework/src/test/eventbus/GlobalEventBusTest.java
@@ -1,9 +1,9 @@
-//package org.toop.eventbus;
+//package org.toop.framework.eventbus;
 //
 //import net.engio.mbassy.bus.publication.SyncAsyncPostCommand;
 //import org.junit.jupiter.api.AfterEach;
 //import org.junit.jupiter.api.Test;
-//import org.toop.eventbus.events.IEvent;
+//import org.toop.framework.eventbus.events.IEvent;
 //
 //import java.util.concurrent.atomic.AtomicBoolean;
 //import java.util.concurrent.atomic.AtomicReference;
diff --git a/games/pom.xml b/game/pom.xml
similarity index 100%
rename from games/pom.xml
rename to game/pom.xml
diff --git a/games/src/main/java/org/toop/GameBase.java b/game/src/main/java/org/toop/game/GameBase.java
similarity index 97%
rename from games/src/main/java/org/toop/GameBase.java
rename to game/src/main/java/org/toop/game/GameBase.java
index 78cc1d9..c6de8c3 100644
--- a/games/src/main/java/org/toop/GameBase.java
+++ b/game/src/main/java/org/toop/game/GameBase.java
@@ -1,4 +1,4 @@
-package org.toop.games;
+package org.toop.game;
 
 // Todo: refactor
 public abstract class GameBase {
diff --git a/games/src/main/java/org/toop/Player.java b/game/src/main/java/org/toop/game/Player.java
similarity index 91%
rename from games/src/main/java/org/toop/Player.java
rename to game/src/main/java/org/toop/game/Player.java
index c0cab79..3713bfe 100644
--- a/games/src/main/java/org/toop/Player.java
+++ b/game/src/main/java/org/toop/game/Player.java
@@ -1,4 +1,4 @@
-package org.toop.games;
+package org.toop.game;
 
 // Todo: refactor
 public class Player {
diff --git a/games/src/main/java/org/toop/tictactoe/TicTacToe.java b/game/src/main/java/org/toop/tictactoe/TicTacToe.java
similarity index 98%
rename from games/src/main/java/org/toop/tictactoe/TicTacToe.java
rename to game/src/main/java/org/toop/tictactoe/TicTacToe.java
index 25c0642..c9a293c 100644
--- a/games/src/main/java/org/toop/tictactoe/TicTacToe.java
+++ b/game/src/main/java/org/toop/tictactoe/TicTacToe.java
@@ -1,11 +1,11 @@
-package org.toop.games.tictactoe;
+package org.toop.tictactoe;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.games.GameBase;
-import org.toop.games.Player;
+import org.toop.game.GameBase;
+import org.toop.game.Player;
 import org.toop.backend.tictactoe.ParsedCommand;
 import org.toop.backend.tictactoe.TicTacToeServerCommand;
 
diff --git a/games/src/main/java/org/toop/tictactoe/TicTacToeAI.java b/game/src/main/java/org/toop/tictactoe/TicTacToeAI.java
similarity index 98%
rename from games/src/main/java/org/toop/tictactoe/TicTacToeAI.java
rename to game/src/main/java/org/toop/tictactoe/TicTacToeAI.java
index 12adacc..3eb475d 100644
--- a/games/src/main/java/org/toop/tictactoe/TicTacToeAI.java
+++ b/game/src/main/java/org/toop/tictactoe/TicTacToeAI.java
@@ -1,6 +1,6 @@
-package org.toop.games.tictactoe;
+package org.toop.tictactoe;
 
-import org.toop.games.GameBase;
+import org.toop.game.GameBase;
 
 // Todo: refactor
 public class TicTacToeAI {
diff --git a/games/src/main/resources/log4j2.xml b/game/src/main/resources/log4j2.xml
similarity index 100%
rename from games/src/main/resources/log4j2.xml
rename to game/src/main/resources/log4j2.xml
diff --git a/games/src/test/tictactoe/GameBaseTest.java b/game/src/test/tictactoe/GameBaseTest.java
similarity index 97%
rename from games/src/test/tictactoe/GameBaseTest.java
rename to game/src/test/tictactoe/GameBaseTest.java
index 3d21823..ed1f616 100644
--- a/games/src/test/tictactoe/GameBaseTest.java
+++ b/game/src/test/tictactoe/GameBaseTest.java
@@ -2,8 +2,8 @@ package org.toop.game.tictactoe;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.GameBase;
-import org.toop.games.Player;
+import org.toop.game.GameBase;
+import org.toop.game.Player;
 
 class GameBaseTest {
 
diff --git a/games/src/test/tictactoe/PlayerTest.java b/game/src/test/tictactoe/PlayerTest.java
similarity index 95%
rename from games/src/test/tictactoe/PlayerTest.java
rename to game/src/test/tictactoe/PlayerTest.java
index abf2d58..ca6151a 100644
--- a/games/src/test/tictactoe/PlayerTest.java
+++ b/game/src/test/tictactoe/PlayerTest.java
@@ -2,7 +2,7 @@ package org.toop.game.tictactoe;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.Player;
+import org.toop.game.Player;
 
 class PlayerTest {
 
diff --git a/games/src/test/tictactoe/ai/MinMaxTicTacToeTest.java b/game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
similarity index 98%
rename from games/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
rename to game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
index 789b480..9cb083f 100644
--- a/games/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
+++ b/game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.*;
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.toop.games.GameBase;
-import org.toop.games.tictactoe.TicTacToe;
+import org.toop.game.GameBase;
+import org.toop.tictactoe.TicTacToe;
 
 /** Unit tests for MinMaxTicTacToe AI. */
 public class MinMaxTicTacToeTest {
diff --git a/pom.xml b/pom.xml
index 435e53c..c9cef1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 
 	<modules>
 		<module>framework</module>
-		<module>games</module>
+		<module>game</module>
 		<module>app</module>
 	</modules>
 </project>
\ No newline at end of file