diff --git a/src/App.vue b/src/App.vue
index ad81cbe7..73d16844 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,8 +7,8 @@
 </template>
 <script>
 
-import Header from '@/components/Header.vue';
-import Footer from '@/components/Footer.vue';
+import Header from '@/components/PageStrcture/Header.vue';
+import Footer from '@/components/PageStrcture/Footer.vue';
 import conf from '@/data/conf.yml';
 
 export default {
diff --git a/src/components/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
similarity index 98%
rename from src/components/Collapsable.vue
rename to src/components/LinkItems/Collapsable.vue
index 45ca5dea..9c56ab06 100644
--- a/src/components/Collapsable.vue
+++ b/src/components/LinkItems/Collapsable.vue
@@ -87,8 +87,8 @@ export default {
 
 <style scoped lang="scss">
 
-@import '../../src/styles/constants.scss';
-@import '../../src/styles/media-queries.scss';
+@import '@/styles/constants.scss';
+@import '@/styles/media-queries.scss';
 
 .collapsable {
     padding: 5px;
diff --git a/src/components/IframeModal.vue b/src/components/LinkItems/IframeModal.vue
similarity index 100%
rename from src/components/IframeModal.vue
rename to src/components/LinkItems/IframeModal.vue
diff --git a/src/components/Item.vue b/src/components/LinkItems/Item.vue
similarity index 96%
rename from src/components/Item.vue
rename to src/components/LinkItems/Item.vue
index 02056cac..c33b3258 100644
--- a/src/components/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import Icon from '@/components/ItemIcon.vue';
-import ItemOpenMethodIcon from '@/components/ItemOpenMethodIcon';
+import Icon from '@/components/LinkItems/ItemIcon.vue';
+import ItemOpenMethodIcon from '@/components/LinkItems/ItemOpenMethodIcon';
 
 export default {
   name: 'Item',
@@ -91,7 +91,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '../../src/styles/constants.scss';
+@import '../../../src/styles/constants.scss';
 
 /* Item wrapper */
 .item-wrapper {
diff --git a/src/components/ItemGroup.vue b/src/components/LinkItems/ItemGroup.vue
similarity index 89%
rename from src/components/ItemGroup.vue
rename to src/components/LinkItems/ItemGroup.vue
index 58193bff..25350040 100644
--- a/src/components/ItemGroup.vue
+++ b/src/components/LinkItems/ItemGroup.vue
@@ -36,9 +36,9 @@
 </template>
 
 <script>
-import Item from '@/components/Item.vue';
-import Collapsable from '@/components/Collapsable.vue';
-import IframeModal from '@/components/IframeModal.vue';
+import Item from '@/components/LinkItems/Item.vue';
+import Collapsable from '@/components/LinkItems/Collapsable.vue';
+import IframeModal from '@/components/LinkItems/IframeModal.vue';
 
 export default {
   name: 'ItemGroup',
@@ -67,7 +67,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '../../src/styles/constants.scss';
+@import '../../../src/styles/constants.scss';
 
 .no-items {
     width: 100px;
diff --git a/src/components/ItemIcon.vue b/src/components/LinkItems/ItemIcon.vue
similarity index 100%
rename from src/components/ItemIcon.vue
rename to src/components/LinkItems/ItemIcon.vue
diff --git a/src/components/ItemOpenMethodIcon.vue b/src/components/LinkItems/ItemOpenMethodIcon.vue
similarity index 100%
rename from src/components/ItemOpenMethodIcon.vue
rename to src/components/LinkItems/ItemOpenMethodIcon.vue
diff --git a/src/components/Footer.vue b/src/components/PageStrcture/Footer.vue
similarity index 100%
rename from src/components/Footer.vue
rename to src/components/PageStrcture/Footer.vue
diff --git a/src/components/Header.vue b/src/components/PageStrcture/Header.vue
similarity index 84%
rename from src/components/Header.vue
rename to src/components/PageStrcture/Header.vue
index 96d81e36..26bfc8a6 100644
--- a/src/components/Header.vue
+++ b/src/components/PageStrcture/Header.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script>
-import PageTitle from '@/components/PageTitle.vue';
-import Nav from '@/components/Nav.vue';
+import PageTitle from '@/components/PageStrcture/PageTitle.vue';
+import Nav from '@/components/PageStrcture/Nav.vue';
 
 export default {
   name: 'Header',
diff --git a/src/components/Nav.vue b/src/components/PageStrcture/Nav.vue
similarity index 100%
rename from src/components/Nav.vue
rename to src/components/PageStrcture/Nav.vue
diff --git a/src/components/PageTitle.vue b/src/components/PageStrcture/PageTitle.vue
similarity index 100%
rename from src/components/PageTitle.vue
rename to src/components/PageStrcture/PageTitle.vue
diff --git a/src/components/FilterTile.vue b/src/components/Settings/FilterTile.vue
similarity index 97%
rename from src/components/FilterTile.vue
rename to src/components/Settings/FilterTile.vue
index 30a000c1..deff2323 100644
--- a/src/components/FilterTile.vue
+++ b/src/components/Settings/FilterTile.vue
@@ -35,8 +35,8 @@
 </template>
 
 <script>
-import KeyboardShortcutInfo from '@/components/KeyboardShortcutInfo';
-import ThemeSelector from '@/components/ThemeSelector';
+import KeyboardShortcutInfo from '@/components/Settings/KeyboardShortcutInfo';
+import ThemeSelector from '@/components/Settings/ThemeSelector';
 
 import IconDeafault from '@/assets/icons/layout-default.svg';
 import IconHorizontal from '@/assets/icons/layout-horizontal.svg';
diff --git a/src/components/KeyboardShortcutInfo.vue b/src/components/Settings/KeyboardShortcutInfo.vue
similarity index 100%
rename from src/components/KeyboardShortcutInfo.vue
rename to src/components/Settings/KeyboardShortcutInfo.vue
diff --git a/src/components/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue
similarity index 100%
rename from src/components/ThemeSelector.vue
rename to src/components/Settings/ThemeSelector.vue
diff --git a/src/data/item-data.json b/src/data/item-data.json
deleted file mode 100644
index 7e119089..00000000
--- a/src/data/item-data.json
+++ /dev/null
@@ -1,288 +0,0 @@
-{
-    "pageInfo": {
-        "title": "Hello World",
-        "description": ""
-    },
-    "sections": [
-        {
-            "id": "0",
-            "name": "Firewall",
-            "collapsed": false,
-            "cols": 3,
-            "items": [
-                {
-                    "title": "OPNsense",
-                    "description": "Firewall Central Management",
-                    "icon": "networking/opnsense",
-                    "iconType": "img",
-                    "url": "https://192.168.1.1"
-                },
-                {
-                    "title": "NetData",
-                    "description": "System resource usage on firewall",
-                    "icon": "networking/netdata",
-                    "iconType": "img",
-                    "url": "http://192.168.1.1:19999/"
-                },
-                {
-                    "title": "MalTrail",
-                    "description": "Malicious traffic detection system",
-                    "icon": "networking/maltrail",
-                    "iconType": "img",
-                    "url": "192.168.1.1:8338"
-                },
-                {
-                    "title": "Ntopng",
-                    "description": "Network traffic probe and network use monitor",
-                    "icon": "networking/ntop",
-                    "iconType": "img",
-                    "url": "192.168.1.1:3001"
-                },
-                {
-                    "title": "Sensei",
-                    "description": "Additional data features",
-                    "icon": "networking/sensei",
-                    "iconType": "img",
-                    "url": "https://192.168.1.1/ui/sensei/"
-                },
-                {
-                    "title": "Monit",
-                    "description": "Status of firewall system alerts",
-                    "icon": "networking/monit",
-                    "iconType": "img",
-                    "url": "https://192.168.1.1/ui/monit/status"
-                },
-                {
-                    "title": "Firewall Logs",
-                    "description": "Real-time view of firewall data and logs",
-                    "icon": "networking/logs",
-                    "iconType": "img",
-                    "url": "https://192.168.1.1/ui/diagnostics/firewall/log"
-                },
-                {
-                    "title": "WireGuard",
-                    "description": "Manage WireGuard client and server on firewall",
-                    "icon": "networking/wireguard",
-                    "iconType": "img",
-                    "url": "https://192.168.1.1/ui/wireguard/general"
-                }
-            ]
-        },
-        {
-            "id": "1",
-            "name": "DNS Device",
-            "collapsed": false,
-            "cols": 2,
-            "items": [
-                {
-                    "title": "Pi-Hole",
-                    "description": "DNS settings for ad & tracker blocking",
-                    "provider": "Cockpit",
-                    "iconType": "img",
-                    "icon": "networking/pihole",
-                    "url": "http://192.168.130.2/admin"
-                },
-                {
-                    "title": "PiAlert",
-                    "description": "Presence monitoring and ARP scanning",
-                    "provider": "GoAccess",
-                    "iconType": "img",
-                    "icon": "networking/pialert",
-                    "url": "http://192.168.130.2/pialert/"
-                },
-                {
-                    "title": "SmokePing",
-                    "description": "Network latency monitoring",
-                    "iconType": "img",
-                    "icon": "networking/smokeping",
-                    "url": "http://192.168.130.2:8086/"
-                },
-                {
-                    "title": "StatPing",
-                    "description": "Up-time monitoring for local service",
-                    "iconType": "img",
-                    "icon": "networking/statping",
-                    "url": "http://192.168.130.2:8083/"
-                },
-                {
-                    "title": "LibreSpeed",
-                    "description": "Local network speed and latency test",
-                    "iconType": "img",
-                    "icon": "networking/librespeed",
-                    "url": "http://192.168.130.2:49154/"
-                },
-                {
-                    "title": "NetData",
-                    "description": "Real-time system resource usage",
-                    "iconType": "img",
-                    "icon": "networking/netdata",
-                    "url": "http://192.168.130.2:19999"
-                },
-                {
-                    "title": "Portainer",
-                    "description": "Docker container management",
-                    "iconType": "img",
-                    "icon": "networking/portainer",
-                    "url": "http://192.168.130.2:9000/"
-                },
-                {
-                    "title": "cAdvisor",
-                    "description": "Container monitoring",
-                    "iconType": "img",
-                    "icon": "networking/cadvisor",
-                    "url": "http://192.168.130.2:8084/"
-                },
-                {
-                    "title": "Glances",
-                    "description": "Simple resource usage",
-                    "iconType": "img",
-                    "icon": "networking/glances",
-                    "url": "http://192.168.130.2:61208"
-                },
-                {
-                    "title": "Dozzle",
-                    "description": "Docker container web log viewer",
-                    "iconType": "img",
-                    "icon": "networking/dozzle",
-                    "url": "http://192.168.130.2:8093"
-                },
-                {
-                    "title": "Prometheus",
-                    "description": "System Statistics Aggregation with PromQL",
-                    "iconType": "img",
-                    "icon": "networking/prometheus",
-                    "url": "http://192.168.130.2:8090/"
-                },
-                {
-                    "title": "Grafana",
-                    "description": "Data visualised on dashboards",
-                    "iconType": "img",
-                    "icon": "networking/grafana",
-                    "url": "http://192.168.130.2:8091/"
-                }
-            ]
-        },
-        {
-            "id": "2",
-            "name": "Other Devices",
-            "collapsed": false,
-            "cols": 3,
-            "items": [
-                {
-                    "title": "Modem",
-                    "description": "ISP Router Modem Combo",
-                    "iconType": "img",
-                    "icon": "",
-                    "url": "http://192.168.1.5"
-                },
-                {
-                    "title": "Wireless Access Point",
-                    "description": "View clients connected to WiFi",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "http://192.168.1.109/info.php"
-                },
-                {
-                    "title": "Fing",
-                    "description": "Monitor connectivity issues, ISP quality, health checks and troubleshooting",
-                    "provider": "Fing",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "https://app.fing.com/"
-                },
-                {
-                    "title": "Switch",
-                    "description": "Manage VLANs on Ubiquity Ethernet switch",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "/"
-                }
-            ]
-        },
-        {
-            "name": "External Services",
-            "collapsed": true,
-            "cols": 1,
-            "items": [
-                {
-                    "title": "DuckDNS",
-                    "description": "Dynamic DNS for fixed public IP",
-                    "icon": "networking/duckdns",
-                    "iconType": "img",
-                    "url": "https://www.duckdns.org/"
-                },
-                {
-                    "title": "BorgBase",
-                    "description": "Off-site system Borg backups",
-                    "icon": "networking/borgbase",
-                    "iconType": "img",
-                    "url": "https://www.borgbase.com/repositories"
-                },
-                {
-                    "title": "Mullvad",
-                    "description": "Hosted VPN provider",
-                    "icon": "networking/mullvad",
-                    "iconType": "img",
-                    "url": "https://mullvad.net/en/account/"
-                },
-                {
-                    "title": "ZeroTier",
-                    "description": "Secure networks between devices",
-                    "icon": "networking/zeroteir",
-                    "iconType": "img",
-                    "url": "https://my.zerotier.com/"
-                },
-                {
-                    "title": "HealthChecks",
-                    "description": "Cron Job Monitoring",
-                    "icon": "networking/healthchecks",
-                    "iconType": "img",
-                    "url": "https://healthchecks.io/checks/"
-                },
-                {
-                    "title": "ISP - Vodafone",
-                    "description": "Broadband internet provider",
-                    "icon": "networking/vodafone",
-                    "iconType": "img",
-                    "url": "https://myaccount.vodafone.co.uk/"
-                }
-            ]
-        },
-        {
-            "id": "005",
-            "name": "External Utilities",
-            "collapsed": false,
-            "cols": 1,
-            "items": [
-                {
-                    "title": "Public IP",
-                    "description": "Check public IP and associated data",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "https://www.whatismyip.com/"
-                },
-                {
-                    "title": "Who Is Lookup",
-                    "description": "Check ICAN info for a given IP address or domain",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "https://whois.domaintools.com/"
-                },
-                {
-                    "title": "Speed Test",
-                    "description": "Upload + download speeds and latency",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "https://speed.cloudflare.com/"
-                },
-                {
-                    "title": "Mullvad Check",
-                    "description": "Confirms a secure connection to Mullvad's WireGuard servers",
-                    "icon": "",
-                    "iconType": "img",
-                    "url": "https://mullvad.net/check"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 75da9b0f..6d867060 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -26,8 +26,8 @@
 
 <script>
 
-import FilterTile from '@/components/FilterTile.vue';
-import ItemGroup from '@/components/ItemGroup.vue';
+import FilterTile from '@/components/Settings/FilterTile.vue';
+import ItemGroup from '@/components/LinkItems/ItemGroup.vue';
 
 export default {
   name: 'home',