diff --git a/server/src/CodedInputStream.kt b/server/src/main/java/CodedInputStream.kt
similarity index 100%
rename from server/src/CodedInputStream.kt
rename to server/src/main/java/CodedInputStream.kt
diff --git a/server/src/CodedOutputStream.kt b/server/src/main/java/CodedOutputStream.kt
similarity index 100%
rename from server/src/CodedOutputStream.kt
rename to server/src/main/java/CodedOutputStream.kt
diff --git a/server/src/InvalidProtocolBufferException.kt b/server/src/main/java/InvalidProtocolBufferException.kt
similarity index 100%
rename from server/src/InvalidProtocolBufferException.kt
rename to server/src/main/java/InvalidProtocolBufferException.kt
diff --git a/server/src/ServerMain.kt b/server/src/main/java/ServerMain.kt
similarity index 100%
rename from server/src/ServerMain.kt
rename to server/src/main/java/ServerMain.kt
diff --git a/server/src/WireFormat.kt b/server/src/main/java/WireFormat.kt
similarity index 100%
rename from server/src/WireFormat.kt
rename to server/src/main/java/WireFormat.kt
diff --git a/server/src/WireType.kt b/server/src/main/java/WireType.kt
similarity index 100%
rename from server/src/WireType.kt
rename to server/src/main/java/WireType.kt
diff --git a/server/src/car/client/Client.kt b/server/src/main/java/car/client/Client.kt
similarity index 100%
rename from server/src/car/client/Client.kt
rename to server/src/main/java/car/client/Client.kt
diff --git a/server/src/car/client/ClientHandler.kt b/server/src/main/java/car/client/ClientHandler.kt
similarity index 100%
rename from server/src/car/client/ClientHandler.kt
rename to server/src/main/java/car/client/ClientHandler.kt
diff --git a/server/src/car/client/ClientInitializer.kt b/server/src/main/java/car/client/ClientInitializer.kt
similarity index 100%
rename from server/src/car/client/ClientInitializer.kt
rename to server/src/main/java/car/client/ClientInitializer.kt
diff --git a/server/src/objects/Car.kt b/server/src/main/java/car/objects/Car.kt
similarity index 100%
rename from server/src/objects/Car.kt
rename to server/src/main/java/car/objects/Car.kt
diff --git a/server/src/objects/Environment.kt b/server/src/main/java/car/objects/Environment.kt
similarity index 100%
rename from server/src/objects/Environment.kt
rename to server/src/main/java/car/objects/Environment.kt
diff --git a/server/src/car/server/Handler.kt b/server/src/main/java/car/server/Handler.kt
similarity index 100%
rename from server/src/car/server/Handler.kt
rename to server/src/main/java/car/server/Handler.kt
diff --git a/server/src/car/server/Initializer.kt b/server/src/main/java/car/server/Initializer.kt
similarity index 100%
rename from server/src/car/server/Initializer.kt
rename to server/src/main/java/car/server/Initializer.kt
diff --git a/server/src/web/server/Handler.kt b/server/src/main/java/car/web/server/Handler.kt
similarity index 100%
rename from server/src/web/server/Handler.kt
rename to server/src/main/java/car/web/server/Handler.kt
diff --git a/server/src/web/server/Initializer.kt b/server/src/main/java/car/web/server/Initializer.kt
similarity index 100%
rename from server/src/web/server/Initializer.kt
rename to server/src/main/java/car/web/server/Initializer.kt
diff --git a/server/src/connect.kt b/server/src/main/java/connect.kt
similarity index 100%
rename from server/src/connect.kt
rename to server/src/main/java/connect.kt
diff --git a/server/src/direction.kt b/server/src/main/java/direction.kt
similarity index 100%
rename from server/src/direction.kt
rename to server/src/main/java/direction.kt
diff --git a/server/src/location.kt b/server/src/main/java/location.kt
similarity index 100%
rename from server/src/location.kt
rename to server/src/main/java/location.kt
diff --git a/server/src/route.kt b/server/src/main/java/route.kt
similarity index 100%
rename from server/src/route.kt
rename to server/src/main/java/route.kt
diff --git a/server/src/route_done.kt b/server/src/main/java/route_done.kt
similarity index 100%
rename from server/src/route_done.kt
rename to server/src/main/java/route_done.kt