diff --git a/proto/Makefile b/proto/Makefile
index b8bbc150b42..3e74e4a603d 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -11,7 +11,7 @@ PROTOC_DIR = compiler/google/src/google/protobuf/compiler/kotlin
 PROTOC_EXE = $(PROTOC_DIR)/protoc
 
 # Kotlin part
-RUNTIME_DIR = runtime
+RUNTIME_DIR = compiler/runtime
 RUNTIME_JAR = $(RUNTIME_DIR)/build/libs/protokot-runtime.jar
 
 all: $(EXE) $(JAR)
diff --git a/proto/runtime/build.gradle b/proto/compiler/runtime/build.gradle
similarity index 100%
rename from proto/runtime/build.gradle
rename to proto/compiler/runtime/build.gradle
diff --git a/proto/runtime/src/main/kotlin/CodedInputStream.kt b/proto/compiler/runtime/src/main/kotlin/CodedInputStream.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/CodedInputStream.kt
rename to proto/compiler/runtime/src/main/kotlin/CodedInputStream.kt
diff --git a/proto/runtime/src/main/kotlin/CodedOutputStream.kt b/proto/compiler/runtime/src/main/kotlin/CodedOutputStream.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/CodedOutputStream.kt
rename to proto/compiler/runtime/src/main/kotlin/CodedOutputStream.kt
diff --git a/proto/runtime/src/main/kotlin/KotlinInputStream.kt b/proto/compiler/runtime/src/main/kotlin/KotlinInputStream.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/KotlinInputStream.kt
rename to proto/compiler/runtime/src/main/kotlin/KotlinInputStream.kt
diff --git a/proto/runtime/src/main/kotlin/KotlinOutputStream.kt b/proto/compiler/runtime/src/main/kotlin/KotlinOutputStream.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/KotlinOutputStream.kt
rename to proto/compiler/runtime/src/main/kotlin/KotlinOutputStream.kt
diff --git a/proto/runtime/src/main/kotlin/WireFormat.kt b/proto/compiler/runtime/src/main/kotlin/WireFormat.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/WireFormat.kt
rename to proto/compiler/runtime/src/main/kotlin/WireFormat.kt
diff --git a/proto/runtime/src/main/kotlin/WireType.kt b/proto/compiler/runtime/src/main/kotlin/WireType.kt
similarity index 100%
rename from proto/runtime/src/main/kotlin/WireType.kt
rename to proto/compiler/runtime/src/main/kotlin/WireType.kt
diff --git a/proto/proto_sources/carkot.proto b/proto/protofiles_sources/carkot.proto
similarity index 100%
rename from proto/proto_sources/carkot.proto
rename to proto/protofiles_sources/carkot.proto
diff --git a/proto/proto_sources/server_car/connect.proto b/proto/protofiles_sources/server_car/connect.proto
similarity index 100%
rename from proto/proto_sources/server_car/connect.proto
rename to proto/protofiles_sources/server_car/connect.proto
diff --git a/proto/proto_sources/server_car/direction.proto b/proto/protofiles_sources/server_car/direction.proto
similarity index 100%
rename from proto/proto_sources/server_car/direction.proto
rename to proto/protofiles_sources/server_car/direction.proto
diff --git a/proto/proto_sources/server_car/location.proto b/proto/protofiles_sources/server_car/location.proto
similarity index 100%
rename from proto/proto_sources/server_car/location.proto
rename to proto/protofiles_sources/server_car/location.proto
diff --git a/proto/proto_sources/server_car/rc_session.proto b/proto/protofiles_sources/server_car/rc_session.proto
similarity index 100%
rename from proto/proto_sources/server_car/rc_session.proto
rename to proto/protofiles_sources/server_car/rc_session.proto
diff --git a/proto/proto_sources/server_car/route.proto b/proto/protofiles_sources/server_car/route.proto
similarity index 100%
rename from proto/proto_sources/server_car/route.proto
rename to proto/protofiles_sources/server_car/route.proto
diff --git a/proto/proto_sources/server_car/route_done.proto b/proto/protofiles_sources/server_car/route_done.proto
similarity index 100%
rename from proto/proto_sources/server_car/route_done.proto
rename to proto/protofiles_sources/server_car/route_done.proto
diff --git a/proto/proto_sources/server_client/cars.proto b/proto/protofiles_sources/server_client/cars.proto
similarity index 100%
rename from proto/proto_sources/server_client/cars.proto
rename to proto/protofiles_sources/server_client/cars.proto