diff --git a/AospPanel/Android.bp b/AospPanel/Android.bp
index 7533a03..ba3da0b 100644
--- a/AospPanel/Android.bp
+++ b/AospPanel/Android.bp
@@ -3,7 +3,7 @@ android_app {
     name: "AospPanel",
 
     static_libs: [
-        "ResMini",
+        "VolumePluginCommon",
     ],
 
     resource_dirs: ["res"],
diff --git a/AospPanel/res/layout/volume_dialog_aosp.xml b/AospPanel/res/layout/volume_dialog_aosp.xml
index 13483b3..5fa63d4 100644
--- a/AospPanel/res/layout/volume_dialog_aosp.xml
+++ b/AospPanel/res/layout/volume_dialog_aosp.xml
@@ -46,7 +46,7 @@
             android:translationZ="@dimen/volume_dialog_elevation"
             android:clipToPadding="false"
             android:background="@drawable/rounded_bg_full">
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                 android:id="@+id/ringer_icon"
                 style="@style/VolumeButtons"
                 android:background="@drawable/rounded_ripple"
@@ -94,7 +94,7 @@
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
                 android:background="@drawable/rounded_bg_bottom_background">
-                <co.potatoproject.systemui.resmini.ExpandableIndicator
+                <co.potatoproject.plugin.volume.common.ExpandableIndicator
                     android:id="@+id/expandable_indicator"
                     android:layout_width="@dimen/volume_dialog_tap_target_size"
                     android:layout_height="@dimen/volume_dialog_tap_target_size"
@@ -111,7 +111,7 @@
                     android:padding="16dp"
                     android:rotation="90" />
                     
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/media_output"
                     android:src="@drawable/ic_bluetooth_audio"
                     android:layout_width="@dimen/volume_dialog_tap_target_size"
@@ -138,7 +138,7 @@
             android:clipToPadding="false"
             android:translationZ="@dimen/volume_dialog_elevation"
             android:background="@drawable/rounded_bg_full">
-            <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+            <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                 android:id="@+id/odi_captions_icon"
                 android:src="@drawable/ic_volume_odi_captions_disabled"
                 style="@style/VolumeButtons"
diff --git a/AospPanel/res/layout/volume_dialog_aosp_row.xml b/AospPanel/res/layout/volume_dialog_aosp_row.xml
index fe1c7b3..e6101ce 100644
--- a/AospPanel/res/layout/volume_dialog_aosp_row.xml
+++ b/AospPanel/res/layout/volume_dialog_aosp_row.xml
@@ -55,7 +55,7 @@
                 android:rotation="-90" />
         </FrameLayout>
 
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_tap_target_size"
diff --git a/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java b/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java
index 0e1e54c..5c90596 100644
--- a/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java
+++ b/AospPanel/src/co/potatoproject/plugin/volume/aosp/VolumeDialogImpl.java
@@ -31,7 +31,7 @@
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -94,7 +94,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
 import co.potatoproject.plugin.volume.aosp.R;
 
diff --git a/TogglePanel/Android.bp b/CompactPanel/Android.bp
similarity index 72%
rename from TogglePanel/Android.bp
rename to CompactPanel/Android.bp
index 3a7dc80..9b11fca 100644
--- a/TogglePanel/Android.bp
+++ b/CompactPanel/Android.bp
@@ -1,8 +1,8 @@
 android_app {
 
-    name: "TogglePanel",
+    name: "CompactPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 
diff --git a/TogglePanel/AndroidManifest.xml b/CompactPanel/AndroidManifest.xml
similarity index 96%
rename from TogglePanel/AndroidManifest.xml
rename to CompactPanel/AndroidManifest.xml
index 848b03c..615df3d 100644
--- a/TogglePanel/AndroidManifest.xml
+++ b/CompactPanel/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="co.potatoproject.plugin.volume.toggle">
+    package="co.potatoproject.plugin.volume.compact">
 
     <uses-permission android:name="com.android.systemui.permission.PLUGIN" />
 
@@ -32,7 +32,7 @@
 
         <provider
             android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
-            android:authorities="co.potatoproject.plugin.volume.toggle"
+            android:authorities="co.potatoproject.plugin.volume.compact"
             tools:replace="android:authorities"
             android:exported="false"
             android:multiprocess="true" />
diff --git a/FancyPanel/res/drawable/ic_bluetooth_audio.xml b/CompactPanel/res/drawable/ic_bluetooth_audio.xml
similarity index 100%
rename from FancyPanel/res/drawable/ic_bluetooth_audio.xml
rename to CompactPanel/res/drawable/ic_bluetooth_audio.xml
diff --git a/FancyPanel/res/drawable/ic_tune_black.xml b/CompactPanel/res/drawable/ic_tune_black.xml
similarity index 100%
rename from FancyPanel/res/drawable/ic_tune_black.xml
rename to CompactPanel/res/drawable/ic_tune_black.xml
diff --git a/FancyPanel/res/drawable/seekbar_thumb_material_anim.xml b/CompactPanel/res/drawable/seekbar_thumb_material_anim.xml
similarity index 100%
rename from FancyPanel/res/drawable/seekbar_thumb_material_anim.xml
rename to CompactPanel/res/drawable/seekbar_thumb_material_anim.xml
diff --git a/FancyPanel/res/layout/volume_dialog_fancy.xml b/CompactPanel/res/layout/volume_dialog_compact.xml
similarity index 96%
rename from FancyPanel/res/layout/volume_dialog_fancy.xml
rename to CompactPanel/res/layout/volume_dialog_compact.xml
index d5c6530..f9f5e14 100644
--- a/FancyPanel/res/layout/volume_dialog_fancy.xml
+++ b/CompactPanel/res/layout/volume_dialog_compact.xml
@@ -104,7 +104,7 @@
                     android:layout_width="@dimen/volume_dialog_caption_size"
                     android:layout_height="@dimen/volume_dialog_caption_size"
                     android:clipToPadding="false">
-                    <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+                    <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                         android:id="@+id/odi_captions_icon"
                         android:src="@drawable/ic_volume_odi_captions_disabled"
                         style="@style/VolumeButtons"
@@ -122,7 +122,7 @@
                     android:layout_width="@dimen/volume_dialog_caption_size"
                     android:layout_height="@dimen/volume_dialog_caption_size"
                     android:clipToPadding="false">
-                    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                         android:id="@+id/media_output"
                         android:src="@drawable/ic_bluetooth_audio"
                         android:layout_width="match_parent"
@@ -148,7 +148,7 @@
                     android:layout_width="@dimen/volume_dialog_ringer_size"
                     android:layout_height="@dimen/volume_dialog_ringer_size"
                     android:background="@drawable/rounded_bg_full">
-                    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                         android:id="@+id/ringer_icon"
                         style="@style/VolumeButtons"
                         android:background="@drawable/rounded_ripple"
@@ -170,7 +170,7 @@
                     android:id="@+id/expandable_indicator_container"
                     android:layout_width="@dimen/volume_dialog_ringer_size"
                     android:layout_height="@dimen/volume_dialog_ringer_size">
-                    <co.potatoproject.systemui.resmini.ExpandableIndicator
+                    <co.potatoproject.plugin.volume.common.ExpandableIndicator
                         android:id="@+id/expandable_indicator"
                         android:layout_width="@dimen/volume_dialog_tap_target_size"
                         android:layout_height="@dimen/volume_dialog_tap_target_size"
diff --git a/FancyPanel/res/layout/volume_dialog_fancy_row.xml b/CompactPanel/res/layout/volume_dialog_compact_row.xml
similarity index 97%
rename from FancyPanel/res/layout/volume_dialog_fancy_row.xml
rename to CompactPanel/res/layout/volume_dialog_compact_row.xml
index 1cefaf1..2869ace 100644
--- a/FancyPanel/res/layout/volume_dialog_fancy_row.xml
+++ b/CompactPanel/res/layout/volume_dialog_compact_row.xml
@@ -29,7 +29,7 @@
         android:layout_gravity="center"
         android:orientation="vertical"
         android:animateLayoutChanges="true" >
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_panel_mini_width"
diff --git a/FancyPanel/res/values/dimens.xml b/CompactPanel/res/values/dimens.xml
similarity index 100%
rename from FancyPanel/res/values/dimens.xml
rename to CompactPanel/res/values/dimens.xml
diff --git a/TogglePanel/res/values/strings.xml b/CompactPanel/res/values/strings.xml
similarity index 53%
rename from TogglePanel/res/values/strings.xml
rename to CompactPanel/res/values/strings.xml
index c7848c5..150e4c3 100644
--- a/TogglePanel/res/values/strings.xml
+++ b/CompactPanel/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="plugin_label">Toggle panel</string>
+    <string name="plugin_label">Compact panel</string>
 </resources>
\ No newline at end of file
diff --git a/FancyPanel/src/co/potatoproject/plugin/volume/fancy/VolumeDialogImpl.java b/CompactPanel/src/co/potatoproject/plugin/volume/compact/VolumeDialogImpl.java
similarity index 99%
rename from FancyPanel/src/co/potatoproject/plugin/volume/fancy/VolumeDialogImpl.java
rename to CompactPanel/src/co/potatoproject/plugin/volume/compact/VolumeDialogImpl.java
index f7f3e56..62f0010 100644
--- a/FancyPanel/src/co/potatoproject/plugin/volume/fancy/VolumeDialogImpl.java
+++ b/CompactPanel/src/co/potatoproject/plugin/volume/compact/VolumeDialogImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.plugin.volume.fancy;
+package co.potatoproject.plugin.volume.compact;
 
 import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
 import static android.media.AudioManager.RINGER_MODE_NORMAL;
@@ -30,7 +30,7 @@
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -94,9 +94,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
-import co.potatoproject.plugin.volume.fancy.R;
+import co.potatoproject.plugin.volume.compact.R;
 
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.PluginDependency;
@@ -240,7 +240,7 @@ private void initDialog() {
         mWindowParams.type = WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
         mWindowParams.format = PixelFormat.TRANSLUCENT;
         mWindowParams.windowAnimations = -1;
-        mDialog = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_fancy,
+        mDialog = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_compact,
                         (ViewGroup) null, false);
         
         mDialog.setOnTouchListener((v, event) -> {
@@ -495,7 +495,7 @@ private void initRow(final VolumeRow row, final int stream, int iconRes, int ico
         row.iconMuteRes = iconMuteRes;
         row.important = important;
         row.defaultStream = defaultStream;
-        row.view = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_fancy_row, null);
+        row.view = LayoutInflater.from(mContext).inflate(R.layout.volume_dialog_compact_row, null);
         row.view.setId(row.stream);
         row.view.setTag(row);
         row.header = row.view.findViewById(R.id.volume_row_header);
diff --git a/OreoPanel/Android.bp b/OreoPanel/Android.bp
index 2ee97ca..b1af161 100644
--- a/OreoPanel/Android.bp
+++ b/OreoPanel/Android.bp
@@ -2,7 +2,7 @@ android_app {
 
     name: "OreoPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 
diff --git a/OreoPanel/res/layout/volume_dialog_oreo.xml b/OreoPanel/res/layout/volume_dialog_oreo.xml
index da9eaf0..bd08abc 100644
--- a/OreoPanel/res/layout/volume_dialog_oreo.xml
+++ b/OreoPanel/res/layout/volume_dialog_oreo.xml
@@ -52,7 +52,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Volume.Header" />
-        <co.potatoproject.systemui.resmini.ExpandableIndicator
+        <co.potatoproject.plugin.volume.common.ExpandableIndicator
             android:id="@+id/volume_expand_button"
             android:layout_width="@dimen/volume_button_size"
             android:layout_height="@dimen/volume_button_size"
diff --git a/OreoPanel/res/layout/volume_dialog_oreo_row.xml b/OreoPanel/res/layout/volume_dialog_oreo_row.xml
index 11c1ead..8c4b342 100644
--- a/OreoPanel/res/layout/volume_dialog_oreo_row.xml
+++ b/OreoPanel/res/layout/volume_dialog_oreo_row.xml
@@ -33,7 +33,7 @@
             android:layout_height="@dimen/volume_oreo_row_slider_height"
             android:orientation="horizontal"
             android:paddingStart="@dimen/volume_row_padding_start" >
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                 android:id="@+id/volume_row_icon"
                 style="@style/VolumeButtons"
                 android:layout_width="@dimen/volume_button_size"
diff --git a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java
index 6047aa0..8899e22 100644
--- a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java
+++ b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogImpl.java
@@ -73,7 +73,7 @@
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
 import co.potatoproject.plugin.volume.oreo.R;
 
diff --git a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java
index d6c3a25..4e2d235 100644
--- a/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java
+++ b/OreoPanel/src/co/potatoproject/plugin/volume/oreo/VolumeDialogMotion.java
@@ -32,8 +32,8 @@
 import android.view.ViewGroup;
 import android.view.animation.PathInterpolator;
 
-import co.potatoproject.systemui.resmini.D;
-import co.potatoproject.systemui.resmini.Utils;
+import co.potatoproject.plugin.volume.common.D;
+import co.potatoproject.plugin.volume.common.Utils;
 
 public class VolumeDialogMotion {
     private static final String TAG = Utils.logTag(VolumeDialogMotion.class);
diff --git a/FancyPanel/Android.bp b/TiledPanel/Android.bp
similarity index 73%
rename from FancyPanel/Android.bp
rename to TiledPanel/Android.bp
index 3c4ae52..e1fe9e4 100644
--- a/FancyPanel/Android.bp
+++ b/TiledPanel/Android.bp
@@ -1,8 +1,8 @@
 android_app {
 
-    name: "FancyPanel",
+    name: "TiledPanel",
 
-    static_libs: ["ResMini"],
+    static_libs: ["VolumePluginCommon"],
 
     resource_dirs: ["res"],
 
diff --git a/FancyPanel/AndroidManifest.xml b/TiledPanel/AndroidManifest.xml
similarity index 96%
rename from FancyPanel/AndroidManifest.xml
rename to TiledPanel/AndroidManifest.xml
index 6231247..529f97c 100644
--- a/FancyPanel/AndroidManifest.xml
+++ b/TiledPanel/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="co.potatoproject.plugin.volume.fancy">
+    package="co.potatoproject.plugin.volume.tiled">
 
     <uses-permission android:name="com.android.systemui.permission.PLUGIN" />
 
@@ -32,7 +32,7 @@
 
         <provider
             android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
-            android:authorities="co.potatoproject.plugin.volume.fancy"
+            android:authorities="co.potatoproject.plugin.volume.tiled"
             tools:replace="android:authorities"
             android:exported="false"
             android:multiprocess="true" />
diff --git a/TogglePanel/res/drawable/ic_output_switch.xml b/TiledPanel/res/drawable/ic_output_switch.xml
similarity index 100%
rename from TogglePanel/res/drawable/ic_output_switch.xml
rename to TiledPanel/res/drawable/ic_output_switch.xml
diff --git a/TogglePanel/res/drawable/rounded_ripple.xml b/TiledPanel/res/drawable/rounded_ripple.xml
similarity index 100%
rename from TogglePanel/res/drawable/rounded_ripple.xml
rename to TiledPanel/res/drawable/rounded_ripple.xml
diff --git a/TogglePanel/res/drawable/rounded_ripple_selected.xml b/TiledPanel/res/drawable/rounded_ripple_selected.xml
similarity index 100%
rename from TogglePanel/res/drawable/rounded_ripple_selected.xml
rename to TiledPanel/res/drawable/rounded_ripple_selected.xml
diff --git a/TogglePanel/res/layout/volume_dialog_toggle.xml b/TiledPanel/res/layout/volume_dialog_tiled.xml
similarity index 97%
rename from TogglePanel/res/layout/volume_dialog_toggle.xml
rename to TiledPanel/res/layout/volume_dialog_tiled.xml
index 8c42594..b60f743 100644
--- a/TogglePanel/res/layout/volume_dialog_toggle.xml
+++ b/TiledPanel/res/layout/volume_dialog_tiled.xml
@@ -56,7 +56,7 @@
                 android:layout_marginLeft="@dimen/volume_dialog_spacer"
                 android:layout_marginRight="@dimen/volume_dialog_spacer"
                 android:background="@drawable/rounded_bg_full">
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/os_icon"
                     style="@style/VolumeButtons"
                     android:background="@drawable/rounded_ripple"
@@ -78,7 +78,7 @@
                 android:translationZ="@dimen/volume_dialog_elevation"
                 android:clipToPadding="false"
                 android:background="@drawable/rounded_bg_full">
-                <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+                <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
                     android:id="@+id/ringer_icon"
                     style="@style/VolumeButtons"
                     android:background="@drawable/rounded_ripple"
@@ -163,7 +163,7 @@
             android:clipToPadding="false"
             android:translationZ="@dimen/volume_dialog_elevation"
             android:background="@drawable/rounded_bg_full">
-            <co.potatoproject.systemui.resmini.CaptionsToggleImageButton
+            <co.potatoproject.plugin.volume.common.CaptionsToggleImageButton
                 android:id="@+id/odi_captions_icon"
                 android:src="@drawable/ic_volume_odi_captions_disabled"
                 style="@style/VolumeButtons"
diff --git a/TogglePanel/res/layout/volume_dialog_toggle_row.xml b/TiledPanel/res/layout/volume_dialog_tiled_row.xml
similarity index 97%
rename from TogglePanel/res/layout/volume_dialog_toggle_row.xml
rename to TiledPanel/res/layout/volume_dialog_tiled_row.xml
index df593ed..a1feb2a 100644
--- a/TogglePanel/res/layout/volume_dialog_toggle_row.xml
+++ b/TiledPanel/res/layout/volume_dialog_tiled_row.xml
@@ -55,7 +55,7 @@
                 android:rotation="-90" />
         </FrameLayout>
 
-        <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+        <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
             android:id="@+id/volume_row_icon"
             style="@style/VolumeButtons"
             android:layout_width="@dimen/volume_dialog_tap_target_size"
diff --git a/TogglePanel/res/layout/volume_dialog_toggle_stream_button.xml b/TiledPanel/res/layout/volume_dialog_tiled_stream_button.xml
similarity index 95%
rename from TogglePanel/res/layout/volume_dialog_toggle_stream_button.xml
rename to TiledPanel/res/layout/volume_dialog_tiled_stream_button.xml
index c3564ef..f769edb 100644
--- a/TogglePanel/res/layout/volume_dialog_toggle_stream_button.xml
+++ b/TiledPanel/res/layout/volume_dialog_tiled_stream_button.xml
@@ -22,7 +22,7 @@
     android:clipToPadding="false"
     android:theme="@style/qs_theme">
 
-    <co.potatoproject.systemui.resmini.AlphaOptimizedImageButton
+    <co.potatoproject.plugin.volume.common.AlphaOptimizedImageButton
         android:id="@+id/button"
         style="@style/VolumeButtons"
         android:layout_width="@dimen/volume_dialog_ringer_size"
diff --git a/TogglePanel/res/values/dimens.xml b/TiledPanel/res/values/dimens.xml
similarity index 100%
rename from TogglePanel/res/values/dimens.xml
rename to TiledPanel/res/values/dimens.xml
diff --git a/FancyPanel/res/values/strings.xml b/TiledPanel/res/values/strings.xml
similarity index 54%
rename from FancyPanel/res/values/strings.xml
rename to TiledPanel/res/values/strings.xml
index cbf25c5..a73323c 100644
--- a/FancyPanel/res/values/strings.xml
+++ b/TiledPanel/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="plugin_label">Fancy panel</string>
+    <string name="plugin_label">Tiled panel</string>
 </resources>
\ No newline at end of file
diff --git a/TogglePanel/src/co/potatoproject/plugin/volume/toggle/VolumeDialogImpl.java b/TiledPanel/src/co/potatoproject/plugin/volume/tiled/VolumeDialogImpl.java
similarity index 99%
rename from TogglePanel/src/co/potatoproject/plugin/volume/toggle/VolumeDialogImpl.java
rename to TiledPanel/src/co/potatoproject/plugin/volume/tiled/VolumeDialogImpl.java
index 5c4e274..5b54eba 100644
--- a/TogglePanel/src/co/potatoproject/plugin/volume/toggle/VolumeDialogImpl.java
+++ b/TiledPanel/src/co/potatoproject/plugin/volume/tiled/VolumeDialogImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.plugin.volume.toggle;
+package co.potatoproject.plugin.volume.tiled;
 
 import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
 import static android.media.AudioManager.RINGER_MODE_NORMAL;
@@ -31,7 +31,7 @@
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import static co.potatoproject.systemui.resmini.Events.DISMISS_REASON_SETTINGS_CLICKED;
+import static co.potatoproject.plugin.volume.common.Events.DISMISS_REASON_SETTINGS_CLICKED;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -93,9 +93,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import co.potatoproject.systemui.resmini.*;
+import co.potatoproject.plugin.volume.common.*;
 
-import co.potatoproject.plugin.volume.toggle.R;
+import co.potatoproject.plugin.volume.tiled.R;
 
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.PluginDependency;
@@ -249,7 +249,7 @@ private void initDialog() {
         mWindow.setAttributes(lp);
         mWindow.setLayout(WRAP_CONTENT, WRAP_CONTENT);
 
-        mDialog.setContentView(R.layout.volume_dialog_toggle);
+        mDialog.setContentView(R.layout.volume_dialog_tiled);
         mDialogView = mDialog.findViewById(R.id.volume_dialog);
         mDialogView.setAlpha(0);
         mDialog.setCanceledOnTouchOutside(true);
@@ -516,7 +516,7 @@ private void initRow(final VolumeRow row, final int stream, int iconRes, int ico
         row.iconMuteRes = iconMuteRes;
         row.important = important;
         row.defaultStream = defaultStream;
-        row.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_toggle_row, null);
+        row.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_tiled_row, null);
         row.view.setId(row.stream);
         row.view.setTag(row);
         row.header = row.view.findViewById(R.id.volume_row_header);
@@ -607,7 +607,7 @@ private void initStreamButton(final StreamSwitchButton button, final VolumeRow r
         button.iconRes = iconRes;
         button.iconMuteRes = iconMuteRes;
 
-        button.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_toggle_stream_button, null);
+        button.view = mDialog.getLayoutInflater().inflate(R.layout.volume_dialog_tiled_stream_button, null);
         button.view.setId(stream);
         button.view.setTag(button);
 
diff --git a/ResMini/Android.bp b/VolumePluginCommon/Android.bp
similarity index 89%
rename from ResMini/Android.bp
rename to VolumePluginCommon/Android.bp
index 9328a9b..dfc75be 100644
--- a/ResMini/Android.bp
+++ b/VolumePluginCommon/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "ResMini",
+    name: "VolumePluginCommon",
     static_libs: [
         "SystemUIPluginLib",
         "androidx.appcompat_appcompat",
diff --git a/ResMini/AndroidManifest.xml b/VolumePluginCommon/AndroidManifest.xml
similarity index 91%
rename from ResMini/AndroidManifest.xml
rename to VolumePluginCommon/AndroidManifest.xml
index fb316c5..4f5c955 100644
--- a/ResMini/AndroidManifest.xml
+++ b/VolumePluginCommon/AndroidManifest.xml
@@ -16,4 +16,4 @@
  * limitations under the License.
  */
 -->
-<manifest package="co.potatoproject.systemui.resmini" />
+<manifest package="co.potatoproject.plugin.volume.common" />
diff --git a/ResMini/res/color/accent_tint_color_selector.xml b/VolumePluginCommon/res/color/accent_tint_color_selector.xml
similarity index 100%
rename from ResMini/res/color/accent_tint_color_selector.xml
rename to VolumePluginCommon/res/color/accent_tint_color_selector.xml
diff --git a/ResMini/res/color/caption_tint_color_selector.xml b/VolumePluginCommon/res/color/caption_tint_color_selector.xml
similarity index 100%
rename from ResMini/res/color/caption_tint_color_selector.xml
rename to VolumePluginCommon/res/color/caption_tint_color_selector.xml
diff --git a/ResMini/res/drawable/btn_borderless_rect.xml b/VolumePluginCommon/res/drawable/btn_borderless_rect.xml
similarity index 100%
rename from ResMini/res/drawable/btn_borderless_rect.xml
rename to VolumePluginCommon/res/drawable/btn_borderless_rect.xml
diff --git a/ResMini/res/drawable/ic_alarm.xml b/VolumePluginCommon/res/drawable/ic_alarm.xml
similarity index 100%
rename from ResMini/res/drawable/ic_alarm.xml
rename to VolumePluginCommon/res/drawable/ic_alarm.xml
diff --git a/ResMini/res/drawable/ic_arrow_back.xml b/VolumePluginCommon/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from ResMini/res/drawable/ic_arrow_back.xml
rename to VolumePluginCommon/res/drawable/ic_arrow_back.xml
diff --git a/ResMini/res/drawable/ic_remove_no_shadow.xml b/VolumePluginCommon/res/drawable/ic_remove_no_shadow.xml
similarity index 100%
rename from ResMini/res/drawable/ic_remove_no_shadow.xml
rename to VolumePluginCommon/res/drawable/ic_remove_no_shadow.xml
diff --git a/ResMini/res/drawable/ic_volume_accessibility.xml b/VolumePluginCommon/res/drawable/ic_volume_accessibility.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_accessibility.xml
rename to VolumePluginCommon/res/drawable/ic_volume_accessibility.xml
diff --git a/ResMini/res/drawable/ic_volume_alarm.xml b/VolumePluginCommon/res/drawable/ic_volume_alarm.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_alarm.xml
rename to VolumePluginCommon/res/drawable/ic_volume_alarm.xml
diff --git a/ResMini/res/drawable/ic_volume_alarm_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_alarm_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_alarm_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_alarm_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_bt_sco.xml b/VolumePluginCommon/res/drawable/ic_volume_bt_sco.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_bt_sco.xml
rename to VolumePluginCommon/res/drawable/ic_volume_bt_sco.xml
diff --git a/ResMini/res/drawable/ic_volume_collapse_animation.xml b/VolumePluginCommon/res/drawable/ic_volume_collapse_animation.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_collapse_animation.xml
rename to VolumePluginCommon/res/drawable/ic_volume_collapse_animation.xml
diff --git a/ResMini/res/drawable/ic_volume_expand_animation.xml b/VolumePluginCommon/res/drawable/ic_volume_expand_animation.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_expand_animation.xml
rename to VolumePluginCommon/res/drawable/ic_volume_expand_animation.xml
diff --git a/ResMini/res/drawable/ic_volume_media.xml b/VolumePluginCommon/res/drawable/ic_volume_media.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_media.xml
rename to VolumePluginCommon/res/drawable/ic_volume_media.xml
diff --git a/ResMini/res/drawable/ic_volume_media_bt.xml b/VolumePluginCommon/res/drawable/ic_volume_media_bt.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_media_bt.xml
rename to VolumePluginCommon/res/drawable/ic_volume_media_bt.xml
diff --git a/ResMini/res/drawable/ic_volume_media_bt_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_media_bt_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_media_bt_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_media_bt_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_media_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_media_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_media_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_media_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_odi_captions_disabled.xml b/VolumePluginCommon/res/drawable/ic_volume_odi_captions_disabled.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_odi_captions_disabled.xml
rename to VolumePluginCommon/res/drawable/ic_volume_odi_captions_disabled.xml
diff --git a/ResMini/res/drawable/ic_volume_remote.xml b/VolumePluginCommon/res/drawable/ic_volume_remote.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_remote.xml
rename to VolumePluginCommon/res/drawable/ic_volume_remote.xml
diff --git a/ResMini/res/drawable/ic_volume_remote_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_remote_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_remote_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_remote_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_ringer.xml b/VolumePluginCommon/res/drawable/ic_volume_ringer.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_ringer.xml
rename to VolumePluginCommon/res/drawable/ic_volume_ringer.xml
diff --git a/ResMini/res/drawable/ic_volume_ringer_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_ringer_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_ringer_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_ringer_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_ringer_vibrate.xml b/VolumePluginCommon/res/drawable/ic_volume_ringer_vibrate.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_ringer_vibrate.xml
rename to VolumePluginCommon/res/drawable/ic_volume_ringer_vibrate.xml
diff --git a/ResMini/res/drawable/ic_volume_system.xml b/VolumePluginCommon/res/drawable/ic_volume_system.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_system.xml
rename to VolumePluginCommon/res/drawable/ic_volume_system.xml
diff --git a/ResMini/res/drawable/ic_volume_system_mute.xml b/VolumePluginCommon/res/drawable/ic_volume_system_mute.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_system_mute.xml
rename to VolumePluginCommon/res/drawable/ic_volume_system_mute.xml
diff --git a/ResMini/res/drawable/ic_volume_voice.xml b/VolumePluginCommon/res/drawable/ic_volume_voice.xml
similarity index 100%
rename from ResMini/res/drawable/ic_volume_voice.xml
rename to VolumePluginCommon/res/drawable/ic_volume_voice.xml
diff --git a/ResMini/res/drawable/ripple_drawable.xml b/VolumePluginCommon/res/drawable/ripple_drawable.xml
similarity index 100%
rename from ResMini/res/drawable/ripple_drawable.xml
rename to VolumePluginCommon/res/drawable/ripple_drawable.xml
diff --git a/ResMini/res/drawable/ripple_drawable_20dp.xml b/VolumePluginCommon/res/drawable/ripple_drawable_20dp.xml
similarity index 100%
rename from ResMini/res/drawable/ripple_drawable_20dp.xml
rename to VolumePluginCommon/res/drawable/ripple_drawable_20dp.xml
diff --git a/ResMini/res/drawable/rounded_bg_bottom_background.xml b/VolumePluginCommon/res/drawable/rounded_bg_bottom_background.xml
similarity index 100%
rename from ResMini/res/drawable/rounded_bg_bottom_background.xml
rename to VolumePluginCommon/res/drawable/rounded_bg_bottom_background.xml
diff --git a/ResMini/res/drawable/rounded_bg_full.xml b/VolumePluginCommon/res/drawable/rounded_bg_full.xml
similarity index 100%
rename from ResMini/res/drawable/rounded_bg_full.xml
rename to VolumePluginCommon/res/drawable/rounded_bg_full.xml
diff --git a/ResMini/res/drawable/rounded_ripple.xml b/VolumePluginCommon/res/drawable/rounded_ripple.xml
similarity index 100%
rename from ResMini/res/drawable/rounded_ripple.xml
rename to VolumePluginCommon/res/drawable/rounded_ripple.xml
diff --git a/ResMini/res/drawable/volume_tool_tip_rounded_bg.xml b/VolumePluginCommon/res/drawable/volume_tool_tip_rounded_bg.xml
similarity index 100%
rename from ResMini/res/drawable/volume_tool_tip_rounded_bg.xml
rename to VolumePluginCommon/res/drawable/volume_tool_tip_rounded_bg.xml
diff --git a/ResMini/res/layout/volume_dnd_icon.xml b/VolumePluginCommon/res/layout/volume_dnd_icon.xml
similarity index 100%
rename from ResMini/res/layout/volume_dnd_icon.xml
rename to VolumePluginCommon/res/layout/volume_dnd_icon.xml
diff --git a/ResMini/res/layout/volume_tool_tip_view.xml b/VolumePluginCommon/res/layout/volume_tool_tip_view.xml
similarity index 100%
rename from ResMini/res/layout/volume_tool_tip_view.xml
rename to VolumePluginCommon/res/layout/volume_tool_tip_view.xml
diff --git a/ResMini/res/values/attrs.xml b/VolumePluginCommon/res/values/attrs.xml
similarity index 100%
rename from ResMini/res/values/attrs.xml
rename to VolumePluginCommon/res/values/attrs.xml
diff --git a/ResMini/res/values/dimens.xml b/VolumePluginCommon/res/values/dimens.xml
similarity index 100%
rename from ResMini/res/values/dimens.xml
rename to VolumePluginCommon/res/values/dimens.xml
diff --git a/ResMini/res/values/strings.xml b/VolumePluginCommon/res/values/strings.xml
similarity index 100%
rename from ResMini/res/values/strings.xml
rename to VolumePluginCommon/res/values/strings.xml
diff --git a/ResMini/res/values/styles.xml b/VolumePluginCommon/res/values/styles.xml
similarity index 100%
rename from ResMini/res/values/styles.xml
rename to VolumePluginCommon/res/values/styles.xml
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/AlphaOptimizedImageButton.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/AlphaOptimizedImageButton.java
similarity index 96%
rename from ResMini/src/co/potatoproject/systemui/resmini/AlphaOptimizedImageButton.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/AlphaOptimizedImageButton.java
index 578a51e..fa82645 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/AlphaOptimizedImageButton.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/AlphaOptimizedImageButton.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/CaptionsToggleImageButton.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/CaptionsToggleImageButton.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/CaptionsToggleImageButton.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/CaptionsToggleImageButton.java
index 72bdf68..0fc85b1 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/CaptionsToggleImageButton.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/CaptionsToggleImageButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/ConfigurableTexts.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ConfigurableTexts.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/ConfigurableTexts.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ConfigurableTexts.java
index f8ed32b..b4681e4 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/ConfigurableTexts.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ConfigurableTexts.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/D.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/D.java
similarity index 93%
rename from ResMini/src/co/potatoproject/systemui/resmini/D.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/D.java
index bd204e0..dbcf8f1 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/D.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/D.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.util.Log;
 
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/Events.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Events.java
similarity index 99%
rename from ResMini/src/co/potatoproject/systemui/resmini/Events.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Events.java
index f45de19..37be91d 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/Events.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Events.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.media.AudioManager;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/ExpandableIndicator.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ExpandableIndicator.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/ExpandableIndicator.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ExpandableIndicator.java
index 7abd8fe..8013bef 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/ExpandableIndicator.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/ExpandableIndicator.java
@@ -12,7 +12,7 @@
  * permissions and limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.graphics.drawable.AnimatedVectorDrawable;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/Prefs.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Prefs.java
similarity index 99%
rename from ResMini/src/co/potatoproject/systemui/resmini/Prefs.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Prefs.java
index 899847d..188c9d2 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/Prefs.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Prefs.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.annotation.StringDef;
 import android.content.Context;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/SafetyWarningDialog.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SafetyWarningDialog.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/SafetyWarningDialog.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SafetyWarningDialog.java
index 492eb9a..4323ef2 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/SafetyWarningDialog.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SafetyWarningDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/SysUIR.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SysUIR.java
similarity index 97%
rename from ResMini/src/co/potatoproject/systemui/resmini/SysUIR.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SysUIR.java
index 22fc8d2..5f416ae 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/SysUIR.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SysUIR.java
@@ -1,4 +1,4 @@
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/SystemUIInterpolators.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SystemUIInterpolators.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/SystemUIInterpolators.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SystemUIInterpolators.java
index 1c68a28..14d6880 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/SystemUIInterpolators.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/SystemUIInterpolators.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.animation.TimeInterpolator;
 
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/Utils.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Utils.java
similarity index 99%
rename from ResMini/src/co/potatoproject/systemui/resmini/Utils.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Utils.java
index a3192b4..f079cff 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/Utils.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/Utils.java
@@ -1,4 +1,4 @@
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.annotation.ColorInt;
 import android.content.Context;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/VolumeDialog.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumeDialog.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/VolumeDialog.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumeDialog.java
index a8e8f48..a8bab7f 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/VolumeDialog.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumeDialog.java
@@ -15,7 +15,7 @@
  * limitations under the License
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/ResMini/src/co/potatoproject/systemui/resmini/VolumePrefs.java b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumePrefs.java
similarity index 98%
rename from ResMini/src/co/potatoproject/systemui/resmini/VolumePrefs.java
rename to VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumePrefs.java
index 8235129..6f4c74c 100644
--- a/ResMini/src/co/potatoproject/systemui/resmini/VolumePrefs.java
+++ b/VolumePluginCommon/src/co/potatoproject/plugin/volume/common/VolumePrefs.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package co.potatoproject.systemui.resmini;
+package co.potatoproject.plugin.volume.common;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/plugins.mk b/plugins.mk
index fe457fc..efdf43e 100644
--- a/plugins.mk
+++ b/plugins.mk
@@ -1,5 +1,5 @@
 PRODUCT_PACKAGES += \
 	AospPanel \
-	FancyPanel \
+	CompactPanel \
 	OreoPanel \
-	TogglePanel
+	TiledPanel