diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e406c2..8730788 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         android:theme="@style/Theme.AppCompat.Light"
         tools:targetApi="31">
         <activity
-            android:name=".BleScannerActivity"
+            android:name=".devicescanner.BleScannerActivity"
             android:exported="false" />
         <activity
             android:name=".MainActivity"
@@ -39,7 +39,7 @@
         </activity>
 
         <service
-            android:name=".MyCameraLinkService"
+            android:name=".cameralink.MyCameraLinkService"
             android:exported="false"
             android:foregroundServiceType="location|connectedDevice" />
     </application>
diff --git a/app/src/main/java/com.alphasync/MainActivity.kt b/app/src/main/java/com.alphasync/MainActivity.kt
index e16b6ee..1312e19 100644
--- a/app/src/main/java/com.alphasync/MainActivity.kt
+++ b/app/src/main/java/com.alphasync/MainActivity.kt
@@ -18,6 +18,8 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.alphasync.cameralink.MyCameraLinkService
+import com.alphasync.devicescanner.BleScannerActivity
 
 class MainActivity : AppCompatActivity() {
     private val logTag: String = "MainActivity"
diff --git a/app/src/main/java/com.alphasync/ConnectionEventListener.kt b/app/src/main/java/com.alphasync/bluetooth/ConnectionEventListener.kt
similarity index 92%
rename from app/src/main/java/com.alphasync/ConnectionEventListener.kt
rename to app/src/main/java/com.alphasync/bluetooth/ConnectionEventListener.kt
index b1cb5a5..80dc66d 100644
--- a/app/src/main/java/com.alphasync/ConnectionEventListener.kt
+++ b/app/src/main/java/com.alphasync/bluetooth/ConnectionEventListener.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.bluetooth
 
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
diff --git a/app/src/main/java/com.alphasync/ConnectionManager.kt b/app/src/main/java/com.alphasync/bluetooth/ConnectionManager.kt
similarity index 99%
rename from app/src/main/java/com.alphasync/ConnectionManager.kt
rename to app/src/main/java/com.alphasync/bluetooth/ConnectionManager.kt
index 356031e..7938187 100644
--- a/app/src/main/java/com.alphasync/ConnectionManager.kt
+++ b/app/src/main/java/com.alphasync/bluetooth/ConnectionManager.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.bluetooth
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
diff --git a/app/src/main/java/com.alphasync/MyCameraLinkEventListener.kt b/app/src/main/java/com.alphasync/cameralink/MyCameraLinkEventListener.kt
similarity index 84%
rename from app/src/main/java/com.alphasync/MyCameraLinkEventListener.kt
rename to app/src/main/java/com.alphasync/cameralink/MyCameraLinkEventListener.kt
index 8a22b1c..6d8c504 100644
--- a/app/src/main/java/com.alphasync/MyCameraLinkEventListener.kt
+++ b/app/src/main/java/com.alphasync/cameralink/MyCameraLinkEventListener.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.cameralink
 
 class MyCameraLinkEventListener {
     var onGpsSignalLost: (() -> Unit)? = null
diff --git a/app/src/main/java/com.alphasync/MyCameraLinkService.kt b/app/src/main/java/com.alphasync/cameralink/MyCameraLinkService.kt
similarity index 97%
rename from app/src/main/java/com.alphasync/MyCameraLinkService.kt
rename to app/src/main/java/com.alphasync/cameralink/MyCameraLinkService.kt
index cb482b6..4a14bbf 100644
--- a/app/src/main/java/com.alphasync/MyCameraLinkService.kt
+++ b/app/src/main/java/com.alphasync/cameralink/MyCameraLinkService.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.cameralink
 
 import android.annotation.SuppressLint
 import android.app.NotificationChannel
@@ -15,6 +15,10 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.ServiceCompat
+import com.alphasync.bluetooth.ConnectionEventListener
+import com.alphasync.R
+import com.alphasync.sonycommand.SonyCommandGenerator
+import com.alphasync.bluetooth.ConnectionManager
 import java.util.Locale
 
 @SuppressLint("MissingPermission")
diff --git a/app/src/main/java/com.alphasync/BleDeviceListAdapter.kt b/app/src/main/java/com.alphasync/devicescanner/BleDeviceListAdapter.kt
similarity index 96%
rename from app/src/main/java/com.alphasync/BleDeviceListAdapter.kt
rename to app/src/main/java/com.alphasync/devicescanner/BleDeviceListAdapter.kt
index fec59f7..6c318cc 100644
--- a/app/src/main/java/com.alphasync/BleDeviceListAdapter.kt
+++ b/app/src/main/java/com.alphasync/devicescanner/BleDeviceListAdapter.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.devicescanner
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothDevice
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.alphasync.R
 
 class BleDeviceListAdapter(
     private val context: Context,
diff --git a/app/src/main/java/com.alphasync/BleScannerActivity.kt b/app/src/main/java/com.alphasync/devicescanner/BleScannerActivity.kt
similarity index 97%
rename from app/src/main/java/com.alphasync/BleScannerActivity.kt
rename to app/src/main/java/com.alphasync/devicescanner/BleScannerActivity.kt
index c7f758d..6908d2f 100644
--- a/app/src/main/java/com.alphasync/BleScannerActivity.kt
+++ b/app/src/main/java/com.alphasync/devicescanner/BleScannerActivity.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.devicescanner
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
@@ -10,6 +10,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.alphasync.R
 
 
 @SuppressLint("MissingPermission")
diff --git a/app/src/main/java/com.alphasync/SonyCommandGenerator.kt b/app/src/main/java/com.alphasync/sonycommand/SonyCommandGenerator.kt
similarity index 96%
rename from app/src/main/java/com.alphasync/SonyCommandGenerator.kt
rename to app/src/main/java/com.alphasync/sonycommand/SonyCommandGenerator.kt
index 0783c8a..d75b644 100644
--- a/app/src/main/java/com.alphasync/SonyCommandGenerator.kt
+++ b/app/src/main/java/com.alphasync/sonycommand/SonyCommandGenerator.kt
@@ -1,14 +1,11 @@
-package com.alphasync
+package com.alphasync.sonycommand
 
 import android.annotation.SuppressLint
-import android.bluetooth.BluetoothGattCharacteristic
 import android.content.Context
 import android.location.Location
 import android.os.HandlerThread
-import android.os.Looper
 import android.util.Log
-import android.widget.Toast
-import com.google.android.gms.location.CurrentLocationRequest
+import com.alphasync.cameralink.MyCameraLinkEventListener
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.Granularity
 import com.google.android.gms.location.LocationAvailability
@@ -17,7 +14,6 @@ import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
-import com.google.android.gms.tasks.CancellationTokenSource
 import java.lang.Exception
 import java.lang.ref.WeakReference
 import java.nio.ByteBuffer
diff --git a/app/src/main/res/layout/activity_ble_scanner.xml b/app/src/main/res/layout/activity_ble_scanner.xml
index 175d6d3..4b99d13 100644
--- a/app/src/main/res/layout/activity_ble_scanner.xml
+++ b/app/src/main/res/layout/activity_ble_scanner.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".BleScannerActivity">
+    tools:context=".devicescanner.BleScannerActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/bleDeviceRecyclerView"