diff --git a/content/tools/privacy.md b/content/privacy.md
similarity index 100%
rename from content/tools/privacy.md
rename to content/privacy.md
diff --git a/content/tools/advanced/_index.md b/content/tools/advanced/_index.md
new file mode 100644
index 00000000..dee36d51
--- /dev/null
+++ b/content/tools/advanced/_index.md
@@ -0,0 +1,4 @@
+---
+title: Advanced
+weight: 5
+---
diff --git a/content/tools/alternative-networks.md b/content/tools/advanced/alternative-networks.md
similarity index 100%
rename from content/tools/alternative-networks.md
rename to content/tools/advanced/alternative-networks.md
diff --git a/content/tools/device-integrity.md b/content/tools/advanced/device-integrity.md
similarity index 100%
rename from content/tools/device-integrity.md
rename to content/tools/advanced/device-integrity.md
diff --git a/content/tools/hardware/_index.md b/content/tools/hardware/_index.md
new file mode 100644
index 00000000..31a84752
--- /dev/null
+++ b/content/tools/hardware/_index.md
@@ -0,0 +1,4 @@
+---
+title: Hardware
+weight: 4
+---
diff --git a/content/tools/mobile-phones.md b/content/tools/hardware/mobile-phones.md
similarity index 100%
rename from content/tools/mobile-phones.md
rename to content/tools/hardware/mobile-phones.md
diff --git a/content/tools/security-keys.md b/content/tools/hardware/security-keys.md
similarity index 100%
rename from content/tools/security-keys.md
rename to content/tools/hardware/security-keys.md
diff --git a/content/tools/self-hosting/_index.md b/content/tools/self-hosting/_index.md
index 516f04ba..8e9e6b6c 100644
--- a/content/tools/self-hosting/_index.md
+++ b/content/tools/self-hosting/_index.md
@@ -3,6 +3,7 @@ title: Self-Hosting
 meta_title: "Self-Hosting Software and Services - Privacy Guides"
 description: For our more technical readers, self-hosting software and services can provide additional privacy assurances since you have maximum control over your data.
 cover: router.webp
+weight: 3
 ---
 <small>Protects against the following threat(s):</small>
 
diff --git a/content/tools/services/_index.md b/content/tools/services/_index.md
new file mode 100644
index 00000000..8e9d5fb5
--- /dev/null
+++ b/content/tools/services/_index.md
@@ -0,0 +1,4 @@
+---
+title: Services
+weight: 1
+---
diff --git a/content/tools/cloud.md b/content/tools/services/cloud.md
similarity index 100%
rename from content/tools/cloud.md
rename to content/tools/services/cloud.md
diff --git a/content/tools/data-broker-removals.md b/content/tools/services/data-broker-removals.md
similarity index 99%
rename from content/tools/data-broker-removals.md
rename to content/tools/services/data-broker-removals.md
index 988f3276..7cff9f66 100644
--- a/content/tools/data-broker-removals.md
+++ b/content/tools/services/data-broker-removals.md
@@ -6,7 +6,7 @@ cover: data-broker-removals.webp
 ---
 <small>Protects against the following threat(s):</small>
 
