diff --git a/BluetoothLESpam/.gitignore b/.gitignore
similarity index 100%
rename from BluetoothLESpam/.gitignore
rename to .gitignore
diff --git a/BluetoothLESpam/.idea/.gitignore b/.idea/.gitignore
similarity index 100%
rename from BluetoothLESpam/.idea/.gitignore
rename to .idea/.gitignore
diff --git a/BluetoothLESpam/.idea/.name b/.idea/.name
similarity index 100%
rename from BluetoothLESpam/.idea/.name
rename to .idea/.name
diff --git a/BluetoothLESpam/.idea/compiler.xml b/.idea/compiler.xml
similarity index 100%
rename from BluetoothLESpam/.idea/compiler.xml
rename to .idea/compiler.xml
diff --git a/BluetoothLESpam/.idea/gradle.xml b/.idea/gradle.xml
similarity index 90%
rename from BluetoothLESpam/.idea/gradle.xml
rename to .idea/gradle.xml
index ae388c2a..6d890505 100644
--- a/BluetoothLESpam/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/BluetoothLESpam/.idea/kotlinc.xml b/.idea/kotlinc.xml
similarity index 100%
rename from BluetoothLESpam/.idea/kotlinc.xml
rename to .idea/kotlinc.xml
diff --git a/BluetoothLESpam/.idea/misc.xml b/.idea/misc.xml
similarity index 91%
rename from BluetoothLESpam/.idea/misc.xml
rename to .idea/misc.xml
index 8978d23d..0ad17cbd 100644
--- a/BluetoothLESpam/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/BluetoothLESpam/.idea/codeStyles/Project.xml b/BluetoothLESpam/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783a..00000000
--- a/BluetoothLESpam/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/BluetoothLESpam/.idea/codeStyles/codeStyleConfig.xml b/BluetoothLESpam/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c..00000000
--- a/BluetoothLESpam/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/BluetoothLESpam/.idea/vcs.xml b/BluetoothLESpam/.idea/vcs.xml
deleted file mode 100644
index 6c0b8635..00000000
--- a/BluetoothLESpam/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/.idea/.gitignore b/BluetoothLESpam/app/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/BluetoothLESpam/app/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/BluetoothLESpam/app/.idea/gradle.xml b/BluetoothLESpam/app/.idea/gradle.xml
deleted file mode 100644
index de8896e2..00000000
--- a/BluetoothLESpam/app/.idea/gradle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/.idea/misc.xml b/BluetoothLESpam/app/.idea/misc.xml
deleted file mode 100644
index 452c9775..00000000
--- a/BluetoothLESpam/app/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/.idea/vcs.xml b/BluetoothLESpam/app/.idea/vcs.xml
deleted file mode 100644
index 6c0b8635..00000000
--- a/BluetoothLESpam/app/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/Services/BleService.kt b/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/Services/BleService.kt
deleted file mode 100644
index 6565f664..00000000
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/Services/BleService.kt
+++ /dev/null
@@ -1,329 +0,0 @@
-package de.simonkelmann.bluetoothlespam.Services
-
-import android.Manifest
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothManager
-import android.bluetooth.le.AdvertiseCallback
-import android.bluetooth.le.AdvertiseData
-import android.bluetooth.le.AdvertiseSettings
-import android.bluetooth.le.AdvertisingSet
-import android.bluetooth.le.AdvertisingSetCallback
-import android.bluetooth.le.AdvertisingSetParameters
-import android.bluetooth.le.BluetoothLeAdvertiser
-import android.bluetooth.le.PeriodicAdvertisingParameters
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.ParcelUuid
-import android.util.Log
-import android.widget.Toast
-import androidx.annotation.RequiresApi
-import androidx.core.app.ActivityCompat
-import de.simonkelmann.bluetoothlespam.AppContext.AppContext
-import de.simonkelmann.bluetoothlespam.PermissionCheck.PermissionCheck
-import java.util.Dictionary
-import java.util.UUID
-
-
-class BleService (_bluetoothAdapter: BluetoothAdapter){
-
-    private val _logTag = "BleService"
-    private val _advertiser: BluetoothLeAdvertiser = _bluetoothAdapter.bluetoothLeAdvertiser
-
-    val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
-    val serviceData = "CD8256".decodeHex()//byteArrayOf("DC".toInt(16).toByte(), 0xE9, 0xEA)
-
-
-    /*
-
-    {0xCD8256, "Bose NC 700"},
-    {0xF52494, "JBL Buds Pro"},
-    {0x718FA4, "JBL Live 300TWS"},
-    {0x821F66, "JBL Flip 6"},
-    {0x92BBBD, "Pixel Buds"},
-    {0xD446A7, "Sony XM5"},
-    {0x2D7A23, "Sony WF-1000XM4"},
-    {0x0E30C3, "Razer Hammerhead TWS"},
-    {0x72EF8D, "Razer Hammerhead TWS X"},
-    {0x72FB00, "Soundcore Spirit Pro GVA"},
-   
-    */
-
-    var manufacturerId = 0x009E// 0xFE21 => 65057 => BOSE
-    var manufacturerSpecificData:ByteArray = byteArrayOf() //byteArrayOf(0x1e, 0xff.toByte(), 0x4c, 0x00, 0x07, 0x19, 0x07, 0x02, 0x20, 0x75, 0xaa.toByte(), 0x30, 0x01, 0x00, 0x00, 0x45, 0x12, 0x12, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-
-    init {
-        if(_bluetoothAdapter == null){
-            Log.e(_logTag, "Adapter is null")
-        }
-
-        if(_advertiser == null){
-            Log.e(_logTag, "Advertiser is null")
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun startAdvertising(){
-
-        val parameters = AdvertisingSetParameters.Builder()
-            .setLegacyMode(true)
-            //.setConnectable(true)
-            //.setScannable(true)
-            .setInterval(AdvertisingSetParameters.INTERVAL_HIGH)
-            .setTxPowerLevel(AdvertisingSetParameters.TX_POWER_HIGH)
-            //.setPrimaryPhy(BluetoothDevice.PHY_LE_CODED)
-            //.setSecondaryPhy(BluetoothDevice.PHY_LE_2M)
-            .build()
-
-        val advertiseData: AdvertiseData = AdvertiseData.Builder()
-            .setIncludeDeviceName(false)
-            .addServiceUuid(serviceUuid)
-            .addServiceData(serviceUuid, serviceData)
-            //.addManufacturerData(manufacturerId, serviceData)
-            //.addManufacturerData(manufacturerId, manufacturerSpecificData)
-            .setIncludeTxPowerLevel(true)
-            .build()
-
-        val periodicParameters: PeriodicAdvertisingParameters = PeriodicAdvertisingParameters.Builder()
-            .setInterval(800)
-            .setIncludeTxPower(true)
-            .build()
-
-        val scanResponse = AdvertiseData.Builder().addServiceUuid(serviceUuid).build()
-
-
-        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
-            _advertiser.startAdvertisingSet(parameters, advertiseData, null, null, null, advertiseSetCallback);
-            Log.d(_logTag, "Executed advertisement Start")
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun stopAdvertising(){
-        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
-            _advertiser.stopAdvertisingSet(advertiseSetCallback)
-            Log.d(_logTag, "Executed advertisement Start")
-        }
-    }
-
-    fun String.decodeHex(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private val advertiseSetCallback = object : AdvertisingSetCallback() {
-        override fun onAdvertisingSetStarted(advertisingSet: AdvertisingSet?, txPower: Int, status: Int) {
-            val context = AppContext.getActivity()
-
-            if (status==AdvertisingSetCallback.ADVERTISE_FAILED_ALREADY_STARTED)
-                Toast.makeText(context, "ADVERTISE_FAILED_ALREADY_STARTED", Toast.LENGTH_SHORT).show();
-            else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED)
-                Toast.makeText(context, "ADVERTISE_FAILED_FEATURE_UNSUPPORTED", Toast.LENGTH_SHORT).show();
-            else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_DATA_TOO_LARGE)
-                Toast.makeText(context, "ADVERTISE_FAILED_DATA_TOO_LARGE", Toast.LENGTH_SHORT).show();
-            else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_INTERNAL_ERROR)
-                Toast.makeText(context, "ADVERTISE_FAILED_INTERNAL_ERROR", Toast.LENGTH_SHORT).show();
-            else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_TOO_MANY_ADVERTISERS)
-                Toast.makeText(context, "ADVERTISE_FAILED_TOO_MANY_ADVERTISERS", Toast.LENGTH_SHORT).show();
-            else if (status==AdvertisingSetCallback.ADVERTISE_SUCCESS)
-                Toast.makeText(context, "ADVERTISE_SUCCESS", Toast.LENGTH_SHORT).show();
-
-            Log.i(_logTag, "onAdvertisingSetStarted(): txPower:" + txPower + " , status: " + status)
-
-            if(advertisingSet != null){
-                if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
-                    //advertisingSet!!.setScanResponseData(AdvertiseData.Builder().addServiceUuid(ParcelUuid(UUID.randomUUID())).build())
-                    Log.d(_logTag,"added scanresponse data")
-                }
-            } else {
-                Log.d(_logTag,"advertising set is null");
-            }
-        }
-
-        override fun onAdvertisingDataSet(advertisingSet: AdvertisingSet, status: Int) {
-            Log.i(_logTag, "onAdvertisingDataSet() :status:$status")
-        }
-
-        override fun onScanResponseDataSet(advertisingSet: AdvertisingSet, status: Int) {
-            Log.i(_logTag, "onScanResponseDataSet(): status:$status")
-        }
-
-        override fun onAdvertisingSetStopped(advertisingSet: AdvertisingSet) {
-            Log.i(_logTag, "onAdvertisingSetStopped():")
-        }
-    }
-
-    private val advertiseCallback = object : AdvertiseCallback() {
-        override fun onStartSuccess(settingsInEffect: AdvertiseSettings) {
-            Log.i(_logTag, "LE Advertise Started.")
-        }
-
-        override fun onStartFailure(errorCode: Int) {
-            Log.w(_logTag, "LE Advertise Failed: $errorCode")
-        }
-    }
-
-
-    /*
-    private var _currentAdvertisingSet:AdvertisingSet? = null
-    private var _macAddress = ""
-    private val _callback: AdvertisingSetCallback = @RequiresApi(Build.VERSION_CODES.O)
-
-    object : AdvertisingSetCallback() {
-        override fun onAdvertisingSetStarted(
-            advertisingSet: AdvertisingSet?,
-            txPower: Int,
-            status: Int
-        ) {
-            Log.i(
-                _logTag, "onAdvertisingSetStarted(): txPower:" + txPower + " , status: " + status
-            )
-
-            _currentAdvertisingSet = advertisingSet
-        }
-
-        override fun onAdvertisingDataSet(advertisingSet: AdvertisingSet, status: Int) {
-            Log.i(_logTag, "onAdvertisingDataSet() :status:$status")
-        }
-
-        override fun onScanResponseDataSet(advertisingSet: AdvertisingSet, status: Int) {
-            Log.i(_logTag, "onScanResponseDataSet(): status:$status")
-        }
-
-        override fun onAdvertisingSetStopped(advertisingSet: AdvertisingSet) {
-            Log.i(_logTag, "onAdvertisingSetStopped():")
-        }
-    }
-
-
-    init {
-        if(_bluetoothAdapter == null){
-            Log.d(_logTag, "Adapter is null !!!")
-        } else {
-            Log.d(_logTag, "Adapter is not null")
-        }
-
-        if(!_bluetoothAdapter.isMultipleAdvertisementSupported){
-            Log.d(_logTag, "isMultipleAdvertisementSupported is false !!!")
-        } else {
-            Log.d(_logTag, "isMultipleAdvertisementSupported is true")
-        }
-
-    }
-
-
-    // apple = 004C => 76
-    /*
-    var manufacturerId = 76
-    var manufacturerSpecificData:ByteArray = byteArrayOf(0x1e,
-        0xff.toByte(), 0x4c, 0x00, 0x07, 0x19, 0x07, 0x02, 0x20, 0x75, 0xaa.toByte(), 0x30, 0x01, 0x00, 0x00, 0x45, 0x12, 0x12, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-    */
-
-    var manufacturerId = 0xFE21 // 0xFE21 => BOSE
-    var manufacturerSpecificData:ByteArray = byteArrayOf() //byteArrayOf(0x1e, 0xff.toByte(), 0x4c, 0x00, 0x07, 0x19, 0x07, 0x02, 0x20, 0x75, 0xaa.toByte(), 0x30, 0x01, 0x00, 0x00, 0x45, 0x12, 0x12, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-
-    val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
-    val serviceData = "DATA".getBytes() //byteArrayOf() //"DCE9EA".decodeHex()//byteArrayOf("DC".toInt(16).toByte(), 0xE9, 0xEA)
-
-    fun String.decodeHex(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun stopAdvertising(){
-        // When done with the advertising:
-        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())) {
-            Log.d(_logTag, "Stopping Advertiser")
-            _advertiser.stopAdvertisingSet(_callback)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun advertise(){
-        Log.d(_logTag, "Calling Function")
-
-        //val advertiser: BluetoothLeAdvertiser = BluetoothAdapter.getDefaultAdapter().bluetoothLeAdvertiser
-
-        /*
-        val parameters = AdvertisingSetParameters.Builder()
-            .setLegacyMode(false) // True by default, but set here as a reminder.
-            .setConnectable(true)
-            //.setScannable(true)
-            .setInterval(AdvertisingSetParameters.INTERVAL_HIGH)
-            .setTxPowerLevel(AdvertisingSetParameters.TX_POWER_HIGH)
-            .build()*/
-
-        val parameters = AdvertisingSetParameters.Builder()
-            .setLegacyMode(true)
-            .setConnectable(true)
-            .setScannable(true)
-            .setInterval(AdvertisingSetParameters.INTERVAL_HIGH)
-            .setTxPowerLevel(AdvertisingSetParameters.TX_POWER_MEDIUM)
-            .setPrimaryPhy(BluetoothDevice.PHY_LE_CODED)
-            .setSecondaryPhy(BluetoothDevice.PHY_LE_2M)
-            .build()
-
-        /*
-        val data = AdvertiseData.Builder()
-            .addServiceUuid(serviceUuid)
-            .addServiceData(serviceUuid, serviceData)
-            .setIncludeDeviceName(true)
-            //.addManufacturerData(manufacturerId, manufacturerSpecificData)
-            .build()*/
-
-        val advertiseData: AdvertiseData = AdvertiseData.Builder()
-            .setIncludeDeviceName(true)
-            .addServiceUuid(serviceUuid)
-            .addServiceData(serviceUuid, serviceData)
-            .build()
-
-        val periodicParameters: PeriodicAdvertisingParameters = PeriodicAdvertisingParameters.Builder()
-            .setInterval(800)
-            .build()
-
-
-        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
-            _advertiser.startAdvertisingSet(parameters, advertiseData, null, periodicParameters, null, _callback);
-        }
-
-        // After onAdvertisingSetStarted callback is called, you can modify the
-        // advertising data and scan response data:
-        // After onAdvertisingSetStarted callback is called, you can modify the
-        // advertising data and scan response data:
-        if(_currentAdvertisingSet != null){
-            _currentAdvertisingSet!!.setAdvertisingData(
-                AdvertiseData.Builder().setIncludeDeviceName(true).setIncludeTxPowerLevel(true).build()
-            )
-        } else {
-            Log.d(_logTag, "CurrentAdvertisingSet not yet initialized 1");
-        }
-
-
-        // Wait for onAdvertisingDataSet callback...
-        // Wait for onAdvertisingDataSet callback...
-        if(_currentAdvertisingSet != null){
-            _currentAdvertisingSet!!.setScanResponseData(
-                AdvertiseData.Builder().addServiceUuid(ParcelUuid(UUID.randomUUID())).build()
-            )
-        } else {
-            Log.d(_logTag, "CurrentAdvertisingSet not yet initialized 2");
-        }
-
-        // Wait for onScanResponseDataSet callback...
-
-        // When done with the advertising:
-        // Wait for onScanResponseDataSet callback...
-
-
-
-    }*/
-}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeFragment.kt b/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeFragment.kt
deleted file mode 100644
index c8a2c224..00000000
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeFragment.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package de.simonkelmann.bluetoothlespam.ui.home
-
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothManager
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.annotation.RequiresApi
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import de.simonkelmann.bluetoothlespam.AppContext.AppContext
-import de.simonkelmann.bluetoothlespam.Services.BleService
-import de.simonkelmann.bluetoothlespam.databinding.FragmentHomeBinding
-
-class HomeFragment : Fragment() {
-
-    private var _binding: FragmentHomeBinding? = null
-    private var _viewModel:HomeViewModel? = null
-    private var _bleService: BleService = BleService(AppContext.getContext().bluetoothAdapter()!!)
-    private val _logTag = "HomeFragment"
-
-    // This property is only valid between onCreateView and
-    // onDestroyView.
-    private val binding get() = _binding!!
-
-    fun Context.bluetoothAdapter(): BluetoothAdapter? =
-        (this.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager).adapter
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View {
-        val homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        _viewModel = homeViewModel
-
-        _binding = FragmentHomeBinding.inflate(inflater, container, false)
-        val root: View = binding.root
-
-        var startBtn: Button = binding.advertiseButton
-        startBtn.setOnClickListener{view ->
-
-            var adapter = AppContext.getContext().bluetoothAdapter()
-            val macAddress = adapter!!.address
-            _viewModel!!.setText("Started Advertising on $macAddress")
-            _bleService.startAdvertising()
-        }
-
-        var stopBtn: Button = binding.stopAdvertiseButton
-        stopBtn.setOnClickListener{view ->
-            _viewModel!!.setText("Stopped Advertising")
-            _bleService.stopAdvertising()
-        }
-
-        val textView: TextView = binding.textHome
-        homeViewModel.text.observe(viewLifecycleOwner) {
-            textView.text = it
-        }
-        return root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/.gitignore b/app/.gitignore
similarity index 100%
rename from BluetoothLESpam/app/.gitignore
rename to app/.gitignore
diff --git a/BluetoothLESpam/app/build.gradle.kts b/app/build.gradle.kts
similarity index 72%
rename from BluetoothLESpam/app/build.gradle.kts
rename to app/build.gradle.kts
index fbdb3865..77160798 100644
--- a/BluetoothLESpam/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    namespace = "de.simonkelmann.bluetoothlespam"
-    compileSdk = 33
+    namespace = "de.simon.dankelmann.bluetoothlespam"
+    compileSdk = 34
 
     defaultConfig {
-        applicationId = "de.simonkelmann.bluetoothlespam"
-        minSdk = 24
+        applicationId = "de.simon.dankelmann.bluetoothlespam"
+        minSdk = 26
         targetSdk = 33
         versionCode = 1
         versionName = "1.0"
@@ -20,7 +20,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     compileOptions {
@@ -39,12 +42,12 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
+    implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
+    implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
diff --git a/BluetoothLESpam/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from BluetoothLESpam/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/BluetoothLESpam/app/src/androidTest/java/de/simonkelmann/bluetoothlespam/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/simon/dankelmann/bluetoothlespam/ExampleInstrumentedTest.kt
similarity index 81%
rename from BluetoothLESpam/app/src/androidTest/java/de/simonkelmann/bluetoothlespam/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/de/simon/dankelmann/bluetoothlespam/ExampleInstrumentedTest.kt
index 661e458a..377bf67a 100644
--- a/BluetoothLESpam/app/src/androidTest/java/de/simonkelmann/bluetoothlespam/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/de/simon/dankelmann/bluetoothlespam/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam
+package de.simon.dankelmann.bluetoothlespam
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("de.simonkelmann.bluetoothlespam", appContext.packageName)
+        assertEquals("de.simon.dankelmann.bluetoothlespam", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 94%
rename from BluetoothLESpam/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
index b041a01f..467edfbc 100644
--- a/BluetoothLESpam/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,10 +17,6 @@
         tools:targetApi="s" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
-    <uses-feature
-        android:name="android.hardware.bluetooth_le"
-        android:required="true" />
-
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/GoogleFastPairAdvertisementSetGenerator.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/GoogleFastPairAdvertisementSetGenerator.kt
new file mode 100644
index 00000000..a4fdc987
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/GoogleFastPairAdvertisementSetGenerator.kt
@@ -0,0 +1,61 @@
+package de.simon.dankelmann.bluetoothlespam.AdvertisementSetGenerators
+
+import android.bluetooth.le.AdvertiseData
+import android.bluetooth.le.AdvertisingSetParameters
+import android.os.ParcelUuid
+import de.simon.dankelmann.bluetoothlespam.Callbacks.GoogleFastPairAdvertisingSetCallback
+import de.simon.dankelmann.bluetoothlespam.Helpers.StringHelpers
+import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSet
+import java.util.UUID
+
+class GoogleFastPairAdvertisementSetGenerator:IAdvertisementSetGenerator{
+
+    val _genuineDeviceIds = mapOf(
+        "CD8256" to "Bose NC 700",
+        "F52494" to "JBL Buds Pro",
+        "718FA4" to "JBL Live 300TWS",
+        "821F66" to "JBL Flip 6",
+        "92BBBD" to "Pixel Buds",
+        "D446A7" to "Sony XM5",
+        "2D7A23" to "Sony WF-1000XM4",
+        "0E30C3" to "Razer Hammerhead TWS",
+        "72EF8D" to "Razer Hammerhead TWS X",
+        "72FB00" to "Soundcore Spirit Pro GVA"
+    )
+
+    val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
+
+    override fun getAdvertisementSets():List<AdvertisementSet> {
+        var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
+
+        _genuineDeviceIds.map {
+
+            val advertisingSetParameters = AdvertisingSetParameters.Builder()
+                .setLegacyMode(true)
+                .setInterval(AdvertisingSetParameters.INTERVAL_HIGH)
+                .setTxPowerLevel(AdvertisingSetParameters.TX_POWER_HIGH)
+                .build()
+
+            val advertiseData: AdvertiseData = AdvertiseData.Builder()
+                .setIncludeDeviceName(false)
+                .addServiceUuid(serviceUuid)
+                .addServiceData(serviceUuid, StringHelpers.decodeHex(it.key))
+                //.addManufacturerData(manufacturerId, serviceData)
+                //.addManufacturerData(manufacturerId, manufacturerSpecificData)
+                .setIncludeTxPowerLevel(true)
+                .build()
+
+            var advertisementSet:AdvertisementSet = AdvertisementSet()
+            advertisementSet.deviceName = it.value
+            advertisementSet.advertiseData = advertiseData
+            advertisementSet.advertisingSetParameters = advertisingSetParameters
+            advertisementSet.callback = GoogleFastPairAdvertisingSetCallback()
+
+            advertisementSets.add(advertisementSet)
+        }
+
+        return advertisementSets.toList()
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/IAdvertisementSetGenerator.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/IAdvertisementSetGenerator.kt
new file mode 100644
index 00000000..42fc15dc
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/IAdvertisementSetGenerator.kt
@@ -0,0 +1,7 @@
+package de.simon.dankelmann.bluetoothlespam.AdvertisementSetGenerators
+
+import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSet
+
+interface IAdvertisementSetGenerator {
+    fun getAdvertisementSets():List<AdvertisementSet>
+}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/AppContext/AppContext.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AppContext/AppContext.kt
similarity index 59%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/AppContext/AppContext.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/AppContext/AppContext.kt
index 96d9dca3..22acd324 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/AppContext/AppContext.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/AppContext/AppContext.kt
@@ -1,6 +1,8 @@
-package de.simonkelmann.bluetoothlespam.AppContext
+package de.simon.dankelmann.bluetoothlespam.AppContext
 
 import android.app.Activity
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothManager
 import android.content.Context
 
 abstract class AppContext {
@@ -9,11 +11,15 @@ abstract class AppContext {
         private lateinit var context: Context
         private lateinit var activity: Activity
 
+        fun Context.bluetoothAdapter(): BluetoothAdapter? =
+            (this.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager).adapter
+
+
         fun setContext(con: Context) {
             context=con
         }
 
-        fun getContext():Context {
+        fun getContext(): Context {
             return context
         }
 
@@ -21,7 +27,7 @@ abstract class AppContext {
             activity=act
         }
 
-        fun getActivity():Activity {
+        fun getActivity(): Activity {
             return activity
         }
 
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Callbacks/GoogleFastPairAdvertisingSetCallback.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Callbacks/GoogleFastPairAdvertisingSetCallback.kt
new file mode 100644
index 00000000..33b5b05d
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Callbacks/GoogleFastPairAdvertisingSetCallback.kt
@@ -0,0 +1,53 @@
+package de.simon.dankelmann.bluetoothlespam.Callbacks
+
+import android.Manifest
+import android.bluetooth.le.AdvertisingSet
+import android.bluetooth.le.AdvertisingSetCallback
+import android.util.Log
+import android.widget.Toast
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.PermissionCheck.PermissionCheck
+
+class GoogleFastPairAdvertisingSetCallback : AdvertisingSetCallback() {
+    private val _logTag = "GoogleFastPairAdvertisingSetCallback"
+
+    override fun onAdvertisingSetStarted(advertisingSet: AdvertisingSet?, txPower: Int, status: Int) {
+        val context = AppContext.getActivity()
+
+        if (status==AdvertisingSetCallback.ADVERTISE_FAILED_ALREADY_STARTED)
+            Toast.makeText(context, "ADVERTISE_FAILED_ALREADY_STARTED", Toast.LENGTH_SHORT).show();
+        else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED)
+            Toast.makeText(context, "ADVERTISE_FAILED_FEATURE_UNSUPPORTED", Toast.LENGTH_SHORT).show();
+        else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_DATA_TOO_LARGE)
+            Toast.makeText(context, "ADVERTISE_FAILED_DATA_TOO_LARGE", Toast.LENGTH_SHORT).show();
+        else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_INTERNAL_ERROR)
+            Toast.makeText(context, "ADVERTISE_FAILED_INTERNAL_ERROR", Toast.LENGTH_SHORT).show();
+        else if (status==AdvertisingSetCallback.ADVERTISE_FAILED_TOO_MANY_ADVERTISERS)
+            Toast.makeText(context, "ADVERTISE_FAILED_TOO_MANY_ADVERTISERS", Toast.LENGTH_SHORT).show();
+        else if (status==AdvertisingSetCallback.ADVERTISE_SUCCESS)
+            Toast.makeText(context, "ADVERTISE_SUCCESS", Toast.LENGTH_SHORT).show();
+
+        Log.i(_logTag, "onAdvertisingSetStarted(): txPower:" + txPower + " , status: " + status)
+
+        if(advertisingSet != null){
+            if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
+                //advertisingSet!!.setScanResponseData(AdvertiseData.Builder().addServiceUuid(ParcelUuid(UUID.randomUUID())).build())
+                Log.d(_logTag,"adverting set is not null")
+            }
+        } else {
+            Log.d(_logTag,"advertising set is null");
+        }
+    }
+
+    override fun onAdvertisingDataSet(advertisingSet: AdvertisingSet, status: Int) {
+        Log.i(_logTag, "onAdvertisingDataSet() :status:$status")
+    }
+
+    override fun onScanResponseDataSet(advertisingSet: AdvertisingSet, status: Int) {
+        Log.i(_logTag, "onScanResponseDataSet(): status:$status")
+    }
+
+    override fun onAdvertisingSetStopped(advertisingSet: AdvertisingSet) {
+        Log.i(_logTag, "onAdvertisingSetStopped():")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Helpers/StringHelpers.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Helpers/StringHelpers.kt
new file mode 100644
index 00000000..1a79113c
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Helpers/StringHelpers.kt
@@ -0,0 +1,15 @@
+package de.simon.dankelmann.bluetoothlespam.Helpers
+
+class StringHelpers {
+
+    companion object {
+        fun decodeHex(string:String): ByteArray {
+            check(string.length % 2 == 0) { "Must have an even length" }
+
+            return string.chunked(2)
+                .map { it.toInt(16).toByte() }
+                .toByteArray()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/MainActivity.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/MainActivity.kt
similarity index 91%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/MainActivity.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/MainActivity.kt
index e92ac0b0..afbe1ddf 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/MainActivity.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/MainActivity.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam
+package de.simon.dankelmann.bluetoothlespam
 
 import android.Manifest
 import android.bluetooth.BluetoothAdapter
@@ -18,20 +18,17 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import de.simonkelmann.bluetoothlespam.AppContext.AppContext
-import de.simonkelmann.bluetoothlespam.PermissionCheck.PermissionCheck
-import de.simonkelmann.bluetoothlespam.databinding.ActivityMainBinding
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.PermissionCheck.PermissionCheck
+import de.simon.dankelmann.bluetoothlespam.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding
-    private val ENABLE_BLUETOOTH_REQUEST_CODE = 1
-    private val RUNTIME_PERMISSION_REQUEST_CODE = 2
-
 
+    private val ENABLE_BLUETOOTH_REQUEST_CODE = 1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,7 +40,6 @@ class MainActivity : AppCompatActivity() {
         // REQUIRE ALL PERMISSIONS
         this.requestAllPermissions()
 
-
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -51,15 +47,18 @@ class MainActivity : AppCompatActivity() {
 
         binding.appBarMain.fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
+                .setAction("Action", null).show()
         }
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
         val navController = findNavController(R.id.nav_host_fragment_content_main)
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
-        appBarConfiguration = AppBarConfiguration(setOf(
-                R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow), drawerLayout)
+        appBarConfiguration = AppBarConfiguration(
+            setOf(
+                R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow
+            ), drawerLayout
+        )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
     }
@@ -73,6 +72,7 @@ class MainActivity : AppCompatActivity() {
         return ContextCompat.checkSelfPermission(this, permissionType) ==
                 PackageManager.PERMISSION_GRANTED
     }
+
     fun Context.hasRequiredRuntimePermissions(): Boolean {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             hasPermission(Manifest.permission.BLUETOOTH_SCAN) &&
@@ -98,17 +98,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.main, menu)
-        return true
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        val navController = findNavController(R.id.nav_host_fragment_content_main)
-        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
-    }
-
     fun requestAllPermissions(){
 
         val allPermissions = arrayOf(
@@ -134,4 +123,15 @@ class MainActivity : AppCompatActivity() {
 
         PermissionCheck.requireAllPermissions(this, allPermissions)
     }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        menuInflater.inflate(R.menu.main, menu)
+        return true
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        val navController = findNavController(R.id.nav_host_fragment_content_main)
+        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Models/AdvertisementSet.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Models/AdvertisementSet.kt
new file mode 100644
index 00000000..6d2e430c
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Models/AdvertisementSet.kt
@@ -0,0 +1,25 @@
+package de.simon.dankelmann.bluetoothlespam.Models
+
+import android.bluetooth.le.AdvertiseData
+import android.bluetooth.le.AdvertisingSetCallback
+import android.bluetooth.le.AdvertisingSetParameters
+import android.bluetooth.le.PeriodicAdvertisingParameters
+
+class AdvertisementSet {
+
+    // BLE Data
+    lateinit var advertisingSetParameters:AdvertisingSetParameters
+    lateinit var advertiseData:AdvertiseData
+    val scanResponse:AdvertiseData? = null
+    var periodicParameters:PeriodicAdvertisingParameters? = null
+    var periodicData:AdvertiseData? = null
+    lateinit var callback:AdvertisingSetCallback
+
+    // Custom Data
+    var deviceName = ""
+
+    fun validate():Boolean{
+        //@todo: implement checks here
+        return true
+    }
+}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt
similarity index 89%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt
index 99c58ce7..794043fe 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/PermissionCheck/PermissionCheck.kt
@@ -1,22 +1,23 @@
-package de.simonkelmann.bluetoothlespam.PermissionCheck
+package de.simon.dankelmann.bluetoothlespam.PermissionCheck
 
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Environment
 import android.util.Log
 import androidx.core.app.ActivityCompat
-import de.simonkelmann.bluetoothlespam.AppContext.AppContext
+import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.checkSelfPermission
-
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
 
 class PermissionCheck (){
     companion object {
         private val _logTag = "PermissionCheck"
         fun checkPermission(permission:String, activity: Activity):Boolean{
             //return true
-            if(checkSelfPermission(AppContext.getContext(), permission) == PackageManager.PERMISSION_GRANTED){
+            if(ContextCompat.checkSelfPermission(
+                    AppContext.getContext(),
+                    permission
+                ) == PackageManager.PERMISSION_GRANTED){
                 Log.d(_logTag, "Permission granted: $permission")
                 return true
             } else {
@@ -46,7 +47,10 @@ class PermissionCheck (){
             var dialogNeeded: MutableList<String> = mutableListOf()
 
             permissions.forEachIndexed { index, permission ->
-                if(checkSelfPermission(AppContext.getContext(), permission) == PackageManager.PERMISSION_GRANTED){
+                if(ContextCompat.checkSelfPermission(
+                        AppContext.getContext(),
+                        permission
+                    ) == PackageManager.PERMISSION_GRANTED){
                     Log.d(_logTag, "Permission granted: $permission")
                 } else {
 
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/AdvertismentLoopService.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/AdvertismentLoopService.kt
new file mode 100644
index 00000000..7044cd4a
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/AdvertismentLoopService.kt
@@ -0,0 +1,77 @@
+package de.simon.dankelmann.bluetoothlespam.Services
+
+import android.os.CountDownTimer
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext.Companion.bluetoothAdapter
+import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSet
+
+class AdvertismentLoopService {
+    private var _logTag = "AdvertismentLoopService"
+    private var _advertising = false
+    private var _bluetoothLeAdvertisementService:BluetoothLeAdvertisementService = BluetoothLeAdvertisementService(AppContext.getContext().bluetoothAdapter()!!)
+    private var _currentIndex = 0
+    private var _advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
+
+
+    val timer = object: CountDownTimer(10000, 1000) {
+        override fun onTick(millisUntilFinished: Long) {
+            // do something
+            advertiseNextPackage()
+        }
+        override fun onFinish() {
+            // do something
+            Log.d(_logTag, "Timer finished")
+            start()
+        }
+    }
+
+
+    fun addAdvertisementSet(advertisementSet: AdvertisementSet){
+        _advertisementSets.add(advertisementSet)
+    }
+
+    fun startAdvertising(){
+        _advertising = true
+        _currentIndex = 0
+        timer.start()
+    }
+
+    fun stopAdvertising(){
+        _advertising = false
+        timer.cancel()
+    }
+
+    fun advertiseNextPackage(){
+        Log.d(_logTag, "Advertising the next Package")
+
+        if(_advertising && _advertisementSets.count() > 0){
+            // stop advertising the current package
+            val currentAdvertisementSet = _advertisementSets.get(_currentIndex)
+            _bluetoothLeAdvertisementService.stopAdvertising(currentAdvertisementSet)
+
+            val maxIndex = _advertisementSets.count() - 1
+            if(_currentIndex < maxIndex){
+                _currentIndex++
+
+            }
+
+            //start the new one
+            val newAdvertisementSet = _advertisementSets.get(_currentIndex)
+            _bluetoothLeAdvertisementService.startAdvertising(currentAdvertisementSet)
+
+            // exectute again with delay
+            /*
+            val mainHandler = Handler(Looper.getMainLooper())
+            mainHandler.post(object : Runnable {
+                override fun run() {
+                    advertiseNextPackage()
+                    mainHandler.postDelayed(this, 1000)
+                }
+            })*/
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/BluetoothLeAdvertisementService.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/BluetoothLeAdvertisementService.kt
new file mode 100644
index 00000000..1114859d
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Services/BluetoothLeAdvertisementService.kt
@@ -0,0 +1,80 @@
+package de.simon.dankelmann.bluetoothlespam.Services
+
+import android.Manifest
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.le.BluetoothLeAdvertiser
+import android.util.Log
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSet
+import de.simon.dankelmann.bluetoothlespam.PermissionCheck.PermissionCheck
+
+class BluetoothLeAdvertisementService (_bluetoothAdapter: BluetoothAdapter) {
+    private val _logTag = "BluetoothLeAdvertisementService"
+    private val _advertiser: BluetoothLeAdvertiser = _bluetoothAdapter.bluetoothLeAdvertiser
+
+    init {
+        if(_bluetoothAdapter == null){
+            Log.e(_logTag, "Adapter is null")
+        }
+
+        if(_advertiser == null){
+            Log.e(_logTag, "Advertiser is null")
+        }
+    }
+
+    fun startAdvertising(advertisementSet: AdvertisementSet){
+        if(advertisementSet.validate()){
+            if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
+                _advertiser.startAdvertisingSet(advertisementSet.advertisingSetParameters, advertisementSet.advertiseData, advertisementSet.scanResponse, advertisementSet.periodicParameters, advertisementSet.periodicData, advertisementSet.callback)
+                Log.d(_logTag, "Executed advertisement Start")
+            } else {
+                Log.d(_logTag, "Missing permission to execute advertisement")
+            }
+        } else {
+            Log.d(_logTag, "Advertisementset could not be validated")
+        }
+
+        /*
+        val parameters = AdvertisingSetParameters.Builder()
+            .setLegacyMode(true)
+            //.setConnectable(true)
+            //.setScannable(true)
+            .setInterval(AdvertisingSetParameters.INTERVAL_HIGH)
+            .setTxPowerLevel(AdvertisingSetParameters.TX_POWER_HIGH)
+            //.setPrimaryPhy(BluetoothDevice.PHY_LE_CODED)
+            //.setSecondaryPhy(BluetoothDevice.PHY_LE_2M)
+            .build()
+
+        val advertiseData: AdvertiseData = AdvertiseData.Builder()
+            .setIncludeDeviceName(false)
+            .addServiceUuid(serviceUuid)
+            .addServiceData(serviceUuid, serviceData)
+            //.addManufacturerData(manufacturerId, serviceData)
+            //.addManufacturerData(manufacturerId, manufacturerSpecificData)
+            .setIncludeTxPowerLevel(true)
+            .build()
+
+        val periodicParameters: PeriodicAdvertisingParameters = PeriodicAdvertisingParameters.Builder()
+            .setInterval(800)
+            .setIncludeTxPower(true)
+            .build()
+
+        val scanResponse = AdvertiseData.Builder().addServiceUuid(serviceUuid).build()
+
+
+        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
+            _advertiser.startAdvertisingSet(parameters, advertiseData, null, null, null, advertiseSetCallback);
+            Log.d(_logTag, "Executed advertisement Start")
+        }*/
+    }
+
+    fun stopAdvertising(advertisementSet: AdvertisementSet){
+        if(PermissionCheck.checkPermission(Manifest.permission.BLUETOOTH_ADVERTISE, AppContext.getActivity())){
+            _advertiser.stopAdvertisingSet(advertisementSet.callback)
+            Log.d(_logTag, "Executed advertisement Stop")
+        } else {
+            Log.d(_logTag, "Missing permission to stop advertisement")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt
similarity index 74%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt
index 0b0c4b31..8cfc2b96 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryFragment.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam.ui.gallery
+package de.simon.dankelmann.bluetoothlespam.ui.gallery
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import de.simonkelmann.bluetoothlespam.databinding.FragmentGalleryBinding
+import de.simon.dankelmann.bluetoothlespam.databinding.FragmentGalleryBinding
 
 class GalleryFragment : Fragment() {
 
@@ -18,12 +18,12 @@ class GalleryFragment : Fragment() {
     private val binding get() = _binding!!
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View {
         val galleryViewModel =
-                ViewModelProvider(this).get(GalleryViewModel::class.java)
+            ViewModelProvider(this).get(GalleryViewModel::class.java)
 
         _binding = FragmentGalleryBinding.inflate(inflater, container, false)
         val root: View = binding.root
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt
similarity index 84%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt
index 22fc5897..25c7886b 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/gallery/GalleryViewModel.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam.ui.gallery
+package de.simon.dankelmann.bluetoothlespam.ui.gallery
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeFragment.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeFragment.kt
new file mode 100644
index 00000000..c6a1c8ac
--- /dev/null
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeFragment.kt
@@ -0,0 +1,84 @@
+package de.simon.dankelmann.bluetoothlespam.ui.home
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import de.simon.dankelmann.bluetoothlespam.AdvertisementSetGenerators.GoogleFastPairAdvertisementSetGenerator
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext.Companion.bluetoothAdapter
+import de.simon.dankelmann.bluetoothlespam.Services.AdvertismentLoopService
+import de.simon.dankelmann.bluetoothlespam.Services.BluetoothLeAdvertisementService
+import de.simon.dankelmann.bluetoothlespam.databinding.FragmentHomeBinding
+
+class HomeFragment : Fragment() {
+
+    private var _binding: FragmentHomeBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+    private var _viewModel:HomeViewModel? = null
+    private var _bluetoothLeAdvertisementService:BluetoothLeAdvertisementService = BluetoothLeAdvertisementService(AppContext.getContext().bluetoothAdapter()!!)
+    private var _googleFastPairAdvertisementSetGenerator:GoogleFastPairAdvertisementSetGenerator = GoogleFastPairAdvertisementSetGenerator()
+    private var _advertisementSets = _googleFastPairAdvertisementSetGenerator.getAdvertisementSets()
+
+    private var _advertismentLoopService: AdvertismentLoopService = AdvertismentLoopService()
+    private val _logTag = "HomeFragment"
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
+        _viewModel = homeViewModel
+
+        _binding = FragmentHomeBinding.inflate(inflater, container, false)
+        val root: View = binding.root
+
+        var startBtn: Button = binding.advertiseButton
+        startBtn.setOnClickListener{view ->
+
+
+            _advertisementSets.map {
+                _advertismentLoopService.addAdvertisementSet(it)
+                //_bluetoothLeAdvertisementService.startAdvertising(it)
+            }
+            _advertismentLoopService.startAdvertising()
+
+            //_bluetoothLeAdvertisementService.startAdvertising(_advertisementSets.get(0))
+
+
+            _viewModel!!.setText("Started Advertising")
+        }
+
+        var stopBtn: Button = binding.stopAdvertiseButton
+        stopBtn.setOnClickListener{view ->
+
+            /*
+            _advertisementSets.map {
+                _bluetoothLeAdvertisementService.stopAdvertising(it)
+            }*/
+
+            _advertismentLoopService.stopAdvertising()
+
+            _viewModel!!.setText("Stopped Advertising")
+        }
+
+        val textView: TextView = binding.textHome
+        homeViewModel.text.observe(viewLifecycleOwner) {
+            textView.text = it
+        }
+        return root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeViewModel.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeViewModel.kt
similarity index 73%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeViewModel.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeViewModel.kt
index ebc42c20..7131aee7 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/home/HomeViewModel.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam.ui.home
+package de.simon.dankelmann.bluetoothlespam.ui.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -6,15 +6,13 @@ import androidx.lifecycle.ViewModel
 
 class HomeViewModel : ViewModel() {
 
-    private var _text = MutableLiveData<String>().apply {
+    private val _text = MutableLiveData<String>().apply {
         value = "This is home Fragment"
     }
 
-
-
-    val text: LiveData<String> = _text
-
     public fun setText(text:String){
         _text.postValue(text)
     }
+
+    val text: LiveData<String> = _text
 }
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt
similarity index 74%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt
index 2a13da1e..93ed03a0 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowFragment.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam.ui.slideshow
+package de.simon.dankelmann.bluetoothlespam.ui.slideshow
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import de.simonkelmann.bluetoothlespam.databinding.FragmentSlideshowBinding
+import de.simon.dankelmann.bluetoothlespam.databinding.FragmentSlideshowBinding
 
 class SlideshowFragment : Fragment() {
 
@@ -18,12 +18,12 @@ class SlideshowFragment : Fragment() {
     private val binding get() = _binding!!
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View {
         val slideshowViewModel =
-                ViewModelProvider(this).get(SlideshowViewModel::class.java)
+            ViewModelProvider(this).get(SlideshowViewModel::class.java)
 
         _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
         val root: View = binding.root
diff --git a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt
similarity index 84%
rename from BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt
rename to app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt
index 2725dced..3d00309c 100644
--- a/BluetoothLESpam/app/src/main/java/de/simonkelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt
+++ b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/slideshow/SlideshowViewModel.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam.ui.slideshow
+package de.simon.dankelmann.bluetoothlespam.ui.slideshow
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/BluetoothLESpam/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/BluetoothLESpam/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/BluetoothLESpam/app/src/main/res/drawable/ic_menu_camera.xml b/app/src/main/res/drawable/ic_menu_camera.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/ic_menu_camera.xml
rename to app/src/main/res/drawable/ic_menu_camera.xml
diff --git a/BluetoothLESpam/app/src/main/res/drawable/ic_menu_gallery.xml b/app/src/main/res/drawable/ic_menu_gallery.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/ic_menu_gallery.xml
rename to app/src/main/res/drawable/ic_menu_gallery.xml
diff --git a/BluetoothLESpam/app/src/main/res/drawable/ic_menu_slideshow.xml b/app/src/main/res/drawable/ic_menu_slideshow.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/ic_menu_slideshow.xml
rename to app/src/main/res/drawable/ic_menu_slideshow.xml
diff --git a/BluetoothLESpam/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/drawable/side_nav_bar.xml
rename to app/src/main/res/drawable/side_nav_bar.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/app_bar_main.xml
rename to app/src/main/res/layout/app_bar_main.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/content_main.xml
rename to app/src/main/res/layout/content_main.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/fragment_gallery.xml
rename to app/src/main/res/layout/fragment_gallery.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
similarity index 85%
rename from BluetoothLESpam/app/src/main/res/layout/fragment_home.xml
rename to app/src/main/res/layout/fragment_home.xml
index e157fa71..125221e8 100644
--- a/BluetoothLESpam/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/text_home"
-        android:text="Status"
+        android:text="Label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -34,6 +34,8 @@
         android:layout_marginEnd="8dp"
         android:textAlignment="center"
         android:textSize="20sp"
-        app:layout_constraintTop_toBottomOf="@+id/stopAdvertiseButton"
-        />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/res/layout/fragment_slideshow.xml b/app/src/main/res/layout/fragment_slideshow.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/fragment_slideshow.xml
rename to app/src/main/res/layout/fragment_slideshow.xml
diff --git a/BluetoothLESpam/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/layout/nav_header_main.xml
rename to app/src/main/res/layout/nav_header_main.xml
diff --git a/BluetoothLESpam/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/menu/activity_main_drawer.xml
rename to app/src/main/res/menu/activity_main_drawer.xml
diff --git a/BluetoothLESpam/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/menu/main.xml
rename to app/src/main/res/menu/main.xml
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/BluetoothLESpam/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/BluetoothLESpam/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
similarity index 74%
rename from BluetoothLESpam/app/src/main/res/navigation/mobile_navigation.xml
rename to app/src/main/res/navigation/mobile_navigation.xml
index e59f8dbf..d3ec20f6 100644
--- a/BluetoothLESpam/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,19 +7,19 @@
 
     <fragment
         android:id="@+id/nav_home"
-        android:name="de.simonkelmann.bluetoothlespam.ui.home.HomeFragment"
+        android:name="de.simon.dankelmann.bluetoothlespam.ui.home.HomeFragment"
         android:label="@string/menu_home"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/nav_gallery"
-        android:name="de.simonkelmann.bluetoothlespam.ui.gallery.GalleryFragment"
+        android:name="de.simon.dankelmann.bluetoothlespam.ui.gallery.GalleryFragment"
         android:label="@string/menu_gallery"
         tools:layout="@layout/fragment_gallery" />
 
     <fragment
         android:id="@+id/nav_slideshow"
-        android:name="de.simonkelmann.bluetoothlespam.ui.slideshow.SlideshowFragment"
+        android:name="de.simon.dankelmann.bluetoothlespam.ui.slideshow.SlideshowFragment"
         android:label="@string/menu_slideshow"
         tools:layout="@layout/fragment_slideshow" />
 </navigation>
\ No newline at end of file
diff --git a/BluetoothLESpam/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values-land/dimens.xml
rename to app/src/main/res/values-land/dimens.xml
diff --git a/BluetoothLESpam/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values-night/themes.xml
rename to app/src/main/res/values-night/themes.xml
diff --git a/BluetoothLESpam/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values-w1240dp/dimens.xml
rename to app/src/main/res/values-w1240dp/dimens.xml
diff --git a/BluetoothLESpam/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values-w600dp/dimens.xml
rename to app/src/main/res/values-w600dp/dimens.xml
diff --git a/BluetoothLESpam/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/BluetoothLESpam/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/BluetoothLESpam/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/BluetoothLESpam/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/values/themes.xml
rename to app/src/main/res/values/themes.xml
diff --git a/BluetoothLESpam/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/xml/backup_rules.xml
rename to app/src/main/res/xml/backup_rules.xml
diff --git a/BluetoothLESpam/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from BluetoothLESpam/app/src/main/res/xml/data_extraction_rules.xml
rename to app/src/main/res/xml/data_extraction_rules.xml
diff --git a/BluetoothLESpam/app/src/test/java/de/simonkelmann/bluetoothlespam/ExampleUnitTest.kt b/app/src/test/java/de/simon/dankelmann/bluetoothlespam/ExampleUnitTest.kt
similarity index 87%
rename from BluetoothLESpam/app/src/test/java/de/simonkelmann/bluetoothlespam/ExampleUnitTest.kt
rename to app/src/test/java/de/simon/dankelmann/bluetoothlespam/ExampleUnitTest.kt
index f532a765..8b3f1805 100644
--- a/BluetoothLESpam/app/src/test/java/de/simonkelmann/bluetoothlespam/ExampleUnitTest.kt
+++ b/app/src/test/java/de/simon/dankelmann/bluetoothlespam/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package de.simonkelmann.bluetoothlespam
+package de.simon.dankelmann.bluetoothlespam
 
 import org.junit.Test
 
diff --git a/BluetoothLESpam/build.gradle.kts b/build.gradle.kts
similarity index 100%
rename from BluetoothLESpam/build.gradle.kts
rename to build.gradle.kts
diff --git a/BluetoothLESpam/gradle.properties b/gradle.properties
similarity index 100%
rename from BluetoothLESpam/gradle.properties
rename to gradle.properties
diff --git a/BluetoothLESpam/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from BluetoothLESpam/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/BluetoothLESpam/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 86%
rename from BluetoothLESpam/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
index 2a0ec353..e544e34e 100644
--- a/BluetoothLESpam/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Fri Oct 20 11:38:20 CEST 2023
+#Sun Oct 22 07:01:37 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
diff --git a/BluetoothLESpam/gradlew b/gradlew
similarity index 100%
rename from BluetoothLESpam/gradlew
rename to gradlew
diff --git a/BluetoothLESpam/gradlew.bat b/gradlew.bat
similarity index 100%
rename from BluetoothLESpam/gradlew.bat
rename to gradlew.bat
diff --git a/BluetoothLESpam/settings.gradle.kts b/settings.gradle.kts
similarity index 100%
rename from BluetoothLESpam/settings.gradle.kts
rename to settings.gradle.kts