diff --git a/app/build.gradle b/server/build.gradle
similarity index 100%
rename from app/build.gradle
rename to server/build.gradle
diff --git a/app/gradle/wrapper/gradle-wrapper.jar b/server/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from app/gradle/wrapper/gradle-wrapper.jar
rename to server/gradle/wrapper/gradle-wrapper.jar
diff --git a/app/gradle/wrapper/gradle-wrapper.properties b/server/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from app/gradle/wrapper/gradle-wrapper.properties
rename to server/gradle/wrapper/gradle-wrapper.properties
diff --git a/app/gradlew b/server/gradlew
similarity index 100%
rename from app/gradlew
rename to server/gradlew
diff --git a/app/gradlew.bat b/server/gradlew.bat
similarity index 100%
rename from app/gradlew.bat
rename to server/gradlew.bat
diff --git a/app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java b/server/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java
rename to server/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java
diff --git a/app/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java b/server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java
rename to server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java
diff --git a/app/src/main/java/ru/dragonestia/picker/config/MetricsConfig.java b/server/src/main/java/ru/dragonestia/picker/config/MetricsConfig.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/config/MetricsConfig.java
rename to server/src/main/java/ru/dragonestia/picker/config/MetricsConfig.java
diff --git a/app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java b/server/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java
rename to server/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java
diff --git a/app/src/main/java/ru/dragonestia/picker/config/TestConfig.java b/server/src/main/java/ru/dragonestia/picker/config/TestConfig.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/config/TestConfig.java
rename to server/src/main/java/ru/dragonestia/picker/config/TestConfig.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/ExceptionHandlerController.java b/server/src/main/java/ru/dragonestia/picker/controller/ExceptionHandlerController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/ExceptionHandlerController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/ExceptionHandlerController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/NodeController.java b/server/src/main/java/ru/dragonestia/picker/controller/NodeController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/NodeController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/NodeController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/RoomController.java b/server/src/main/java/ru/dragonestia/picker/controller/RoomController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/RoomController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/RoomController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/RoomPickerController.java b/server/src/main/java/ru/dragonestia/picker/controller/RoomPickerController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/RoomPickerController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/RoomPickerController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/UserController.java b/server/src/main/java/ru/dragonestia/picker/controller/UserController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/UserController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/UserController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/controller/UserRoomController.java b/server/src/main/java/ru/dragonestia/picker/controller/UserRoomController.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/controller/UserRoomController.java
rename to server/src/main/java/ru/dragonestia/picker/controller/UserRoomController.java
diff --git a/app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java b/server/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java
rename to server/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java
diff --git a/app/src/main/java/ru/dragonestia/picker/model/Node.java b/server/src/main/java/ru/dragonestia/picker/model/Node.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/model/Node.java
rename to server/src/main/java/ru/dragonestia/picker/model/Node.java
diff --git a/app/src/main/java/ru/dragonestia/picker/model/Room.java b/server/src/main/java/ru/dragonestia/picker/model/Room.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/model/Room.java
rename to server/src/main/java/ru/dragonestia/picker/model/Room.java
diff --git a/app/src/main/java/ru/dragonestia/picker/model/User.java b/server/src/main/java/ru/dragonestia/picker/model/User.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/model/User.java
rename to server/src/main/java/ru/dragonestia/picker/model/User.java
diff --git a/app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java b/server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java
rename to server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java
rename to server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java
rename to server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java
rename to server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/PickerRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/PickerRepository.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/PickerRepository.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/PickerRepository.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/cache/NodeId2PickerModeCache.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/cache/NodeId2PickerModeCache.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/cache/NodeId2PickerModeCache.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/cache/NodeId2PickerModeCache.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/DynamicSortedMap.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/collection/DynamicSortedMap.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/collection/DynamicSortedMap.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/collection/DynamicSortedMap.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java
diff --git a/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
rename to server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/NodeService.java b/server/src/main/java/ru/dragonestia/picker/service/NodeService.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/NodeService.java
rename to server/src/main/java/ru/dragonestia/picker/service/NodeService.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/RoomService.java b/server/src/main/java/ru/dragonestia/picker/service/RoomService.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/RoomService.java
rename to server/src/main/java/ru/dragonestia/picker/service/RoomService.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/UserService.java b/server/src/main/java/ru/dragonestia/picker/service/UserService.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/UserService.java
rename to server/src/main/java/ru/dragonestia/picker/service/UserService.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java
rename to server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java
rename to server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java
rename to server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java b/server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java
rename to server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java
diff --git a/app/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java b/server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java
rename to server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java b/server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java
rename to server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java
diff --git a/app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java b/server/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java
rename to server/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java
diff --git a/app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java b/server/src/main/java/ru/dragonestia/picker/util/DetailsParser.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java
rename to server/src/main/java/ru/dragonestia/picker/util/DetailsParser.java
diff --git a/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java b/server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
similarity index 100%
rename from app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
rename to server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
diff --git a/app/src/main/resources/application.yml b/server/src/main/resources/application.yml
similarity index 100%
rename from app/src/main/resources/application.yml
rename to server/src/main/resources/application.yml
diff --git a/app/src/test/java/ru/dragonestia/picker/collection/DynamicSortedMapTests.java b/server/src/test/java/ru/dragonestia/picker/collection/DynamicSortedMapTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/collection/DynamicSortedMapTests.java
rename to server/src/test/java/ru/dragonestia/picker/collection/DynamicSortedMapTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java b/server/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
rename to server/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java b/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
rename to server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
diff --git a/app/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java b/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
rename to server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java b/server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java
rename to server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java b/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
rename to server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
rename to server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
rename to server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
diff --git a/app/src/test/java/ru/dragonestia/picker/util/UserFiller.java b/server/src/test/java/ru/dragonestia/picker/util/UserFiller.java
similarity index 100%
rename from app/src/test/java/ru/dragonestia/picker/util/UserFiller.java
rename to server/src/test/java/ru/dragonestia/picker/util/UserFiller.java
diff --git a/settings.gradle b/settings.gradle
index 79340f0..0762c33 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'RoomPicker'
 
-include 'app'
+include 'server'
 include 'control-panel'
 include 'client-api'
 include 'client-impl'