-- [:material-account-search: Public Exposure](basics/common-threats.md#limiting-public-information){ .pg-green }
+- [:material-account-search: Public Exposure](../../kb/basics/common-misconceptions.md){ .pg-green }
 
 "People search sites" operated by data brokers represent an immense privacy risk to the majority of Americans. For many, sensitive personal information such as your address, phone number, email, and age is a simple internet search away. While there is unfortunately no federal regulation in place to protect your data, many of these companies will remove your information from their *public* databases upon request.
 
diff --git a/content/tools/dns.md b/content/tools/services/dns.md
similarity index 100%
rename from content/tools/dns.md
rename to content/tools/services/dns.md
diff --git a/content/tools/financial-services.md b/content/tools/services/financial-services.md
similarity index 100%
rename from content/tools/financial-services.md
rename to content/tools/services/financial-services.md
diff --git a/content/tools/photo-management.md b/content/tools/services/photo-management.md
similarity index 100%
rename from content/tools/photo-management.md
rename to content/tools/services/photo-management.md
diff --git a/content/tools/real-time-communication.md b/content/tools/services/real-time-communication.md
similarity index 100%
rename from content/tools/real-time-communication.md
rename to content/tools/services/real-time-communication.md
diff --git a/content/tools/search-engines.md b/content/tools/services/search-engines.md
similarity index 100%
rename from content/tools/search-engines.md
rename to content/tools/services/search-engines.md
diff --git a/content/tools/software/_index.md b/content/tools/software/_index.md
new file mode 100644
index 00000000..5e2905a2
--- /dev/null
+++ b/content/tools/software/_index.md
@@ -0,0 +1,4 @@
+---
+title: Software
+weight: 2
+---
diff --git a/content/tools/ai-chat.md b/content/tools/software/ai-chat.md
similarity index 100%
rename from content/tools/ai-chat.md
rename to content/tools/software/ai-chat.md
diff --git a/content/tools/browser-extensions.md b/content/tools/software/browser-extensions.md
similarity index 100%
rename from content/tools/browser-extensions.md
rename to content/tools/software/browser-extensions.md
diff --git a/content/tools/calendar.md b/content/tools/software/calendar.md
similarity index 100%
rename from content/tools/calendar.md
rename to content/tools/software/calendar.md
diff --git a/content/tools/cryptocurrency.md b/content/tools/software/cryptocurrency.md
similarity index 100%
rename from content/tools/cryptocurrency.md
rename to content/tools/software/cryptocurrency.md
diff --git a/content/tools/data-redaction.md b/content/tools/software/data-redaction.md
similarity index 100%
rename from content/tools/data-redaction.md
rename to content/tools/software/data-redaction.md
diff --git a/content/tools/desktop-browsers.md b/content/tools/software/desktop-browsers.md
similarity index 100%
rename from content/tools/desktop-browsers.md
rename to content/tools/software/desktop-browsers.md
diff --git a/content/tools/desktop.md b/content/tools/software/desktop.md
similarity index 100%
rename from content/tools/desktop.md
rename to content/tools/software/desktop.md
diff --git a/content/tools/document-collaboration.md b/content/tools/software/document-collaboration.md
similarity index 100%
rename from content/tools/document-collaboration.md
rename to content/tools/software/document-collaboration.md
diff --git a/content/tools/email-aliasing.md b/content/tools/software/email-aliasing.md
similarity index 100%
rename from content/tools/email-aliasing.md
rename to content/tools/software/email-aliasing.md
diff --git a/content/tools/email-clients.md b/content/tools/software/email-clients.md
similarity index 100%
rename from content/tools/email-clients.md
rename to content/tools/software/email-clients.md
diff --git a/content/tools/email.md b/content/tools/software/email.md
similarity index 100%
rename from content/tools/email.md
rename to content/tools/software/email.md
diff --git a/content/tools/encryption.md b/content/tools/software/encryption.md
similarity index 100%
rename from content/tools/encryption.md
rename to content/tools/software/encryption.md
diff --git a/content/tools/file-sharing.md b/content/tools/software/file-sharing.md
similarity index 100%
rename from content/tools/file-sharing.md
rename to content/tools/software/file-sharing.md
diff --git a/content/tools/frontends.md b/content/tools/software/frontends.md
similarity index 100%
rename from content/tools/frontends.md
rename to content/tools/software/frontends.md
diff --git a/content/tools/health-and-wellness.md b/content/tools/software/health-and-wellness.md
similarity index 100%
rename from content/tools/health-and-wellness.md
rename to content/tools/software/health-and-wellness.md
diff --git a/content/tools/language-tools.md b/content/tools/software/language-tools.md
similarity index 100%
rename from content/tools/language-tools.md
rename to content/tools/software/language-tools.md
diff --git a/content/tools/maps.md b/content/tools/software/maps.md
similarity index 100%
rename from content/tools/maps.md
rename to content/tools/software/maps.md
diff --git a/content/tools/mobile-browsers.md b/content/tools/software/mobile-browsers.md
similarity index 100%
rename from content/tools/mobile-browsers.md
rename to content/tools/software/mobile-browsers.md
diff --git a/content/tools/multi-factor-authentication.md b/content/tools/software/multi-factor-authentication.md
similarity index 100%
rename from content/tools/multi-factor-authentication.md
rename to content/tools/software/multi-factor-authentication.md
diff --git a/content/tools/news-aggregators.md b/content/tools/software/news-aggregators.md
similarity index 100%
rename from content/tools/news-aggregators.md
rename to content/tools/software/news-aggregators.md
diff --git a/content/tools/notebooks.md b/content/tools/software/notebooks.md
similarity index 100%
rename from content/tools/notebooks.md
rename to content/tools/software/notebooks.md
diff --git a/content/tools/office-suites.md b/content/tools/software/office-suites.md
similarity index 100%
rename from content/tools/office-suites.md
rename to content/tools/software/office-suites.md
diff --git a/content/tools/passwords.md b/content/tools/software/passwords.md
similarity index 100%
rename from content/tools/passwords.md
rename to content/tools/software/passwords.md
diff --git a/content/tools/pastebins.md b/content/tools/software/pastebins.md
similarity index 100%
rename from content/tools/pastebins.md
rename to content/tools/software/pastebins.md
diff --git a/content/tools/router.md b/content/tools/software/router.md
similarity index 100%
rename from content/tools/router.md
rename to content/tools/software/router.md
diff --git a/content/tools/social-networks.md b/content/tools/software/social-networks.md
similarity index 100%
rename from content/tools/social-networks.md
rename to content/tools/software/social-networks.md
diff --git a/content/tools/tor.md b/content/tools/software/tor.md
similarity index 100%
rename from content/tools/tor.md
rename to content/tools/software/tor.md
diff --git a/content/tools/vpn.md b/content/tools/software/vpn.md
similarity index 100%
rename from content/tools/vpn.md
rename to content/tools/software/vpn.md