diff --git a/android/app/src/main/res/drawable-hdpi/ic_openbot.png b/android/app/src/main/res/drawable-hdpi/ic_openbot.png
deleted file mode 100644
index 5061f113f..000000000
Binary files a/android/app/src/main/res/drawable-hdpi/ic_openbot.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_openbot.png b/android/app/src/main/res/drawable-mdpi/ic_openbot.png
deleted file mode 100644
index 98bb3f162..000000000
Binary files a/android/app/src/main/res/drawable-mdpi/ic_openbot.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_openbot.png b/android/app/src/main/res/drawable-xhdpi/ic_openbot.png
deleted file mode 100644
index 66ca55207..000000000
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_openbot.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_openbot.png b/android/app/src/main/res/drawable-xxhdpi/ic_openbot.png
deleted file mode 100644
index 011d5aea6..000000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_openbot.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_openbot.png b/android/app/src/main/res/drawable-xxxhdpi/ic_openbot.png
deleted file mode 100644
index 402721291..000000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_openbot.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/ic_controller.xml b/android/app/src/main/res/drawable/ic_controller.xml
deleted file mode 100644
index f1de3ee62..000000000
--- a/android/app/src/main/res/drawable/ic_controller.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
deleted file mode 100755
index 2ac829de1..000000000
--- a/android/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- 15dp
- 8dp
- 16dp
- 100dp
- 16dp
-
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index f0aa44cab..d1c63c68b 100755
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,9 +10,9 @@ buildscript {
mavenLocal()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.0'
- classpath 'com.google.gms:google-services:4.3.10'
- classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+ classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.google.gms:google-services:4.3.15'
+ classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
classpath 'de.undercouch:gradle-download-task:4.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/android/app/.gitignore b/android/robot/.gitignore
similarity index 100%
rename from android/app/.gitignore
rename to android/robot/.gitignore
diff --git a/android/app/ContributionGuide.md b/android/robot/ContributionGuide.md
similarity index 100%
rename from android/app/ContributionGuide.md
rename to android/robot/ContributionGuide.md
diff --git a/android/app/README.md b/android/robot/README.md
similarity index 99%
rename from android/app/README.md
rename to android/robot/README.md
index 5b7f19625..ba4ca0e51 100644
--- a/android/app/README.md
+++ b/android/robot/README.md
@@ -12,10 +12,10 @@
The app starts with a menu screen that shows all available screens. The settings screen can be opened with a click on the icon at the top right corner. By clicking on the other icons the user can access various screens whose functionalities are explained in the following.
-
-
-
-
+
+
+
+
### Settings Menu
diff --git a/android/app/build.gradle b/android/robot/build.gradle
similarity index 100%
rename from android/app/build.gradle
rename to android/robot/build.gradle
diff --git a/android/app/download.gradle b/android/robot/download.gradle
similarity index 100%
rename from android/app/download.gradle
rename to android/robot/download.gradle
diff --git a/android/app/google-services.json b/android/robot/google-services.json
similarity index 100%
rename from android/app/google-services.json
rename to android/robot/google-services.json
diff --git a/android/app/gradle/wrapper/gradle-wrapper.jar b/android/robot/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/app/gradle/wrapper/gradle-wrapper.jar
rename to android/robot/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/app/gradle/wrapper/gradle-wrapper.properties b/android/robot/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/app/gradle/wrapper/gradle-wrapper.properties
rename to android/robot/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/app/gradlew b/android/robot/gradlew
similarity index 100%
rename from android/app/gradlew
rename to android/robot/gradlew
diff --git a/android/app/gradlew.bat b/android/robot/gradlew.bat
similarity index 100%
rename from android/app/gradlew.bat
rename to android/robot/gradlew.bat
diff --git a/android/app/proguard-rules.pro b/android/robot/proguard-rules.pro
similarity index 100%
rename from android/app/proguard-rules.pro
rename to android/robot/proguard-rules.pro
diff --git a/android/app/src/main/AndroidManifest.xml b/android/robot/src/main/AndroidManifest.xml
similarity index 100%
rename from android/app/src/main/AndroidManifest.xml
rename to android/robot/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/assets/config.json b/android/robot/src/main/assets/config.json
similarity index 100%
rename from android/app/src/main/assets/config.json
rename to android/robot/src/main/assets/config.json
diff --git a/android/app/src/main/assets/media/matthew/dual_drive_control.mp3 b/android/robot/src/main/assets/media/matthew/dual_drive_control.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/dual_drive_control.mp3
rename to android/robot/src/main/assets/media/matthew/dual_drive_control.mp3
diff --git a/android/app/src/main/assets/media/matthew/emergency_stop.mp3 b/android/robot/src/main/assets/media/matthew/emergency_stop.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/emergency_stop.mp3
rename to android/robot/src/main/assets/media/matthew/emergency_stop.mp3
diff --git a/android/app/src/main/assets/media/matthew/fast_speed.mp3 b/android/robot/src/main/assets/media/matthew/fast_speed.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/fast_speed.mp3
rename to android/robot/src/main/assets/media/matthew/fast_speed.mp3
diff --git a/android/app/src/main/assets/media/matthew/game_controller_enabled.mp3 b/android/robot/src/main/assets/media/matthew/game_controller_enabled.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/game_controller_enabled.mp3
rename to android/robot/src/main/assets/media/matthew/game_controller_enabled.mp3
diff --git a/android/app/src/main/assets/media/matthew/joystick_control.mp3 b/android/robot/src/main/assets/media/matthew/joystick_control.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/joystick_control.mp3
rename to android/robot/src/main/assets/media/matthew/joystick_control.mp3
diff --git a/android/app/src/main/assets/media/matthew/logging_started.mp3 b/android/robot/src/main/assets/media/matthew/logging_started.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/logging_started.mp3
rename to android/robot/src/main/assets/media/matthew/logging_started.mp3
diff --git a/android/app/src/main/assets/media/matthew/logging_stopped.mp3 b/android/robot/src/main/assets/media/matthew/logging_stopped.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/logging_stopped.mp3
rename to android/robot/src/main/assets/media/matthew/logging_stopped.mp3
diff --git a/android/app/src/main/assets/media/matthew/network_disabled.mp3 b/android/robot/src/main/assets/media/matthew/network_disabled.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/network_disabled.mp3
rename to android/robot/src/main/assets/media/matthew/network_disabled.mp3
diff --git a/android/app/src/main/assets/media/matthew/network_enabled.mp3 b/android/robot/src/main/assets/media/matthew/network_enabled.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/network_enabled.mp3
rename to android/robot/src/main/assets/media/matthew/network_enabled.mp3
diff --git a/android/app/src/main/assets/media/matthew/noise_disabled.mp3 b/android/robot/src/main/assets/media/matthew/noise_disabled.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/noise_disabled.mp3
rename to android/robot/src/main/assets/media/matthew/noise_disabled.mp3
diff --git a/android/app/src/main/assets/media/matthew/noise_enabled.mp3 b/android/robot/src/main/assets/media/matthew/noise_enabled.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/noise_enabled.mp3
rename to android/robot/src/main/assets/media/matthew/noise_enabled.mp3
diff --git a/android/app/src/main/assets/media/matthew/normal_speed.mp3 b/android/robot/src/main/assets/media/matthew/normal_speed.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/normal_speed.mp3
rename to android/robot/src/main/assets/media/matthew/normal_speed.mp3
diff --git a/android/app/src/main/assets/media/matthew/slow_speed.mp3 b/android/robot/src/main/assets/media/matthew/slow_speed.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/slow_speed.mp3
rename to android/robot/src/main/assets/media/matthew/slow_speed.mp3
diff --git a/android/app/src/main/assets/media/matthew/video_game_control.mp3 b/android/robot/src/main/assets/media/matthew/video_game_control.mp3
similarity index 100%
rename from android/app/src/main/assets/media/matthew/video_game_control.mp3
rename to android/robot/src/main/assets/media/matthew/video_game_control.mp3
diff --git a/android/app/src/main/assets/render/gmap_marker.png b/android/robot/src/main/assets/render/gmap_marker.png
similarity index 100%
rename from android/app/src/main/assets/render/gmap_marker.png
rename to android/robot/src/main/assets/render/gmap_marker.png
diff --git a/android/app/src/main/assets/shaders/object.frag b/android/robot/src/main/assets/shaders/object.frag
similarity index 100%
rename from android/app/src/main/assets/shaders/object.frag
rename to android/robot/src/main/assets/shaders/object.frag
diff --git a/android/app/src/main/assets/shaders/object.vert b/android/robot/src/main/assets/shaders/object.vert
similarity index 100%
rename from android/app/src/main/assets/shaders/object.vert
rename to android/robot/src/main/assets/shaders/object.vert
diff --git a/android/app/src/main/assets/shaders/screenquad.frag b/android/robot/src/main/assets/shaders/screenquad.frag
similarity index 100%
rename from android/app/src/main/assets/shaders/screenquad.frag
rename to android/robot/src/main/assets/shaders/screenquad.frag
diff --git a/android/app/src/main/assets/shaders/screenquad.vert b/android/robot/src/main/assets/shaders/screenquad.vert
similarity index 100%
rename from android/app/src/main/assets/shaders/screenquad.vert
rename to android/robot/src/main/assets/shaders/screenquad.vert
diff --git a/android/app/src/main/java/org/openbot/OpenBotApplication.java b/android/robot/src/main/java/org/openbot/OpenBotApplication.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/OpenBotApplication.java
rename to android/robot/src/main/java/org/openbot/OpenBotApplication.java
diff --git a/android/app/src/main/java/org/openbot/autopilot/AutopilotFragment.java b/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/autopilot/AutopilotFragment.java
rename to android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
diff --git a/android/app/src/main/java/org/openbot/common/CameraFragment.java b/android/robot/src/main/java/org/openbot/common/CameraFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/common/CameraFragment.java
rename to android/robot/src/main/java/org/openbot/common/CameraFragment.java
diff --git a/android/app/src/main/java/org/openbot/common/ControlsFragment.java b/android/robot/src/main/java/org/openbot/common/ControlsFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/common/ControlsFragment.java
rename to android/robot/src/main/java/org/openbot/common/ControlsFragment.java
diff --git a/android/app/src/main/java/org/openbot/common/FeatureList.java b/android/robot/src/main/java/org/openbot/common/FeatureList.java
similarity index 99%
rename from android/app/src/main/java/org/openbot/common/FeatureList.java
rename to android/robot/src/main/java/org/openbot/common/FeatureList.java
index cb1d64ba0..a15f8febb 100644
--- a/android/app/src/main/java/org/openbot/common/FeatureList.java
+++ b/android/robot/src/main/java/org/openbot/common/FeatureList.java
@@ -73,8 +73,8 @@ public static ArrayList getCategories() {
subCategories = new ArrayList<>();
subCategories.add(new SubCategory(FREE_ROAM, R.drawable.ic_game, "#FC814A"));
subCategories.add(new SubCategory(DATA_COLLECTION, R.drawable.ic_storage, "#93C47D"));
- subCategories.add(new SubCategory(CONTROLLER_MAPPING, R.drawable.ic_joystick, "#7268A6"));
- subCategories.add(new SubCategory(ROBOT_INFO, R.drawable.ic_openbot, "#4B7BFF"));
+ subCategories.add(new SubCategory(CONTROLLER_MAPPING, R.drawable.ic_controller, "#7268A6"));
+ subCategories.add(new SubCategory(ROBOT_INFO, R.drawable.ic_openbot_space, "#4B7BFF"));
categories.add(new Category(GENERAL, subCategories));
subCategories = new ArrayList<>();
diff --git a/android/app/src/main/java/org/openbot/controller/ControllerMappingFragment.java b/android/robot/src/main/java/org/openbot/controller/ControllerMappingFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/controller/ControllerMappingFragment.java
rename to android/robot/src/main/java/org/openbot/controller/ControllerMappingFragment.java
diff --git a/android/app/src/main/java/org/openbot/customview/AutoFitSurfaceGlView.java b/android/robot/src/main/java/org/openbot/customview/AutoFitSurfaceGlView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/AutoFitSurfaceGlView.java
rename to android/robot/src/main/java/org/openbot/customview/AutoFitSurfaceGlView.java
diff --git a/android/app/src/main/java/org/openbot/customview/AutoFitSurfaceView.java b/android/robot/src/main/java/org/openbot/customview/AutoFitSurfaceView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/AutoFitSurfaceView.java
rename to android/robot/src/main/java/org/openbot/customview/AutoFitSurfaceView.java
diff --git a/android/app/src/main/java/org/openbot/customview/AutoFitTextureView.java b/android/robot/src/main/java/org/openbot/customview/AutoFitTextureView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/AutoFitTextureView.java
rename to android/robot/src/main/java/org/openbot/customview/AutoFitTextureView.java
diff --git a/android/app/src/main/java/org/openbot/customview/OverlayView.java b/android/robot/src/main/java/org/openbot/customview/OverlayView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/OverlayView.java
rename to android/robot/src/main/java/org/openbot/customview/OverlayView.java
diff --git a/android/app/src/main/java/org/openbot/customview/RecognitionScoreView.java b/android/robot/src/main/java/org/openbot/customview/RecognitionScoreView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/RecognitionScoreView.java
rename to android/robot/src/main/java/org/openbot/customview/RecognitionScoreView.java
diff --git a/android/app/src/main/java/org/openbot/customview/ResultsView.java b/android/robot/src/main/java/org/openbot/customview/ResultsView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/ResultsView.java
rename to android/robot/src/main/java/org/openbot/customview/ResultsView.java
diff --git a/android/app/src/main/java/org/openbot/customview/WebRTCSurfaceView.java b/android/robot/src/main/java/org/openbot/customview/WebRTCSurfaceView.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/customview/WebRTCSurfaceView.java
rename to android/robot/src/main/java/org/openbot/customview/WebRTCSurfaceView.java
diff --git a/android/app/src/main/java/org/openbot/env/AudioPlayer.java b/android/robot/src/main/java/org/openbot/env/AudioPlayer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/AudioPlayer.java
rename to android/robot/src/main/java/org/openbot/env/AudioPlayer.java
diff --git a/android/app/src/main/java/org/openbot/env/BorderedText.java b/android/robot/src/main/java/org/openbot/env/BorderedText.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/BorderedText.java
rename to android/robot/src/main/java/org/openbot/env/BorderedText.java
diff --git a/android/app/src/main/java/org/openbot/env/BotToControllerEventBus.java b/android/robot/src/main/java/org/openbot/env/BotToControllerEventBus.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/BotToControllerEventBus.java
rename to android/robot/src/main/java/org/openbot/env/BotToControllerEventBus.java
diff --git a/android/app/src/main/java/org/openbot/env/ConnectionMonitor.java b/android/robot/src/main/java/org/openbot/env/ConnectionMonitor.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ConnectionMonitor.java
rename to android/robot/src/main/java/org/openbot/env/ConnectionMonitor.java
diff --git a/android/app/src/main/java/org/openbot/env/ConnectionSelector.java b/android/robot/src/main/java/org/openbot/env/ConnectionSelector.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ConnectionSelector.java
rename to android/robot/src/main/java/org/openbot/env/ConnectionSelector.java
diff --git a/android/app/src/main/java/org/openbot/env/ControllerConfig.java b/android/robot/src/main/java/org/openbot/env/ControllerConfig.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ControllerConfig.java
rename to android/robot/src/main/java/org/openbot/env/ControllerConfig.java
diff --git a/android/app/src/main/java/org/openbot/env/ControllerToBotEventBus.java b/android/robot/src/main/java/org/openbot/env/ControllerToBotEventBus.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ControllerToBotEventBus.java
rename to android/robot/src/main/java/org/openbot/env/ControllerToBotEventBus.java
diff --git a/android/app/src/main/java/org/openbot/env/GameController.java b/android/robot/src/main/java/org/openbot/env/GameController.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/GameController.java
rename to android/robot/src/main/java/org/openbot/env/GameController.java
diff --git a/android/app/src/main/java/org/openbot/env/IDataReceived.java b/android/robot/src/main/java/org/openbot/env/IDataReceived.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/IDataReceived.java
rename to android/robot/src/main/java/org/openbot/env/IDataReceived.java
diff --git a/android/app/src/main/java/org/openbot/env/ILocalConnection.java b/android/robot/src/main/java/org/openbot/env/ILocalConnection.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ILocalConnection.java
rename to android/robot/src/main/java/org/openbot/env/ILocalConnection.java
diff --git a/android/app/src/main/java/org/openbot/env/IVideoServer.java b/android/robot/src/main/java/org/openbot/env/IVideoServer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/IVideoServer.java
rename to android/robot/src/main/java/org/openbot/env/IVideoServer.java
diff --git a/android/app/src/main/java/org/openbot/env/ImageUtils.java b/android/robot/src/main/java/org/openbot/env/ImageUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/ImageUtils.java
rename to android/robot/src/main/java/org/openbot/env/ImageUtils.java
diff --git a/android/app/src/main/java/org/openbot/env/Logger.java b/android/robot/src/main/java/org/openbot/env/Logger.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/Logger.java
rename to android/robot/src/main/java/org/openbot/env/Logger.java
diff --git a/android/app/src/main/java/org/openbot/env/NearbyConnection.java b/android/robot/src/main/java/org/openbot/env/NearbyConnection.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/NearbyConnection.java
rename to android/robot/src/main/java/org/openbot/env/NearbyConnection.java
diff --git a/android/app/src/main/java/org/openbot/env/NetworkServiceConnection.java b/android/robot/src/main/java/org/openbot/env/NetworkServiceConnection.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/NetworkServiceConnection.java
rename to android/robot/src/main/java/org/openbot/env/NetworkServiceConnection.java
diff --git a/android/app/src/main/java/org/openbot/env/PhoneController.java b/android/robot/src/main/java/org/openbot/env/PhoneController.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/PhoneController.java
rename to android/robot/src/main/java/org/openbot/env/PhoneController.java
diff --git a/android/app/src/main/java/org/openbot/env/RtspServer.java b/android/robot/src/main/java/org/openbot/env/RtspServer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/RtspServer.java
rename to android/robot/src/main/java/org/openbot/env/RtspServer.java
diff --git a/android/app/src/main/java/org/openbot/env/SensorReading.java b/android/robot/src/main/java/org/openbot/env/SensorReading.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/SensorReading.java
rename to android/robot/src/main/java/org/openbot/env/SensorReading.java
diff --git a/android/app/src/main/java/org/openbot/env/SharedPreferencesManager.java b/android/robot/src/main/java/org/openbot/env/SharedPreferencesManager.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/SharedPreferencesManager.java
rename to android/robot/src/main/java/org/openbot/env/SharedPreferencesManager.java
diff --git a/android/app/src/main/java/org/openbot/env/SimpleSdpObserver.java b/android/robot/src/main/java/org/openbot/env/SimpleSdpObserver.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/SimpleSdpObserver.java
rename to android/robot/src/main/java/org/openbot/env/SimpleSdpObserver.java
diff --git a/android/app/src/main/java/org/openbot/env/Size.java b/android/robot/src/main/java/org/openbot/env/Size.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/Size.java
rename to android/robot/src/main/java/org/openbot/env/Size.java
diff --git a/android/app/src/main/java/org/openbot/env/WebRtcServer.java b/android/robot/src/main/java/org/openbot/env/WebRtcServer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/env/WebRtcServer.java
rename to android/robot/src/main/java/org/openbot/env/WebRtcServer.java
diff --git a/android/app/src/main/java/org/openbot/logging/LogDataUtils.java b/android/robot/src/main/java/org/openbot/logging/LogDataUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/logging/LogDataUtils.java
rename to android/robot/src/main/java/org/openbot/logging/LogDataUtils.java
diff --git a/android/app/src/main/java/org/openbot/logging/LoggerFragment.java b/android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/logging/LoggerFragment.java
rename to android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
diff --git a/android/app/src/main/java/org/openbot/logging/SensorListAdapter.java b/android/robot/src/main/java/org/openbot/logging/SensorListAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/logging/SensorListAdapter.java
rename to android/robot/src/main/java/org/openbot/logging/SensorListAdapter.java
diff --git a/android/app/src/main/java/org/openbot/logging/SensorService.java b/android/robot/src/main/java/org/openbot/logging/SensorService.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/logging/SensorService.java
rename to android/robot/src/main/java/org/openbot/logging/SensorService.java
diff --git a/android/app/src/main/java/org/openbot/logging/SensorsDialog.java b/android/robot/src/main/java/org/openbot/logging/SensorsDialog.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/logging/SensorsDialog.java
rename to android/robot/src/main/java/org/openbot/logging/SensorsDialog.java
diff --git a/android/app/src/main/java/org/openbot/main/BluetoothFragment.java b/android/robot/src/main/java/org/openbot/main/BluetoothFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/BluetoothFragment.java
rename to android/robot/src/main/java/org/openbot/main/BluetoothFragment.java
diff --git a/android/app/src/main/java/org/openbot/main/CategoryAdapter.java b/android/robot/src/main/java/org/openbot/main/CategoryAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/CategoryAdapter.java
rename to android/robot/src/main/java/org/openbot/main/CategoryAdapter.java
diff --git a/android/app/src/main/java/org/openbot/main/CommonRecyclerViewAdapter.java b/android/robot/src/main/java/org/openbot/main/CommonRecyclerViewAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/CommonRecyclerViewAdapter.java
rename to android/robot/src/main/java/org/openbot/main/CommonRecyclerViewAdapter.java
diff --git a/android/app/src/main/java/org/openbot/main/MainActivity.java b/android/robot/src/main/java/org/openbot/main/MainActivity.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/MainActivity.java
rename to android/robot/src/main/java/org/openbot/main/MainActivity.java
diff --git a/android/app/src/main/java/org/openbot/main/MainFragment.java b/android/robot/src/main/java/org/openbot/main/MainFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/MainFragment.java
rename to android/robot/src/main/java/org/openbot/main/MainFragment.java
diff --git a/android/app/src/main/java/org/openbot/main/MainViewModel.java b/android/robot/src/main/java/org/openbot/main/MainViewModel.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/MainViewModel.java
rename to android/robot/src/main/java/org/openbot/main/MainViewModel.java
diff --git a/android/app/src/main/java/org/openbot/main/OnItemClickListener.java b/android/robot/src/main/java/org/openbot/main/OnItemClickListener.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/OnItemClickListener.java
rename to android/robot/src/main/java/org/openbot/main/OnItemClickListener.java
diff --git a/android/app/src/main/java/org/openbot/main/ScanDeviceAdapter.java b/android/robot/src/main/java/org/openbot/main/ScanDeviceAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/ScanDeviceAdapter.java
rename to android/robot/src/main/java/org/openbot/main/ScanDeviceAdapter.java
diff --git a/android/app/src/main/java/org/openbot/main/SettingsFragment.java b/android/robot/src/main/java/org/openbot/main/SettingsFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/SettingsFragment.java
rename to android/robot/src/main/java/org/openbot/main/SettingsFragment.java
diff --git a/android/app/src/main/java/org/openbot/main/SubCategoryAdapter.java b/android/robot/src/main/java/org/openbot/main/SubCategoryAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/SubCategoryAdapter.java
rename to android/robot/src/main/java/org/openbot/main/SubCategoryAdapter.java
diff --git a/android/app/src/main/java/org/openbot/main/UsbFragment.java b/android/robot/src/main/java/org/openbot/main/UsbFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/main/UsbFragment.java
rename to android/robot/src/main/java/org/openbot/main/UsbFragment.java
diff --git a/android/app/src/main/java/org/openbot/model/Category.java b/android/robot/src/main/java/org/openbot/model/Category.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/model/Category.java
rename to android/robot/src/main/java/org/openbot/model/Category.java
diff --git a/android/app/src/main/java/org/openbot/model/SubCategory.java b/android/robot/src/main/java/org/openbot/model/SubCategory.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/model/SubCategory.java
rename to android/robot/src/main/java/org/openbot/model/SubCategory.java
diff --git a/android/app/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerActivity.java b/android/robot/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerActivity.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerActivity.java
rename to android/robot/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerActivity.java
diff --git a/android/app/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerFragment.java b/android/robot/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerFragment.java
rename to android/robot/src/main/java/org/openbot/modelManagement/BackHandlingFilePickerFragment.java
diff --git a/android/app/src/main/java/org/openbot/modelManagement/EditModelDialogFragment.java b/android/robot/src/main/java/org/openbot/modelManagement/EditModelDialogFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/modelManagement/EditModelDialogFragment.java
rename to android/robot/src/main/java/org/openbot/modelManagement/EditModelDialogFragment.java
diff --git a/android/app/src/main/java/org/openbot/modelManagement/ModelAdapter.java b/android/robot/src/main/java/org/openbot/modelManagement/ModelAdapter.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/modelManagement/ModelAdapter.java
rename to android/robot/src/main/java/org/openbot/modelManagement/ModelAdapter.java
diff --git a/android/app/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java b/android/robot/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java
rename to android/robot/src/main/java/org/openbot/modelManagement/ModelManagementFragment.java
diff --git a/android/app/src/main/java/org/openbot/objectNav/ObjectNavFragment.java b/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
rename to android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
diff --git a/android/app/src/main/java/org/openbot/original/CameraActivity.java b/android/robot/src/main/java/org/openbot/original/CameraActivity.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/original/CameraActivity.java
rename to android/robot/src/main/java/org/openbot/original/CameraActivity.java
diff --git a/android/app/src/main/java/org/openbot/original/CameraConnectionFragment.java b/android/robot/src/main/java/org/openbot/original/CameraConnectionFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/original/CameraConnectionFragment.java
rename to android/robot/src/main/java/org/openbot/original/CameraConnectionFragment.java
diff --git a/android/app/src/main/java/org/openbot/original/DefaultActivity.java b/android/robot/src/main/java/org/openbot/original/DefaultActivity.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/original/DefaultActivity.java
rename to android/robot/src/main/java/org/openbot/original/DefaultActivity.java
diff --git a/android/app/src/main/java/org/openbot/original/LegacyCameraConnectionFragment.java b/android/robot/src/main/java/org/openbot/original/LegacyCameraConnectionFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/original/LegacyCameraConnectionFragment.java
rename to android/robot/src/main/java/org/openbot/original/LegacyCameraConnectionFragment.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/ArCore.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/ArCore.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/ArCore.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/ArCore.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/ArCoreListener.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/ArCoreListener.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/ArCoreListener.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/ArCoreListener.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/CameraIntrinsics.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/CameraIntrinsics.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/CameraIntrinsics.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/CameraIntrinsics.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/DepthFrame.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/DepthFrame.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/DepthFrame.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/DepthFrame.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/ImageFrame.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/ImageFrame.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/ImageFrame.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/ImageFrame.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/InfoDialogFragment.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/InfoDialogFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/InfoDialogFragment.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/InfoDialogFragment.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/NavigationPoses.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/NavigationPoses.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/NavigationPoses.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/NavigationPoses.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/PermissionDialogFragment.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/PermissionDialogFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/PermissionDialogFragment.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/PermissionDialogFragment.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/PointGoalNavigationFragment.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/PointGoalNavigationFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/PointGoalNavigationFragment.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/PointGoalNavigationFragment.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/SetGoalDialogFragment.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/SetGoalDialogFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/SetGoalDialogFragment.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/SetGoalDialogFragment.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/BackgroundRenderer.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/BackgroundRenderer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/BackgroundRenderer.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/BackgroundRenderer.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/DisplayRotationHelper.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/DisplayRotationHelper.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/DisplayRotationHelper.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/DisplayRotationHelper.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/ObjectRenderer.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/ObjectRenderer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/ObjectRenderer.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/ObjectRenderer.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/ShaderUtil.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/ShaderUtil.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/ShaderUtil.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/ShaderUtil.java
diff --git a/android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/TwoDRenderer.java b/android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/TwoDRenderer.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/pointGoalNavigation/rendering/TwoDRenderer.java
rename to android/robot/src/main/java/org/openbot/pointGoalNavigation/rendering/TwoDRenderer.java
diff --git a/android/app/src/main/java/org/openbot/robot/FreeRoamFragment.java b/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/robot/FreeRoamFragment.java
rename to android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
diff --git a/android/app/src/main/java/org/openbot/robot/RobotInfoFragment.java b/android/robot/src/main/java/org/openbot/robot/RobotInfoFragment.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/robot/RobotInfoFragment.java
rename to android/robot/src/main/java/org/openbot/robot/RobotInfoFragment.java
diff --git a/android/app/src/main/java/org/openbot/server/NsdService.java b/android/robot/src/main/java/org/openbot/server/NsdService.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/server/NsdService.java
rename to android/robot/src/main/java/org/openbot/server/NsdService.java
diff --git a/android/app/src/main/java/org/openbot/server/ServerCommunication.java b/android/robot/src/main/java/org/openbot/server/ServerCommunication.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/server/ServerCommunication.java
rename to android/robot/src/main/java/org/openbot/server/ServerCommunication.java
diff --git a/android/app/src/main/java/org/openbot/server/ServerListener.java b/android/robot/src/main/java/org/openbot/server/ServerListener.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/server/ServerListener.java
rename to android/robot/src/main/java/org/openbot/server/ServerListener.java
diff --git a/android/app/src/main/java/org/openbot/tflite/Autopilot.java b/android/robot/src/main/java/org/openbot/tflite/Autopilot.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/Autopilot.java
rename to android/robot/src/main/java/org/openbot/tflite/Autopilot.java
diff --git a/android/app/src/main/java/org/openbot/tflite/Detector.java b/android/robot/src/main/java/org/openbot/tflite/Detector.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/Detector.java
rename to android/robot/src/main/java/org/openbot/tflite/Detector.java
diff --git a/android/app/src/main/java/org/openbot/tflite/DetectorDefault.java b/android/robot/src/main/java/org/openbot/tflite/DetectorDefault.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/DetectorDefault.java
rename to android/robot/src/main/java/org/openbot/tflite/DetectorDefault.java
diff --git a/android/app/src/main/java/org/openbot/tflite/DetectorYoloV4.java b/android/robot/src/main/java/org/openbot/tflite/DetectorYoloV4.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/DetectorYoloV4.java
rename to android/robot/src/main/java/org/openbot/tflite/DetectorYoloV4.java
diff --git a/android/app/src/main/java/org/openbot/tflite/DetectorYoloV5.java b/android/robot/src/main/java/org/openbot/tflite/DetectorYoloV5.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/DetectorYoloV5.java
rename to android/robot/src/main/java/org/openbot/tflite/DetectorYoloV5.java
diff --git a/android/app/src/main/java/org/openbot/tflite/Model.java b/android/robot/src/main/java/org/openbot/tflite/Model.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/Model.java
rename to android/robot/src/main/java/org/openbot/tflite/Model.java
diff --git a/android/app/src/main/java/org/openbot/tflite/Navigation.java b/android/robot/src/main/java/org/openbot/tflite/Navigation.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/Navigation.java
rename to android/robot/src/main/java/org/openbot/tflite/Navigation.java
diff --git a/android/app/src/main/java/org/openbot/tflite/Network.java b/android/robot/src/main/java/org/openbot/tflite/Network.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tflite/Network.java
rename to android/robot/src/main/java/org/openbot/tflite/Network.java
diff --git a/android/app/src/main/java/org/openbot/tracking/MultiBoxTracker.java b/android/robot/src/main/java/org/openbot/tracking/MultiBoxTracker.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/tracking/MultiBoxTracker.java
rename to android/robot/src/main/java/org/openbot/tracking/MultiBoxTracker.java
diff --git a/android/app/src/main/java/org/openbot/utils/AndGate.java b/android/robot/src/main/java/org/openbot/utils/AndGate.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/AndGate.java
rename to android/robot/src/main/java/org/openbot/utils/AndGate.java
diff --git a/android/app/src/main/java/org/openbot/utils/CameraUtils.java b/android/robot/src/main/java/org/openbot/utils/CameraUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/CameraUtils.java
rename to android/robot/src/main/java/org/openbot/utils/CameraUtils.java
diff --git a/android/app/src/main/java/org/openbot/utils/ConnectionUtils.java b/android/robot/src/main/java/org/openbot/utils/ConnectionUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/ConnectionUtils.java
rename to android/robot/src/main/java/org/openbot/utils/ConnectionUtils.java
diff --git a/android/app/src/main/java/org/openbot/utils/Constants.java b/android/robot/src/main/java/org/openbot/utils/Constants.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/Constants.java
rename to android/robot/src/main/java/org/openbot/utils/Constants.java
diff --git a/android/app/src/main/java/org/openbot/utils/DelayedRunner.java b/android/robot/src/main/java/org/openbot/utils/DelayedRunner.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/DelayedRunner.java
rename to android/robot/src/main/java/org/openbot/utils/DelayedRunner.java
diff --git a/android/app/src/main/java/org/openbot/utils/Enums.java b/android/robot/src/main/java/org/openbot/utils/Enums.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/Enums.java
rename to android/robot/src/main/java/org/openbot/utils/Enums.java
diff --git a/android/app/src/main/java/org/openbot/utils/FileUtils.java b/android/robot/src/main/java/org/openbot/utils/FileUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/FileUtils.java
rename to android/robot/src/main/java/org/openbot/utils/FileUtils.java
diff --git a/android/app/src/main/java/org/openbot/utils/FormatUtils.java b/android/robot/src/main/java/org/openbot/utils/FormatUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/FormatUtils.java
rename to android/robot/src/main/java/org/openbot/utils/FormatUtils.java
diff --git a/android/app/src/main/java/org/openbot/utils/MarginItemDecoration.java b/android/robot/src/main/java/org/openbot/utils/MarginItemDecoration.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/MarginItemDecoration.java
rename to android/robot/src/main/java/org/openbot/utils/MarginItemDecoration.java
diff --git a/android/app/src/main/java/org/openbot/utils/MovingAverage.java b/android/robot/src/main/java/org/openbot/utils/MovingAverage.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/MovingAverage.java
rename to android/robot/src/main/java/org/openbot/utils/MovingAverage.java
diff --git a/android/app/src/main/java/org/openbot/utils/PermissionUtils.java b/android/robot/src/main/java/org/openbot/utils/PermissionUtils.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/PermissionUtils.java
rename to android/robot/src/main/java/org/openbot/utils/PermissionUtils.java
diff --git a/android/app/src/main/java/org/openbot/utils/PostProcessingEnabler.java b/android/robot/src/main/java/org/openbot/utils/PostProcessingEnabler.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/PostProcessingEnabler.java
rename to android/robot/src/main/java/org/openbot/utils/PostProcessingEnabler.java
diff --git a/android/app/src/main/java/org/openbot/utils/YuvToRgbConverter.kt b/android/robot/src/main/java/org/openbot/utils/YuvToRgbConverter.kt
similarity index 100%
rename from android/app/src/main/java/org/openbot/utils/YuvToRgbConverter.kt
rename to android/robot/src/main/java/org/openbot/utils/YuvToRgbConverter.kt
diff --git a/android/app/src/main/java/org/openbot/vehicle/BluetoothManager.java b/android/robot/src/main/java/org/openbot/vehicle/BluetoothManager.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/BluetoothManager.java
rename to android/robot/src/main/java/org/openbot/vehicle/BluetoothManager.java
diff --git a/android/app/src/main/java/org/openbot/vehicle/Control.java b/android/robot/src/main/java/org/openbot/vehicle/Control.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/Control.java
rename to android/robot/src/main/java/org/openbot/vehicle/Control.java
diff --git a/android/app/src/main/java/org/openbot/vehicle/Indicator.java b/android/robot/src/main/java/org/openbot/vehicle/Indicator.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/Indicator.java
rename to android/robot/src/main/java/org/openbot/vehicle/Indicator.java
diff --git a/android/app/src/main/java/org/openbot/vehicle/Noise.java b/android/robot/src/main/java/org/openbot/vehicle/Noise.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/Noise.java
rename to android/robot/src/main/java/org/openbot/vehicle/Noise.java
diff --git a/android/app/src/main/java/org/openbot/vehicle/UsbConnection.java b/android/robot/src/main/java/org/openbot/vehicle/UsbConnection.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/UsbConnection.java
rename to android/robot/src/main/java/org/openbot/vehicle/UsbConnection.java
diff --git a/android/app/src/main/java/org/openbot/vehicle/Vehicle.java b/android/robot/src/main/java/org/openbot/vehicle/Vehicle.java
similarity index 100%
rename from android/app/src/main/java/org/openbot/vehicle/Vehicle.java
rename to android/robot/src/main/java/org/openbot/vehicle/Vehicle.java
diff --git a/android/app/src/main/res/anim/blink.xml b/android/robot/src/main/res/anim/blink.xml
similarity index 100%
rename from android/app/src/main/res/anim/blink.xml
rename to android/robot/src/main/res/anim/blink.xml
diff --git a/android/app/src/main/res/drawable-hdpi/diy.gif b/android/robot/src/main/res/drawable-hdpi/diy.gif
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/diy.gif
rename to android/robot/src/main/res/drawable-hdpi/diy.gif
diff --git a/android/robot/src/main/res/drawable-hdpi/ic_openbot.png b/android/robot/src/main/res/drawable-hdpi/ic_openbot.png
new file mode 100644
index 000000000..e993a6aa3
Binary files /dev/null and b/android/robot/src/main/res/drawable-hdpi/ic_openbot.png differ
diff --git a/android/robot/src/main/res/drawable-hdpi/ic_openbot_space.png b/android/robot/src/main/res/drawable-hdpi/ic_openbot_space.png
new file mode 100644
index 000000000..dd5210566
Binary files /dev/null and b/android/robot/src/main/res/drawable-hdpi/ic_openbot_space.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_refresh_blue.xml b/android/robot/src/main/res/drawable-hdpi/ic_refresh_blue.xml
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/ic_refresh_blue.xml
rename to android/robot/src/main/res/drawable-hdpi/ic_refresh_blue.xml
diff --git a/android/app/src/main/res/drawable-hdpi/mtv.gif b/android/robot/src/main/res/drawable-hdpi/mtv.gif
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/mtv.gif
rename to android/robot/src/main/res/drawable-hdpi/mtv.gif
diff --git a/android/app/src/main/res/drawable-hdpi/rc_car.gif b/android/robot/src/main/res/drawable-hdpi/rc_car.gif
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/rc_car.gif
rename to android/robot/src/main/res/drawable-hdpi/rc_car.gif
diff --git a/android/app/src/main/res/drawable-hdpi/rtr_520.gif b/android/robot/src/main/res/drawable-hdpi/rtr_520.gif
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/rtr_520.gif
rename to android/robot/src/main/res/drawable-hdpi/rtr_520.gif
diff --git a/android/app/src/main/res/drawable-hdpi/rtr_tt.gif b/android/robot/src/main/res/drawable-hdpi/rtr_tt.gif
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/rtr_tt.gif
rename to android/robot/src/main/res/drawable-hdpi/rtr_tt.gif
diff --git a/android/app/src/main/res/drawable-xxhdpi/gamepad_outline.png b/android/robot/src/main/res/drawable-xxhdpi/gamepad_outline.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/gamepad_outline.png
rename to android/robot/src/main/res/drawable-xxhdpi/gamepad_outline.png
diff --git a/android/robot/src/main/res/drawable-xxhdpi/ic_openbot.png b/android/robot/src/main/res/drawable-xxhdpi/ic_openbot.png
new file mode 100644
index 000000000..d2be94d7c
Binary files /dev/null and b/android/robot/src/main/res/drawable-xxhdpi/ic_openbot.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icn_chevron_down.png b/android/robot/src/main/res/drawable-xxhdpi/icn_chevron_down.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/icn_chevron_down.png
rename to android/robot/src/main/res/drawable-xxhdpi/icn_chevron_down.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/icn_chevron_up.png b/android/robot/src/main/res/drawable-xxhdpi/icn_chevron_up.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/icn_chevron_up.png
rename to android/robot/src/main/res/drawable-xxhdpi/icn_chevron_up.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/top.png b/android/robot/src/main/res/drawable-xxhdpi/top.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/top.png
rename to android/robot/src/main/res/drawable-xxhdpi/top.png
diff --git a/android/app/src/main/res/drawable/ble_toggle.xml b/android/robot/src/main/res/drawable/ble_toggle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ble_toggle.xml
rename to android/robot/src/main/res/drawable/ble_toggle.xml
diff --git a/android/app/src/main/res/drawable/bottom_sheet_bg.xml b/android/robot/src/main/res/drawable/bottom_sheet_bg.xml
similarity index 100%
rename from android/app/src/main/res/drawable/bottom_sheet_bg.xml
rename to android/robot/src/main/res/drawable/bottom_sheet_bg.xml
diff --git a/android/app/src/main/res/drawable/button_background_border.xml b/android/robot/src/main/res/drawable/button_background_border.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_background_border.xml
rename to android/robot/src/main/res/drawable/button_background_border.xml
diff --git a/android/app/src/main/res/drawable/button_item_background_black.xml b/android/robot/src/main/res/drawable/button_item_background_black.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_item_background_black.xml
rename to android/robot/src/main/res/drawable/button_item_background_black.xml
diff --git a/android/app/src/main/res/drawable/circle.xml b/android/robot/src/main/res/drawable/circle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/circle.xml
rename to android/robot/src/main/res/drawable/circle.xml
diff --git a/android/app/src/main/res/drawable/circular_progress_bar.xml b/android/robot/src/main/res/drawable/circular_progress_bar.xml
similarity index 100%
rename from android/app/src/main/res/drawable/circular_progress_bar.xml
rename to android/robot/src/main/res/drawable/circular_progress_bar.xml
diff --git a/android/app/src/main/res/drawable/ic_autopilot.xml b/android/robot/src/main/res/drawable/ic_autopilot.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_autopilot.xml
rename to android/robot/src/main/res/drawable/ic_autopilot.xml
diff --git a/android/app/src/main/res/drawable/ic_baseline_add.xml b/android/robot/src/main/res/drawable/ic_baseline_add.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_baseline_add.xml
rename to android/robot/src/main/res/drawable/ic_baseline_add.xml
diff --git a/android/app/src/main/res/drawable/ic_baseline_golf_course.xml b/android/robot/src/main/res/drawable/ic_baseline_golf_course.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_baseline_golf_course.xml
rename to android/robot/src/main/res/drawable/ic_baseline_golf_course.xml
diff --git a/android/app/src/main/res/drawable/ic_baseline_remove.xml b/android/robot/src/main/res/drawable/ic_baseline_remove.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_baseline_remove.xml
rename to android/robot/src/main/res/drawable/ic_baseline_remove.xml
diff --git a/android/app/src/main/res/drawable/ic_battery_full.xml b/android/robot/src/main/res/drawable/ic_battery_full.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_battery_full.xml
rename to android/robot/src/main/res/drawable/ic_battery_full.xml
diff --git a/android/app/src/main/res/drawable/ic_battery_outline.xml b/android/robot/src/main/res/drawable/ic_battery_outline.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_battery_outline.xml
rename to android/robot/src/main/res/drawable/ic_battery_outline.xml
diff --git a/android/app/src/main/res/drawable/ic_bluetooth.xml b/android/robot/src/main/res/drawable/ic_bluetooth.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_bluetooth.xml
rename to android/robot/src/main/res/drawable/ic_bluetooth.xml
diff --git a/android/app/src/main/res/drawable/ic_bluetooth_connected.xml b/android/robot/src/main/res/drawable/ic_bluetooth_connected.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_bluetooth_connected.xml
rename to android/robot/src/main/res/drawable/ic_bluetooth_connected.xml
diff --git a/android/app/src/main/res/drawable/ic_bluetooth_disconnected.xml b/android/robot/src/main/res/drawable/ic_bluetooth_disconnected.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_bluetooth_disconnected.xml
rename to android/robot/src/main/res/drawable/ic_bluetooth_disconnected.xml
diff --git a/android/app/src/main/res/drawable/ic_bluetooth_off.xml b/android/robot/src/main/res/drawable/ic_bluetooth_off.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_bluetooth_off.xml
rename to android/robot/src/main/res/drawable/ic_bluetooth_off.xml
diff --git a/android/app/src/main/res/drawable/ic_cameraswitch.xml b/android/robot/src/main/res/drawable/ic_cameraswitch.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_cameraswitch.xml
rename to android/robot/src/main/res/drawable/ic_cameraswitch.xml
diff --git a/android/app/src/main/res/drawable/ic_car_steering_wheel.xml b/android/robot/src/main/res/drawable/ic_car_steering_wheel.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_car_steering_wheel.xml
rename to android/robot/src/main/res/drawable/ic_car_steering_wheel.xml
diff --git a/android/app/src/main/res/drawable/ic_check_24.xml b/android/robot/src/main/res/drawable/ic_check_24.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_check_24.xml
rename to android/robot/src/main/res/drawable/ic_check_24.xml
diff --git a/android/app/src/main/res/drawable/ic_circle_selected.xml b/android/robot/src/main/res/drawable/ic_circle_selected.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_circle_selected.xml
rename to android/robot/src/main/res/drawable/ic_circle_selected.xml
diff --git a/android/app/src/main/res/drawable/ic_cloud_upload.xml b/android/robot/src/main/res/drawable/ic_cloud_upload.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_cloud_upload.xml
rename to android/robot/src/main/res/drawable/ic_cloud_upload.xml
diff --git a/android/app/src/main/res/drawable/ic_code.xml b/android/robot/src/main/res/drawable/ic_code.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_code.xml
rename to android/robot/src/main/res/drawable/ic_code.xml
diff --git a/android/robot/src/main/res/drawable/ic_controller.xml b/android/robot/src/main/res/drawable/ic_controller.xml
new file mode 100644
index 000000000..f4724a1b3
--- /dev/null
+++ b/android/robot/src/main/res/drawable/ic_controller.xml
@@ -0,0 +1,10 @@
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_delete_24.xml b/android/robot/src/main/res/drawable/ic_delete_24.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_delete_24.xml
rename to android/robot/src/main/res/drawable/ic_delete_24.xml
diff --git a/android/app/src/main/res/drawable/ic_download.xml b/android/robot/src/main/res/drawable/ic_download.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_download.xml
rename to android/robot/src/main/res/drawable/ic_download.xml
diff --git a/android/app/src/main/res/drawable/ic_dual.xml b/android/robot/src/main/res/drawable/ic_dual.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_dual.xml
rename to android/robot/src/main/res/drawable/ic_dual.xml
diff --git a/android/app/src/main/res/drawable/ic_edit_24.xml b/android/robot/src/main/res/drawable/ic_edit_24.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_edit_24.xml
rename to android/robot/src/main/res/drawable/ic_edit_24.xml
diff --git a/android/app/src/main/res/drawable/ic_edit_48.xml b/android/robot/src/main/res/drawable/ic_edit_48.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_edit_48.xml
rename to android/robot/src/main/res/drawable/ic_edit_48.xml
diff --git a/android/app/src/main/res/drawable/ic_electric_car.xml b/android/robot/src/main/res/drawable/ic_electric_car.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_electric_car.xml
rename to android/robot/src/main/res/drawable/ic_electric_car.xml
diff --git a/android/app/src/main/res/drawable/ic_game.xml b/android/robot/src/main/res/drawable/ic_game.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_game.xml
rename to android/robot/src/main/res/drawable/ic_game.xml
diff --git a/android/app/src/main/res/drawable/ic_joystick.xml b/android/robot/src/main/res/drawable/ic_joystick.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_joystick.xml
rename to android/robot/src/main/res/drawable/ic_joystick.xml
diff --git a/android/app/src/main/res/drawable/ic_legacy_car.xml b/android/robot/src/main/res/drawable/ic_legacy_car.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_legacy_car.xml
rename to android/robot/src/main/res/drawable/ic_legacy_car.xml
diff --git a/android/app/src/main/res/drawable/ic_list_bulleted_48.xml b/android/robot/src/main/res/drawable/ic_list_bulleted_48.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_list_bulleted_48.xml
rename to android/robot/src/main/res/drawable/ic_list_bulleted_48.xml
diff --git a/android/app/src/main/res/drawable/ic_map.xml b/android/robot/src/main/res/drawable/ic_map.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_map.xml
rename to android/robot/src/main/res/drawable/ic_map.xml
diff --git a/android/app/src/main/res/drawable/ic_network.xml b/android/robot/src/main/res/drawable/ic_network.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_network.xml
rename to android/robot/src/main/res/drawable/ic_network.xml
diff --git a/android/app/src/main/res/drawable/ic_outline_circle.xml b/android/robot/src/main/res/drawable/ic_outline_circle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_outline_circle.xml
rename to android/robot/src/main/res/drawable/ic_outline_circle.xml
diff --git a/android/app/src/main/res/drawable/ic_person_search.xml b/android/robot/src/main/res/drawable/ic_person_search.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_person_search.xml
rename to android/robot/src/main/res/drawable/ic_person_search.xml
diff --git a/android/app/src/main/res/drawable/ic_phone.xml b/android/robot/src/main/res/drawable/ic_phone.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_phone.xml
rename to android/robot/src/main/res/drawable/ic_phone.xml
diff --git a/android/app/src/main/res/drawable/ic_phonelink.xml b/android/robot/src/main/res/drawable/ic_phonelink.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_phonelink.xml
rename to android/robot/src/main/res/drawable/ic_phonelink.xml
diff --git a/android/app/src/main/res/drawable/ic_play_arrow.xml b/android/robot/src/main/res/drawable/ic_play_arrow.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_play_arrow.xml
rename to android/robot/src/main/res/drawable/ic_play_arrow.xml
diff --git a/android/app/src/main/res/drawable/ic_refresh.xml b/android/robot/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_refresh.xml
rename to android/robot/src/main/res/drawable/ic_refresh.xml
diff --git a/android/app/src/main/res/drawable/ic_settings.xml b/android/robot/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_settings.xml
rename to android/robot/src/main/res/drawable/ic_settings.xml
diff --git a/android/app/src/main/res/drawable/ic_speed_high.xml b/android/robot/src/main/res/drawable/ic_speed_high.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_speed_high.xml
rename to android/robot/src/main/res/drawable/ic_speed_high.xml
diff --git a/android/app/src/main/res/drawable/ic_speed_low.xml b/android/robot/src/main/res/drawable/ic_speed_low.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_speed_low.xml
rename to android/robot/src/main/res/drawable/ic_speed_low.xml
diff --git a/android/app/src/main/res/drawable/ic_speed_medium.xml b/android/robot/src/main/res/drawable/ic_speed_medium.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_speed_medium.xml
rename to android/robot/src/main/res/drawable/ic_speed_medium.xml
diff --git a/android/app/src/main/res/drawable/ic_stop.xml b/android/robot/src/main/res/drawable/ic_stop.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_stop.xml
rename to android/robot/src/main/res/drawable/ic_stop.xml
diff --git a/android/app/src/main/res/drawable/ic_storage.xml b/android/robot/src/main/res/drawable/ic_storage.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_storage.xml
rename to android/robot/src/main/res/drawable/ic_storage.xml
diff --git a/android/app/src/main/res/drawable/ic_usb.xml b/android/robot/src/main/res/drawable/ic_usb.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_usb.xml
rename to android/robot/src/main/res/drawable/ic_usb.xml
diff --git a/android/app/src/main/res/drawable/ic_usb_menu_item.xml b/android/robot/src/main/res/drawable/ic_usb_menu_item.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_usb_menu_item.xml
rename to android/robot/src/main/res/drawable/ic_usb_menu_item.xml
diff --git a/android/app/src/main/res/drawable/ic_usb_off.xml b/android/robot/src/main/res/drawable/ic_usb_off.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_usb_off.xml
rename to android/robot/src/main/res/drawable/ic_usb_off.xml
diff --git a/android/app/src/main/res/drawable/ic_voice_over.xml b/android/robot/src/main/res/drawable/ic_voice_over.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_voice_over.xml
rename to android/robot/src/main/res/drawable/ic_voice_over.xml
diff --git a/android/app/src/main/res/drawable/logger_toggle.xml b/android/robot/src/main/res/drawable/logger_toggle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/logger_toggle.xml
rename to android/robot/src/main/res/drawable/logger_toggle.xml
diff --git a/android/app/src/main/res/drawable/progress_drawable_battery.xml b/android/robot/src/main/res/drawable/progress_drawable_battery.xml
similarity index 100%
rename from android/app/src/main/res/drawable/progress_drawable_battery.xml
rename to android/robot/src/main/res/drawable/progress_drawable_battery.xml
diff --git a/android/app/src/main/res/drawable/progress_drawable_sonar.xml b/android/robot/src/main/res/drawable/progress_drawable_sonar.xml
similarity index 100%
rename from android/app/src/main/res/drawable/progress_drawable_sonar.xml
rename to android/robot/src/main/res/drawable/progress_drawable_sonar.xml
diff --git a/android/app/src/main/res/drawable/rectangle.xml b/android/robot/src/main/res/drawable/rectangle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/rectangle.xml
rename to android/robot/src/main/res/drawable/rectangle.xml
diff --git a/android/app/src/main/res/drawable/refresh_toggle.xml b/android/robot/src/main/res/drawable/refresh_toggle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/refresh_toggle.xml
rename to android/robot/src/main/res/drawable/refresh_toggle.xml
diff --git a/android/app/src/main/res/drawable/spinner_bg.xml b/android/robot/src/main/res/drawable/spinner_bg.xml
similarity index 100%
rename from android/app/src/main/res/drawable/spinner_bg.xml
rename to android/robot/src/main/res/drawable/spinner_bg.xml
diff --git a/android/app/src/main/res/drawable/usb_toggle.xml b/android/robot/src/main/res/drawable/usb_toggle.xml
similarity index 100%
rename from android/app/src/main/res/drawable/usb_toggle.xml
rename to android/robot/src/main/res/drawable/usb_toggle.xml
diff --git a/android/app/src/main/res/layout-land/dialog_sensors.xml b/android/robot/src/main/res/layout-land/dialog_sensors.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/dialog_sensors.xml
rename to android/robot/src/main/res/layout-land/dialog_sensors.xml
diff --git a/android/app/src/main/res/layout-land/fragment_autopilot.xml b/android/robot/src/main/res/layout-land/fragment_autopilot.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/fragment_autopilot.xml
rename to android/robot/src/main/res/layout-land/fragment_autopilot.xml
diff --git a/android/app/src/main/res/layout-land/fragment_controller_mapping.xml b/android/robot/src/main/res/layout-land/fragment_controller_mapping.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/fragment_controller_mapping.xml
rename to android/robot/src/main/res/layout-land/fragment_controller_mapping.xml
diff --git a/android/app/src/main/res/layout-land/fragment_free_roam.xml b/android/robot/src/main/res/layout-land/fragment_free_roam.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/fragment_free_roam.xml
rename to android/robot/src/main/res/layout-land/fragment_free_roam.xml
diff --git a/android/app/src/main/res/layout-land/fragment_logger.xml b/android/robot/src/main/res/layout-land/fragment_logger.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/fragment_logger.xml
rename to android/robot/src/main/res/layout-land/fragment_logger.xml
diff --git a/android/app/src/main/res/layout-land/fragment_object_nav.xml b/android/robot/src/main/res/layout-land/fragment_object_nav.xml
similarity index 99%
rename from android/app/src/main/res/layout-land/fragment_object_nav.xml
rename to android/robot/src/main/res/layout-land/fragment_object_nav.xml
index fdd1f0b7a..ef260e2ba 100644
--- a/android/app/src/main/res/layout-land/fragment_object_nav.xml
+++ b/android/robot/src/main/res/layout-land/fragment_object_nav.xml
@@ -124,7 +124,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:paddingVertical="12dp"
+ android:paddingVertical="8dp"
android:paddingStart="16dp"
android:text="@string/model"
android:textColor="@android:color/black" />
@@ -150,7 +150,7 @@
android:layout_height="match_parent"
android:layout_weight="0.7"
android:gravity="center_vertical"
- android:paddingVertical="12dp"
+ android:paddingVertical="8dp"
android:paddingStart="16dp"
android:text="@string/inference"
android:textColor="@android:color/black" />
diff --git a/android/app/src/main/res/layout-land/fragment_robot_info.xml b/android/robot/src/main/res/layout-land/fragment_robot_info.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/fragment_robot_info.xml
rename to android/robot/src/main/res/layout-land/fragment_robot_info.xml
diff --git a/android/app/src/main/res/layout-land/layout_bottom_sheet.xml b/android/robot/src/main/res/layout-land/layout_bottom_sheet.xml
similarity index 100%
rename from android/app/src/main/res/layout-land/layout_bottom_sheet.xml
rename to android/robot/src/main/res/layout-land/layout_bottom_sheet.xml
diff --git a/android/app/src/main/res/layout/activity_camera.xml b/android/robot/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from android/app/src/main/res/layout/activity_camera.xml
rename to android/robot/src/main/res/layout/activity_camera.xml
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/robot/src/main/res/layout/activity_main.xml
similarity index 100%
rename from android/app/src/main/res/layout/activity_main.xml
rename to android/robot/src/main/res/layout/activity_main.xml
diff --git a/android/app/src/main/res/layout/ble_listview_tv.xml b/android/robot/src/main/res/layout/ble_listview_tv.xml
similarity index 100%
rename from android/app/src/main/res/layout/ble_listview_tv.xml
rename to android/robot/src/main/res/layout/ble_listview_tv.xml
diff --git a/android/app/src/main/res/layout/camera_connection_fragment.xml b/android/robot/src/main/res/layout/camera_connection_fragment.xml
similarity index 100%
rename from android/app/src/main/res/layout/camera_connection_fragment.xml
rename to android/robot/src/main/res/layout/camera_connection_fragment.xml
diff --git a/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml b/android/robot/src/main/res/layout/camera_connection_fragment_tracking.xml
similarity index 100%
rename from android/app/src/main/res/layout/camera_connection_fragment_tracking.xml
rename to android/robot/src/main/res/layout/camera_connection_fragment_tracking.xml
diff --git a/android/app/src/main/res/layout/control_buttons.xml b/android/robot/src/main/res/layout/control_buttons.xml
similarity index 100%
rename from android/app/src/main/res/layout/control_buttons.xml
rename to android/robot/src/main/res/layout/control_buttons.xml
diff --git a/android/app/src/main/res/layout/dialog_edit_model.xml b/android/robot/src/main/res/layout/dialog_edit_model.xml
similarity index 100%
rename from android/app/src/main/res/layout/dialog_edit_model.xml
rename to android/robot/src/main/res/layout/dialog_edit_model.xml
diff --git a/android/app/src/main/res/layout/dialog_sensors.xml b/android/robot/src/main/res/layout/dialog_sensors.xml
similarity index 100%
rename from android/app/src/main/res/layout/dialog_sensors.xml
rename to android/robot/src/main/res/layout/dialog_sensors.xml
diff --git a/android/app/src/main/res/layout/fragment_autopilot.xml b/android/robot/src/main/res/layout/fragment_autopilot.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_autopilot.xml
rename to android/robot/src/main/res/layout/fragment_autopilot.xml
diff --git a/android/app/src/main/res/layout/fragment_bluetooth.xml b/android/robot/src/main/res/layout/fragment_bluetooth.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_bluetooth.xml
rename to android/robot/src/main/res/layout/fragment_bluetooth.xml
diff --git a/android/app/src/main/res/layout/fragment_camera.xml b/android/robot/src/main/res/layout/fragment_camera.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_camera.xml
rename to android/robot/src/main/res/layout/fragment_camera.xml
diff --git a/android/app/src/main/res/layout/fragment_controller_mapping.xml b/android/robot/src/main/res/layout/fragment_controller_mapping.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_controller_mapping.xml
rename to android/robot/src/main/res/layout/fragment_controller_mapping.xml
diff --git a/android/app/src/main/res/layout/fragment_free_roam.xml b/android/robot/src/main/res/layout/fragment_free_roam.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_free_roam.xml
rename to android/robot/src/main/res/layout/fragment_free_roam.xml
diff --git a/android/app/src/main/res/layout/fragment_logger.xml b/android/robot/src/main/res/layout/fragment_logger.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_logger.xml
rename to android/robot/src/main/res/layout/fragment_logger.xml
diff --git a/android/app/src/main/res/layout/fragment_main.xml b/android/robot/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_main.xml
rename to android/robot/src/main/res/layout/fragment_main.xml
diff --git a/android/app/src/main/res/layout/fragment_model_management.xml b/android/robot/src/main/res/layout/fragment_model_management.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_model_management.xml
rename to android/robot/src/main/res/layout/fragment_model_management.xml
diff --git a/android/app/src/main/res/layout/fragment_object_nav.xml b/android/robot/src/main/res/layout/fragment_object_nav.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_object_nav.xml
rename to android/robot/src/main/res/layout/fragment_object_nav.xml
diff --git a/android/app/src/main/res/layout/fragment_point_goal_navigation.xml b/android/robot/src/main/res/layout/fragment_point_goal_navigation.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_point_goal_navigation.xml
rename to android/robot/src/main/res/layout/fragment_point_goal_navigation.xml
diff --git a/android/app/src/main/res/layout/fragment_robot_info.xml b/android/robot/src/main/res/layout/fragment_robot_info.xml
similarity index 100%
rename from android/app/src/main/res/layout/fragment_robot_info.xml
rename to android/robot/src/main/res/layout/fragment_robot_info.xml
diff --git a/android/app/src/main/res/layout/item_category.xml b/android/robot/src/main/res/layout/item_category.xml
similarity index 100%
rename from android/app/src/main/res/layout/item_category.xml
rename to android/robot/src/main/res/layout/item_category.xml
diff --git a/android/app/src/main/res/layout/item_model.xml b/android/robot/src/main/res/layout/item_model.xml
similarity index 100%
rename from android/app/src/main/res/layout/item_model.xml
rename to android/robot/src/main/res/layout/item_model.xml
diff --git a/android/app/src/main/res/layout/item_model_radio.xml b/android/robot/src/main/res/layout/item_model_radio.xml
similarity index 100%
rename from android/app/src/main/res/layout/item_model_radio.xml
rename to android/robot/src/main/res/layout/item_model_radio.xml
diff --git a/android/app/src/main/res/layout/item_sensor.xml b/android/robot/src/main/res/layout/item_sensor.xml
similarity index 100%
rename from android/app/src/main/res/layout/item_sensor.xml
rename to android/robot/src/main/res/layout/item_sensor.xml
diff --git a/android/app/src/main/res/layout/item_sub_category.xml b/android/robot/src/main/res/layout/item_sub_category.xml
similarity index 91%
rename from android/app/src/main/res/layout/item_sub_category.xml
rename to android/robot/src/main/res/layout/item_sub_category.xml
index 376cc8600..0a5c4df9a 100644
--- a/android/app/src/main/res/layout/item_sub_category.xml
+++ b/android/robot/src/main/res/layout/item_sub_category.xml
@@ -15,7 +15,7 @@
android:tint="@android:color/white"
tools:background="@color/cardview_dark_background"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize10Percent"
- tools:src="@drawable/ic_openbot" />
+ tools:src="@drawable/ic_openbot_space" />
diff --git a/android/app/src/main/res/layout/layout_bottom_sheet.xml b/android/robot/src/main/res/layout/layout_bottom_sheet.xml
similarity index 100%
rename from android/app/src/main/res/layout/layout_bottom_sheet.xml
rename to android/robot/src/main/res/layout/layout_bottom_sheet.xml
diff --git a/android/app/src/main/res/layout/set_goal_dialog_view.xml b/android/robot/src/main/res/layout/set_goal_dialog_view.xml
similarity index 100%
rename from android/app/src/main/res/layout/set_goal_dialog_view.xml
rename to android/robot/src/main/res/layout/set_goal_dialog_view.xml
diff --git a/android/app/src/main/res/layout/spinner_item.xml b/android/robot/src/main/res/layout/spinner_item.xml
similarity index 100%
rename from android/app/src/main/res/layout/spinner_item.xml
rename to android/robot/src/main/res/layout/spinner_item.xml
diff --git a/android/app/src/main/res/menu/menu_items.xml b/android/robot/src/main/res/menu/menu_items.xml
similarity index 100%
rename from android/app/src/main/res/menu/menu_items.xml
rename to android/robot/src/main/res/menu/menu_items.xml
diff --git a/android/app/src/main/res/navigation/nav_graph.xml b/android/robot/src/main/res/navigation/nav_graph.xml
similarity index 100%
rename from android/app/src/main/res/navigation/nav_graph.xml
rename to android/robot/src/main/res/navigation/nav_graph.xml
diff --git a/android/app/src/main/res/values/colors.xml b/android/robot/src/main/res/values/colors.xml
similarity index 100%
rename from android/app/src/main/res/values/colors.xml
rename to android/robot/src/main/res/values/colors.xml
diff --git a/android/robot/src/main/res/values/dimens.xml b/android/robot/src/main/res/values/dimens.xml
new file mode 100755
index 000000000..7e516abaf
--- /dev/null
+++ b/android/robot/src/main/res/values/dimens.xml
@@ -0,0 +1,8 @@
+
+
+ 16dp
+ 8dp
+ 12dp
+ 88dp
+ 12dp
+
\ No newline at end of file
diff --git a/android/app/src/main/res/values/ids.xml b/android/robot/src/main/res/values/ids.xml
similarity index 100%
rename from android/app/src/main/res/values/ids.xml
rename to android/robot/src/main/res/values/ids.xml
diff --git a/android/app/src/main/res/values/strings.xml b/android/robot/src/main/res/values/strings.xml
similarity index 100%
rename from android/app/src/main/res/values/strings.xml
rename to android/robot/src/main/res/values/strings.xml
diff --git a/android/app/src/main/res/values/styles.xml b/android/robot/src/main/res/values/styles.xml
similarity index 100%
rename from android/app/src/main/res/values/styles.xml
rename to android/robot/src/main/res/values/styles.xml
diff --git a/android/app/src/main/res/xml/device_filter.xml b/android/robot/src/main/res/xml/device_filter.xml
similarity index 100%
rename from android/app/src/main/res/xml/device_filter.xml
rename to android/robot/src/main/res/xml/device_filter.xml
diff --git a/android/app/src/main/res/xml/provider_paths.xml b/android/robot/src/main/res/xml/provider_paths.xml
similarity index 100%
rename from android/app/src/main/res/xml/provider_paths.xml
rename to android/robot/src/main/res/xml/provider_paths.xml
diff --git a/android/app/src/main/res/xml/root_preferences.xml b/android/robot/src/main/res/xml/root_preferences.xml
similarity index 100%
rename from android/app/src/main/res/xml/root_preferences.xml
rename to android/robot/src/main/res/xml/root_preferences.xml
diff --git a/android/app/src/main/res/xml/usb_connections.xml b/android/robot/src/main/res/xml/usb_connections.xml
similarity index 100%
rename from android/app/src/main/res/xml/usb_connections.xml
rename to android/robot/src/main/res/xml/usb_connections.xml
diff --git a/android/app/src/test/java/org/openbot/env/GameControllerTest.java b/android/robot/src/test/java/org/openbot/env/GameControllerTest.java
similarity index 100%
rename from android/app/src/test/java/org/openbot/env/GameControllerTest.java
rename to android/robot/src/test/java/org/openbot/env/GameControllerTest.java
diff --git a/android/app/src/test/java/org/openbot/env/VehicleTest.java b/android/robot/src/test/java/org/openbot/env/VehicleTest.java
similarity index 100%
rename from android/app/src/test/java/org/openbot/env/VehicleTest.java
rename to android/robot/src/test/java/org/openbot/env/VehicleTest.java
diff --git a/android/settings.gradle b/android/settings.gradle
index 82231ab53..42c80980e 100755
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1 +1 @@
-include ':app' , ':controller'
+include ':robot', ':controller'
diff --git a/docs/images/dialog_connectivity_mode.jpg b/docs/images/dialog_connectivity_mode.jpg
deleted file mode 100644
index b1e4c4c6a..000000000
Binary files a/docs/images/dialog_connectivity_mode.jpg and /dev/null differ
diff --git a/docs/images/dialog_connectivity_mode.png b/docs/images/dialog_connectivity_mode.png
new file mode 100644
index 000000000..891f04f04
Binary files /dev/null and b/docs/images/dialog_connectivity_mode.png differ
diff --git a/docs/images/dialog_stream_mode.jpg b/docs/images/dialog_stream_mode.jpg
deleted file mode 100644
index e431f3f93..000000000
Binary files a/docs/images/dialog_stream_mode.jpg and /dev/null differ
diff --git a/docs/images/dialog_stream_mode.png b/docs/images/dialog_stream_mode.png
new file mode 100644
index 000000000..57001f3a6
Binary files /dev/null and b/docs/images/dialog_stream_mode.png differ
diff --git a/docs/images/screen_main.gif b/docs/images/screen_main.gif
deleted file mode 100644
index dbe5b5689..000000000
Binary files a/docs/images/screen_main.gif and /dev/null differ
diff --git a/docs/images/screen_main.png b/docs/images/screen_main.png
new file mode 100644
index 000000000..cdbfe6c0e
Binary files /dev/null and b/docs/images/screen_main.png differ
diff --git a/docs/images/screen_settings.jpg b/docs/images/screen_settings.jpg
deleted file mode 100644
index 1f53e0cf2..000000000
Binary files a/docs/images/screen_settings.jpg and /dev/null differ
diff --git a/docs/images/screen_settings.png b/docs/images/screen_settings.png
new file mode 100644
index 000000000..4328bfef3
Binary files /dev/null and b/docs/images/screen_settings.png differ