diff --git a/custom_components/browser_mod/browser_mod_panel.js b/custom_components/browser_mod/browser_mod_panel.js
index c630aaf..a1a5fee 100644
--- a/custom_components/browser_mod/browser_mod_panel.js
+++ b/custom_components/browser_mod/browser_mod_panel.js
@@ -70,11 +70,24 @@ class BrowserModPanel extends s {
         </app-header>
 
         <ha-config-section .narrow=${this.narrow} full-width>
-          <ha-card header="Device ID">
+          <ha-card header="This Browser">
             <div class="card-content">
+              <div class="option">
+                <h3>Enable</h3>
+                <ha-switch></ha-switch>
+              </div>
+              Enable this browser as a Device in Home Assistant
+              <div class="option">
+                <h3>DeviceID</h3>
+              </div>
+              <ha-textfield .value=${deviceID}> </ha-textfield>
               The device ID is a unique identifier for your browser/device
               combination.
-              <ha-textfield .value=${deviceID}> </ha-textfield>
+              <div class="option">
+                <h3>Enable Camera</h3>
+                <ha-switch> </ha-switch>
+              </div>
+              Get Camera input from this device (hardware dependent)
             </div>
             <div class="card-actions">
               <div class="spacer"></div>
@@ -82,6 +95,10 @@ class BrowserModPanel extends s {
             </div>
           </ha-card>
 
+          <ha-card header="Current User">
+            <div class="card-content"></div>
+          </ha-card>
+
           <ha-card header="Tweaks">
             <div class="card-content">
               <div class="option">
diff --git a/js/browser_mod_panel.ts b/js/config_panel/main.ts
similarity index 82%
rename from js/browser_mod_panel.ts
rename to js/config_panel/main.ts
index e642c60..f2d03cb 100644
--- a/js/browser_mod_panel.ts
+++ b/js/config_panel/main.ts
@@ -18,11 +18,24 @@ class BrowserModPanel extends LitElement {
         </app-header>
 
         <ha-config-section .narrow=${this.narrow} full-width>
-          <ha-card header="Device ID">
+          <ha-card header="This Browser">
             <div class="card-content">
+              <div class="option">
+                <h3>Enable</h3>
+                <ha-switch></ha-switch>
+              </div>
+              Enable this browser as a Device in Home Assistant
+              <div class="option">
+                <h3>DeviceID</h3>
+              </div>
+              <ha-textfield .value=${deviceID}> </ha-textfield>
               The device ID is a unique identifier for your browser/device
               combination.
-              <ha-textfield .value=${deviceID}> </ha-textfield>
+              <div class="option">
+                <h3>Enable Camera</h3>
+                <ha-switch> </ha-switch>
+              </div>
+              Get Camera input from this device (hardware dependent)
             </div>
             <div class="card-actions">
               <div class="spacer"></div>
@@ -30,6 +43,10 @@ class BrowserModPanel extends LitElement {
             </div>
           </ha-card>
 
+          <ha-card header="Current User">
+            <div class="card-content"></div>
+          </ha-card>
+
           <ha-card header="Tweaks">
             <div class="card-content">
               <div class="option">
diff --git a/js/browser-player-editor.ts b/js/plugin/browser-player-editor.ts
similarity index 100%
rename from js/browser-player-editor.ts
rename to js/plugin/browser-player-editor.ts
diff --git a/js/browser-player.ts b/js/plugin/browser-player.ts
similarity index 100%
rename from js/browser-player.ts
rename to js/plugin/browser-player.ts
diff --git a/js/browser.ts b/js/plugin/browser.ts
similarity index 100%
rename from js/browser.ts
rename to js/plugin/browser.ts
diff --git a/js/camera.ts b/js/plugin/camera.ts
similarity index 100%
rename from js/camera.ts
rename to js/plugin/camera.ts
diff --git a/js/connection.ts b/js/plugin/connection.ts
similarity index 100%
rename from js/connection.ts
rename to js/plugin/connection.ts
diff --git a/js/fullyKiosk.ts b/js/plugin/fullyKiosk.ts
similarity index 100%
rename from js/fullyKiosk.ts
rename to js/plugin/fullyKiosk.ts
diff --git a/js/browser_mod.ts b/js/plugin/main.ts
similarity index 99%
rename from js/browser_mod.ts
rename to js/plugin/main.ts
index e85a94a..cda68a4 100644
--- a/js/browser_mod.ts
+++ b/js/plugin/main.ts
@@ -12,7 +12,7 @@ import { BrowserModCameraMixin } from "./camera";
 import { BrowserModScreensaverMixin } from "./screensaver";
 import { BrowserModPopupsMixin } from "./popups";
 import { BrowserModBrowserMixin } from "./browser";
-import pjson from "../package.json";
+import pjson from "../../package.json";
 
 const ext = (baseClass, mixins) =>
   mixins.reduceRight((base, mixin) => mixin(base), baseClass);
diff --git a/js/mediaPlayer.ts b/js/plugin/mediaPlayer.ts
similarity index 100%
rename from js/mediaPlayer.ts
rename to js/plugin/mediaPlayer.ts
diff --git a/js/popups.ts b/js/plugin/popups.ts
similarity index 100%
rename from js/popups.ts
rename to js/plugin/popups.ts
diff --git a/js/screensaver.ts b/js/plugin/screensaver.ts
similarity index 100%
rename from js/screensaver.ts
rename to js/plugin/screensaver.ts
diff --git a/js/types.ts b/js/plugin/types.ts
similarity index 94%
rename from js/types.ts
rename to js/plugin/types.ts
index f88440c..26199b2 100644
--- a/js/types.ts
+++ b/js/plugin/types.ts
@@ -1,6 +1,6 @@
 const a = {};
 
-import { BrowserMod } from "./browser_mod";
+import { BrowserMod } from "./main";
 
 interface FullyKiosk {
   // Get device info
diff --git a/rollup.config.js b/rollup.config.js
index 7654ef8..8fb493f 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -8,7 +8,7 @@ const dev = process.env.ROLLUP_WATCH;
 
 module.exports = [
   {
-    input: "js/browser_mod.ts",
+    input: "js/plugin/main.ts",
     output: {
       file: "custom_components/browser_mod/browser_mod.js",
       format: "es",
@@ -24,7 +24,7 @@ module.exports = [
     ],
   },
   {
-    input: "js/browser_mod_panel.ts",
+    input: "js/config_panel/main.ts",
     output: {
       file: "custom_components/browser_mod/browser_mod_panel.js",
       format: "es",