6 files changed, 10 insertions, 7 deletions
diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml
index 9d87f5e..92847cc 100644
--- a/same-android/AndroidManifest.xml
+++ b/same-android/AndroidManifest.xml
@@ -18,9 +18,9 @@
             </intent-filter>
         </activity>
         
-        <activity android:name=".SameControllerActivity"/>
+        <activity android:name=".same.SameControllerActivity"/>
 
-        <service android:name=".SameService" />
+        <service android:name=".same.SameService" />
     </application>
 
 </manifest>
 \ No newline at end of file
diff --git a/same-android/src/main/java/com/orbekk/GameController.java b/same-android/src/main/java/com/orbekk/same/GameController.java
index 28d5465..144d6af 100644
--- a/same-android/src/main/java/com/orbekk/GameController.java
+++ b/same-android/src/main/java/com/orbekk/same/GameController.java
@@ -1,4 +1,4 @@
-package com.orbekk;
+package com.orbekk.same;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/same-android/src/main/java/com/orbekk/GameView.java b/same-android/src/main/java/com/orbekk/same/GameView.java
index 4c4c8a8..b8463d2 100644
--- a/same-android/src/main/java/com/orbekk/GameView.java
+++ b/same-android/src/main/java/com/orbekk/same/GameView.java
@@ -1,4 +1,4 @@
-package com.orbekk;
+package com.orbekk.same;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/same-android/src/main/java/com/orbekk/MainActivity.java b/same-android/src/main/java/com/orbekk/same/MainActivity.java
index 80c4f6e..49053c8 100644
--- a/same-android/src/main/java/com/orbekk/MainActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/MainActivity.java
@@ -1,4 +1,6 @@
-package com.orbekk;
+package com.orbekk.same;
+
+import com.orbekk.R;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java
index a6d6e75..e6bf257 100644
--- a/same-android/src/main/java/com/orbekk/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java
@@ -1,10 +1,11 @@
-package com.orbekk;
+package com.orbekk.same;
 
 import java.util.ArrayList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.orbekk.R;
 import com.orbekk.same.android.net.Broadcaster;
 
 import android.app.Activity;
diff --git a/same-android/src/main/java/com/orbekk/SameService.java b/same-android/src/main/java/com/orbekk/same/SameService.java
index d6cd089..f4cf3e2 100644
--- a/same-android/src/main/java/com/orbekk/SameService.java
+++ b/same-android/src/main/java/com/orbekk/same/SameService.java
@@ -1,4 +1,4 @@
-package com.orbekk;
+package com.orbekk.same;
 
 import java.util.ArrayList;
 import java.util.Properties;