diff --git a/LineageActions/AndroidManifest.xml b/LineageActions/AndroidManifest.xml
index 77fd28e..c9bf8fc 100644
--- a/LineageActions/AndroidManifest.xml
+++ b/LineageActions/AndroidManifest.xml
@@ -51,7 +51,7 @@
         </service>
 
 	<service
-            android:name="com.moto.actions.dirac.DiracTileService"
+            android:name="org.lineageos.settings.dirac.DiracTileService"
             android:icon="@drawable/dirac_qs_tile_icon"
             android:label="@string/dirac_qs_tile_title"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
diff --git a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java b/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
index c541e7f..39c4792 100644
--- a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
+++ b/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
@@ -32,7 +32,7 @@ import lineageos.providers.LineageSettings;
 import org.lineageos.settings.device.util.FileUtils;
 import org.lineageos.settings.device.actions.Constants;
 import org.lineageos.settings.device.ServiceWrapper.LocalBinder;
-import org.lineageos.settings.device.dirac.DiracUtils;
+import org.lineageos.settings.dirac.DiracUtils;
 
 public class BootCompletedReceiver extends BroadcastReceiver {
     static final String TAG = "LineageActions";
diff --git a/LineageActions/src/org/lineageos/settings/device/ShitPanelSettings.java b/LineageActions/src/org/lineageos/settings/device/ShitPanelSettings.java
index 8e0d6ea..e0a1ffe 100644
--- a/LineageActions/src/org/lineageos/settings/device/ShitPanelSettings.java
+++ b/LineageActions/src/org/lineageos/settings/device/ShitPanelSettings.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.lineageos.settings;
+package org.lineageos.settings.device;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -44,7 +44,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.util.Log;
 
-import org.lineageos.settings.R;
+import org.lineageos.settings.device.R;
 
 public class ShitPanelSettings extends PreferenceActivity implements
                                   Preference.OnPreferenceChangeListener {
diff --git a/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java
index 5e7be88..14d466a 100644
--- a/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java
+++ b/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java
@@ -37,7 +37,7 @@ import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import org.lineageos.settings.R;
+import org.lineageos.settings.device.R;
 
 public class DiracSettingsFragment extends PreferenceFragment implements
         OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
diff --git a/LineageActions/src/org/lineageos/settings/device/dirac/DiracTileService.java b/LineageActions/src/org/lineageos/settings/device/dirac/DiracTileService.java
index b6f6344..dd2aa2e 100644
--- a/LineageActions/src/org/lineageos/settings/device/dirac/DiracTileService.java
+++ b/LineageActions/src/org/lineageos/settings/device/dirac/DiracTileService.java
@@ -1,4 +1,4 @@
-package com.moto.actions.dirac;
+package org.lineageos.settings.dirac;
 
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;