diff --git a/src/App.vue b/src/App.vue
index 6dc892d..99781f5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup>
 import ProfileManager from '@/components/ProfileManager.vue'
-import DevicePreview from '@/components/device-gui/DevicePreview.vue'
+import DevicePreview from '@/components/device/DevicePreview.vue'
 import ConfigPane from '@/components/ConfigPane.vue'
 import Navbar from '@/components/Navbar.vue'
 import ConfigSelect from '@/components/ConfigSelect.vue'
diff --git a/src/components/device-gui/DeviceBar.vue b/src/components/device/DeviceBar.vue
similarity index 100%
rename from src/components/device-gui/DeviceBar.vue
rename to src/components/device/DeviceBar.vue
diff --git a/src/components/device-gui/DevicePreview.vue b/src/components/device/DevicePreview.vue
similarity index 96%
rename from src/components/device-gui/DevicePreview.vue
rename to src/components/device/DevicePreview.vue
index 8f89233..cf6eb2e 100644
--- a/src/components/device-gui/DevicePreview.vue
+++ b/src/components/device/DevicePreview.vue
@@ -38,7 +38,7 @@
 </template>
 <script>
 import axios from 'axios'
-import DeviceBar from '@/components/device-gui/DeviceBar.vue'
+import DeviceBar from '@/components/device/DeviceBar.vue'
 
 export default {
   name: 'DevicePreview',
diff --git a/src/components/old/Pop.vue b/src/components/old/Pop.vue
index a4b6d65..4c08b96 100644
--- a/src/components/old/Pop.vue
+++ b/src/components/old/Pop.vue
@@ -12,7 +12,7 @@ import {
   CommandShortcut,
 } from '@/components/ui/command'
 import { Input } from '@/components/ui/input'
-import PixelBarTest from '@/components/device-gui/DeviceBar.vue'
+import PixelBarTest from '@/components/device/DeviceBar.vue'
 import SchemaTest from '@/components/SchemaTest.vue'
 </script>
 
diff --git a/src/components/icons/IconCommunity.vue b/src/components/old/icons/IconCommunity.vue
similarity index 100%
rename from src/components/icons/IconCommunity.vue
rename to src/components/old/icons/IconCommunity.vue
diff --git a/src/components/icons/IconDocumentation.vue b/src/components/old/icons/IconDocumentation.vue
similarity index 100%
rename from src/components/icons/IconDocumentation.vue
rename to src/components/old/icons/IconDocumentation.vue
diff --git a/src/components/icons/IconEcosystem.vue b/src/components/old/icons/IconEcosystem.vue
similarity index 100%
rename from src/components/icons/IconEcosystem.vue
rename to src/components/old/icons/IconEcosystem.vue
diff --git a/src/components/icons/IconSupport.vue b/src/components/old/icons/IconSupport.vue
similarity index 100%
rename from src/components/icons/IconSupport.vue
rename to src/components/old/icons/IconSupport.vue
diff --git a/src/components/icons/IconTooling.vue b/src/components/old/icons/IconTooling.vue
similarity index 100%
rename from src/components/icons/IconTooling.vue
rename to src/components/old/icons/IconTooling.vue