diff --git a/app/build.gradle b/app/build.gradle
index ec8af2d..f862e15 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.example.carcontroller"
+        applicationId "org.vato.carcontroller"
         minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2c9992..7afa1dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.carcontroller">
+    package="org.vato.carcontroller">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -12,15 +12,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SLAM.SlamController"></activity>
-        <activity android:name=".LIDAR.LidarTrackingController" />
+        <activity android:name="org.vato.carcontroller.SLAM.SlamController"></activity>
+        <activity android:name="org.vato.carcontroller.LIDAR.LidarTrackingController" />
         <activity
-            android:name=".SettingsActivity"
+            android:name="org.vato.carcontroller.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".MainActivity" />
-        <activity android:name=".SimpleController" />
+            android:parentActivityName="org.vato.carcontroller.MainActivity" />
+        <activity android:name="org.vato.carcontroller.SimpleController" />
         <activity
-            android:name=".MainActivity"
+            android:name="org.vato.carcontroller.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/carcontroller/LIDAR/LidarTrackingController.java b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarTrackingController.java
similarity index 86%
rename from app/src/main/java/com/example/carcontroller/LIDAR/LidarTrackingController.java
rename to app/src/main/java/org/vato/carcontroller/LIDAR/LidarTrackingController.java
index d3b1786..5eeac84 100644
--- a/app/src/main/java/com/example/carcontroller/LIDAR/LidarTrackingController.java
+++ b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarTrackingController.java
@@ -1,10 +1,10 @@
-package com.example.carcontroller.LIDAR;
+package org.vato.carcontroller.LIDAR;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.example.carcontroller.R;
+import org.vato.carcontroller.R;
 
 public class LidarTrackingController extends AppCompatActivity {
 
@@ -31,7 +31,7 @@ public class LidarTrackingController extends AppCompatActivity {
     protected void onPause() {
         super.onPause();
         if (lidarMap != null) {
-            lidarMap.pause();
+            lidarMap.stop();
         }
     }
 
diff --git a/app/src/main/java/com/example/carcontroller/LIDAR/LidarView.java b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
similarity index 92%
rename from app/src/main/java/com/example/carcontroller/LIDAR/LidarView.java
rename to app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
index 6d221b9..89f0ac3 100644
--- a/app/src/main/java/com/example/carcontroller/LIDAR/LidarView.java
+++ b/app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller.LIDAR;
+package org.vato.carcontroller.LIDAR;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,12 +13,12 @@ import android.view.SurfaceView;
 
 import androidx.preference.PreferenceManager;
 
-import com.example.carcontroller.Empty;
-import com.example.carcontroller.Int32Value;
-import com.example.carcontroller.PersonTrackingGrpc;
-import com.example.carcontroller.PointScan;
-import com.example.carcontroller.Updaters.AbstractUpdater;
-import com.example.carcontroller.Updaters.ZmqUpdater;
+import org.vato.carcontroller.Empty;
+import org.vato.carcontroller.Int32Value;
+import org.vato.carcontroller.PersonTrackingGrpc;
+import org.vato.carcontroller.PointScan;
+import org.vato.carcontroller.Updaters.AbstractUpdater;
+import org.vato.carcontroller.Updaters.ZmqUpdater;
 
 import java.util.stream.Collectors;
 
@@ -146,7 +146,7 @@ public class LidarView extends SurfaceView implements AbstractUpdater.MapChanged
             this.y = y;
         }
 
-        static Point fromProtoPoint(com.example.carcontroller.Point point) {
+        static Point fromProtoPoint(org.vato.carcontroller.Point point) {
             return fromHist(point.getDistance(), point.getAngle());
         }
 
diff --git a/app/src/main/java/com/example/carcontroller/MainActivity.java b/app/src/main/java/org/vato/carcontroller/MainActivity.java
similarity index 91%
rename from app/src/main/java/com/example/carcontroller/MainActivity.java
rename to app/src/main/java/org/vato/carcontroller/MainActivity.java
index 74265e5..e4fce88 100644
--- a/app/src/main/java/com/example/carcontroller/MainActivity.java
+++ b/app/src/main/java/org/vato/carcontroller/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller;
+package org.vato.carcontroller;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,8 +9,8 @@ import android.view.View;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import com.example.carcontroller.LIDAR.LidarTrackingController;
-import com.example.carcontroller.SLAM.SlamController;
+import org.vato.carcontroller.LIDAR.LidarTrackingController;
+import org.vato.carcontroller.SLAM.SlamController;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/example/carcontroller/PiLoader.java b/app/src/main/java/org/vato/carcontroller/PiLoader.java
similarity index 98%
rename from app/src/main/java/com/example/carcontroller/PiLoader.java
rename to app/src/main/java/org/vato/carcontroller/PiLoader.java
index 5bc13eb..83f440e 100644
--- a/app/src/main/java/com/example/carcontroller/PiLoader.java
+++ b/app/src/main/java/org/vato/carcontroller/PiLoader.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller;
+package org.vato.carcontroller;
 
 
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/com/example/carcontroller/SLAM/SlamController.java b/app/src/main/java/org/vato/carcontroller/SLAM/SlamController.java
similarity index 96%
rename from app/src/main/java/com/example/carcontroller/SLAM/SlamController.java
rename to app/src/main/java/org/vato/carcontroller/SLAM/SlamController.java
index 7e9f549..710acc2 100644
--- a/app/src/main/java/com/example/carcontroller/SLAM/SlamController.java
+++ b/app/src/main/java/org/vato/carcontroller/SLAM/SlamController.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller.SLAM;
+package org.vato.carcontroller.SLAM;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -7,8 +7,8 @@ import android.widget.SeekBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
-import com.example.carcontroller.PiLoader;
-import com.example.carcontroller.R;
+import org.vato.carcontroller.PiLoader;
+import org.vato.carcontroller.R;
 
 public class SlamController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {
 
diff --git a/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java b/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
similarity index 92%
rename from app/src/main/java/com/example/carcontroller/SLAM/SlamView.java
rename to app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
index 5e7d97f..ddc017c 100644
--- a/app/src/main/java/com/example/carcontroller/SLAM/SlamView.java
+++ b/app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller.SLAM;
+package org.vato.carcontroller.SLAM;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -12,15 +12,16 @@ import android.view.SurfaceView;
 
 import androidx.preference.PreferenceManager;
 
-import com.example.carcontroller.Empty;
-import com.example.carcontroller.SlamControlGrpc;
-import com.example.carcontroller.SlamDetails;
-import com.example.carcontroller.SlamLocation;
-import com.example.carcontroller.SlamScan;
-import com.example.carcontroller.Updaters.AbstractUpdater;
-import com.example.carcontroller.Updaters.ZmqUpdater;
 import com.google.protobuf.ByteString;
 
+import org.vato.carcontroller.Empty;
+import org.vato.carcontroller.SlamControlGrpc;
+import org.vato.carcontroller.SlamDetails;
+import org.vato.carcontroller.SlamLocation;
+import org.vato.carcontroller.SlamScan;
+import org.vato.carcontroller.Updaters.AbstractUpdater;
+import org.vato.carcontroller.Updaters.ZmqUpdater;
+
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.stub.StreamObserver;
diff --git a/app/src/main/java/com/example/carcontroller/SettingsActivity.java b/app/src/main/java/org/vato/carcontroller/SettingsActivity.java
similarity index 96%
rename from app/src/main/java/com/example/carcontroller/SettingsActivity.java
rename to app/src/main/java/org/vato/carcontroller/SettingsActivity.java
index adaa362..339b3af 100644
--- a/app/src/main/java/com/example/carcontroller/SettingsActivity.java
+++ b/app/src/main/java/org/vato/carcontroller/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller;
+package org.vato.carcontroller;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/com/example/carcontroller/SimpleController.java b/app/src/main/java/org/vato/carcontroller/SimpleController.java
similarity index 95%
rename from app/src/main/java/com/example/carcontroller/SimpleController.java
rename to app/src/main/java/org/vato/carcontroller/SimpleController.java
index f440518..0ce0b45 100644
--- a/app/src/main/java/com/example/carcontroller/SimpleController.java
+++ b/app/src/main/java/org/vato/carcontroller/SimpleController.java
@@ -1,15 +1,11 @@
-package com.example.carcontroller;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
+package org.vato.carcontroller;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.widget.SeekBar;
 
-import java.util.concurrent.CountDownLatch;
-
-import io.grpc.stub.StreamObserver;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceManager;
 
 public class SimpleController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {
 
diff --git a/app/src/main/java/com/example/carcontroller/Updaters/AbstractUpdater.java b/app/src/main/java/org/vato/carcontroller/Updaters/AbstractUpdater.java
similarity index 96%
rename from app/src/main/java/com/example/carcontroller/Updaters/AbstractUpdater.java
rename to app/src/main/java/org/vato/carcontroller/Updaters/AbstractUpdater.java
index 01fa249..3ee759d 100644
--- a/app/src/main/java/com/example/carcontroller/Updaters/AbstractUpdater.java
+++ b/app/src/main/java/org/vato/carcontroller/Updaters/AbstractUpdater.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller.Updaters;
+package org.vato.carcontroller.Updaters;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
diff --git a/app/src/main/java/com/example/carcontroller/Updaters/ZmqUpdater.java b/app/src/main/java/org/vato/carcontroller/Updaters/ZmqUpdater.java
similarity index 97%
rename from app/src/main/java/com/example/carcontroller/Updaters/ZmqUpdater.java
rename to app/src/main/java/org/vato/carcontroller/Updaters/ZmqUpdater.java
index 6d8748f..67b996f 100644
--- a/app/src/main/java/com/example/carcontroller/Updaters/ZmqUpdater.java
+++ b/app/src/main/java/org/vato/carcontroller/Updaters/ZmqUpdater.java
@@ -1,4 +1,4 @@
-package com.example.carcontroller.Updaters;
+package org.vato.carcontroller.Updaters;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
diff --git a/app/src/main/proto/SlamController.proto b/app/src/main/proto/SlamController.proto
index 4f0cb20..7f7eb4d 100644
--- a/app/src/main/proto/SlamController.proto
+++ b/app/src/main/proto/SlamController.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "com.example.carcontroller";
+option java_package = "org.vato.carcontroller";
 option java_outer_classname = "SlamControllerProto";
 
 import "empty.proto";
diff --git a/app/src/main/proto/empty.proto b/app/src/main/proto/empty.proto
index 03b5916..b69a8a3 100644
--- a/app/src/main/proto/empty.proto
+++ b/app/src/main/proto/empty.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "com.example.carcontroller";
+option java_package = "org.vato.carcontroller";
 option java_outer_classname = "EmptyProto";
 
 message Empty{
diff --git a/app/src/main/proto/lidar_tracker.proto b/app/src/main/proto/lidar_tracker.proto
index 3ef8a6c..e39c16d 100644
--- a/app/src/main/proto/lidar_tracker.proto
+++ b/app/src/main/proto/lidar_tracker.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package persontracking;
 
 option java_multiple_files = true;
-option java_package = "com.example.carcontroller";
+option java_package = "org.vato.carcontroller";
 option java_outer_classname = "PersonTrackingProto";
 
 import "empty.proto";
diff --git a/app/src/main/proto/motorService.proto b/app/src/main/proto/motorService.proto
index 121d6f5..87b2372 100644
--- a/app/src/main/proto/motorService.proto
+++ b/app/src/main/proto/motorService.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 package MotorControl;
 
 option java_multiple_files = true;
-option java_package = "com.example.carcontroller";
+option java_package = "org.vato.carcontroller";
 option java_outer_classname = "MotorServiceProto";
 
 message ThrottleRequest{