diff --git a/landlords-common/pom.xml b/landlords-common/pom.xml
deleted file mode 100644
index b171d10..0000000
--- a/landlords-common/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>landlords-common</artifactId>
-	<name>landlords-common</name>
-	<description>This is a console version of the fight landlord game</description>
-
-	<parent>
-		<groupId>com.smallnico.ratel</groupId>
-		<artifactId>landlords</artifactId>
-		<version>1.4.0</version>
-	</parent>
-	
-</project>
\ No newline at end of file
diff --git a/landlords-server/Dockerfile b/landlords-server/Dockerfile
index 4ee5e4b..91ac2ca 100644
--- a/landlords-server/Dockerfile
+++ b/landlords-server/Dockerfile
@@ -2,15 +2,12 @@
 FROM maven:3.9-eclipse-temurin-21 AS build
 WORKDIR /build
 
-# Copy parent pom and all module poms first for dependency caching
+# Copy parent pom and server module pom first for dependency caching
 COPY pom.xml .
-COPY landlords-common/pom.xml landlords-common/
 COPY landlords-server/pom.xml landlords-server/
 
-# Copy sources (common + server)
-COPY landlords-common/src landlords-common/src
+# Copy sources
 COPY landlords-server/src landlords-server/src
-COPY protoc-resource protoc-resource
 
 RUN mvn -B -pl landlords-server -am clean package -DskipTests
 
diff --git a/landlords-server/pom.xml b/landlords-server/pom.xml
index 03af6af..00b9498 100644
--- a/landlords-server/pom.xml
+++ b/landlords-server/pom.xml
@@ -17,11 +17,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.smallnico.ratel</groupId>
-			<artifactId>landlords-common</artifactId>
-			<version>1.4.0</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/Board.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/Board.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/Board.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/Board.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/GameMove.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/GameMove.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/GameMove.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/GameMove.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/Msg.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/Msg.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/Msg.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/Msg.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/Room.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/Room.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/Room.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/Room.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java b/landlords-server/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/GameResult.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/GameResult.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/GameResult.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/GameResult.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/PieceType.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/PieceType.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/PieceType.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/PieceType.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/RoomType.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/RoomType.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/RoomType.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/RoomType.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java b/landlords-server/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java b/landlords-server/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/features/Features.java b/landlords-server/src/main/java/org/nico/ratel/landlords/features/Features.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/features/Features.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/features/Features.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java b/landlords-server/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java b/landlords-server/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java b/landlords-server/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java b/landlords-server/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java b/landlords-server/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java b/landlords-server/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java b/landlords-server/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java b/landlords-server/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java b/landlords-server/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java b/landlords-server/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java b/landlords-server/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java
similarity index 100%
rename from landlords-common/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java
rename to landlords-server/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java
diff --git a/protoc-resource/ClientTransferDataProtoc.proto b/landlords-server/src/main/resources/proto/ClientTransferDataProtoc.proto
similarity index 100%
rename from protoc-resource/ClientTransferDataProtoc.proto
rename to landlords-server/src/main/resources/proto/ClientTransferDataProtoc.proto
diff --git a/protoc-resource/ServerTransferDataProtoc.proto b/landlords-server/src/main/resources/proto/ServerTransferDataProtoc.proto
similarity index 100%
rename from protoc-resource/ServerTransferDataProtoc.proto
rename to landlords-server/src/main/resources/proto/ServerTransferDataProtoc.proto
diff --git a/protoc-resource/generate.sh b/landlords-server/src/main/resources/proto/generate.sh
similarity index 100%
rename from protoc-resource/generate.sh
rename to landlords-server/src/main/resources/proto/generate.sh
diff --git a/landlords-common/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java b/landlords-server/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java
similarity index 100%
rename from landlords-common/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java
rename to landlords-server/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java
diff --git a/landlords-common/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java b/landlords-server/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java
similarity index 100%
rename from landlords-common/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java
rename to landlords-server/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java
diff --git a/pom.xml b/pom.xml
index 957c6ba..6994941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,6 @@
 
 	<modules>
 		<module>landlords-server</module>
-		<module>landlords-common</module>
 	</modules>