diff --git a/_includes/legacy/nav.html b/_includes/legacy/nav.html
index bf4ae4b0..03c701dd 100644
--- a/_includes/legacy/nav.html
+++ b/_includes/legacy/nav.html
@@ -66,7 +66,7 @@
Calendar/Contacts Sync Tools
Digital Notebook
Email Clients
- File Encryption
+ File Encryption
File Sharing
File Sync
Metadata Removal Tools
diff --git a/_includes/legacy/sections/calendar-contacts-sync.html b/_includes/legacy/sections/calendar-contacts-sync.html
index ea55242f..703eb5b2 100644
--- a/_includes/legacy/sections/calendar-contacts-sync.html
+++ b/_includes/legacy/sections/calendar-contacts-sync.html
@@ -60,7 +60,7 @@
- Cloud backups - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
+ Cloud backups - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
diff --git a/_includes/legacy/sections/metadata-removal-tools.html b/_includes/legacy/sections/metadata-removal-tools.html
new file mode 100644
index 00000000..90a09cb7
--- /dev/null
+++ b/_includes/legacy/sections/metadata-removal-tools.html
@@ -0,0 +1,34 @@
+
+
+{%
+ include legacy/cardv2.html
+ title="MAT2"
+ image="/assets/img/legacy_svg/3rd-party/mat2.svg"
+ description="MAT2 is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
+ website="https://0xacab.org/jvoisin/mat2"
+ forum="https://forum.privacytools.io/t/discussion-mat/1559"
+ gitlab="https://0xacab.org/jvoisin/mat2"
+ windows="https://pypi.org/project/mat2/"
+ mac="https://pypi.org/project/mat2/"
+ linux="https://pypi.org/project/mat2/"
+ freebsd="https://pypi.org/project/mat2/"
+ openbsd="https://pypi.org/project/mat2/"
+ netbsd="https://pypi.org/project/mat2/"
+%}
+
+{%
+ include legacy/cardv2.html
+ title="ExifCleaner"
+ image="/assets/img/legacy_svg/3rd-party/exifcleaner.svg"
+ description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
+ website="https://exifcleaner.com"
+ forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
+ github="https://github.com/szTheory/exifcleaner"
+ windows="https://github.com/szTheory/exifcleaner/releases"
+ mac="https://github.com/szTheory/exifcleaner/releases"
+ linux="https://github.com/szTheory/exifcleaner/releases"
+%}
diff --git a/_includes/legacy/sections/productivity-tools.html b/_includes/legacy/sections/productivity-tools.html
index c237d514..178ed544 100644
--- a/_includes/legacy/sections/productivity-tools.html
+++ b/_includes/legacy/sections/productivity-tools.html
@@ -60,38 +60,3 @@
LibreOffice - Free and open-source office suite.
VSCodium - Scripts to automatically build Microsoft's Visual Studio Code editor without branding or telemetry.
-
-
-
-{%
- include legacy/cardv2.html
- title="MAT2"
- image="/assets/img/legacy_svg/3rd-party/mat2.svg"
- description="MAT2 is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
- website="https://0xacab.org/jvoisin/mat2"
- forum="https://forum.privacytools.io/t/discussion-mat/1559"
- gitlab="https://0xacab.org/jvoisin/mat2"
- windows="https://pypi.org/project/mat2/"
- mac="https://pypi.org/project/mat2/"
- linux="https://pypi.org/project/mat2/"
- freebsd="https://pypi.org/project/mat2/"
- openbsd="https://pypi.org/project/mat2/"
- netbsd="https://pypi.org/project/mat2/"
-%}
-
-{%
- include legacy/cardv2.html
- title="ExifCleaner"
- image="/assets/img/legacy_svg/3rd-party/exifcleaner.svg"
- description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
- website="https://exifcleaner.com"
- forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
- github="https://github.com/szTheory/exifcleaner"
- windows="https://github.com/szTheory/exifcleaner/releases"
- mac="https://github.com/szTheory/exifcleaner/releases"
- linux="https://github.com/szTheory/exifcleaner/releases"
-%}
diff --git a/_includes/nav.html b/_includes/nav.html
index bc97e830..ce156012 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -20,17 +20,17 @@
Providers
@@ -39,17 +39,16 @@
diff --git a/legacy_pages/software.html b/legacy_pages/software.html
index 4e08ad12..de355351 100644
--- a/legacy_pages/software.html
+++ b/legacy_pages/software.html
@@ -12,7 +12,7 @@ description: "Discover a variety of open-source software built to protect your p
Calendar/Contacts Sync Tools
Digital Notebook
Email Clients
- File Encryption
+ File Encryption
File Sharing
Password Manager
Productivity Tools
diff --git a/legacy_pages/software/encryption.html b/legacy_pages/software/encryption.html
index 8bd90df5..c6cf7dc9 100644
--- a/legacy_pages/software/encryption.html
+++ b/legacy_pages/software/encryption.html
@@ -1,6 +1,6 @@
---
layout: page
-permalink: /software/encryption-tools/
+permalink: /software/productivity/#encrypt
title: "Encryption Tools"
description: "Discover free, open-source, and secure ways to encrypt your sensitive data to keep it from prying eyes."
---
diff --git a/legacy_pages/software/file-sharing.html b/legacy_pages/software/file-sharing.html
index a0dbbeb0..8a48a165 100644
--- a/legacy_pages/software/file-sharing.html
+++ b/legacy_pages/software/file-sharing.html
@@ -1,8 +1,10 @@
---
layout: page
permalink: /software/file-sharing/
-title: "File Sharing"
-description: "Discover how to share your files with your friends and family or anonymously, without a middleman."
+title: "File Sharing and Sync"
+description: "Discover how to privately share your files between your devices, with your friends and family, or anonymously online."
---
{% include legacy/sections/file-sharing.html %}
+
+{% include legacy/sections/file-sync.html %}
diff --git a/legacy_pages/software/file-sync.html b/legacy_pages/software/file-sync.html
deleted file mode 100644
index 17441a12..00000000
--- a/legacy_pages/software/file-sync.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/file-sync/
-title: "File Sync"
-description: "Discover free, open-source, and secure ways to sync your files across your devices."
----
-
-{% include legacy/sections/file-sync.html %}
diff --git a/legacy_pages/software/productivity.html b/legacy_pages/software/productivity.html
index 5e239d28..53765fd7 100644
--- a/legacy_pages/software/productivity.html
+++ b/legacy_pages/software/productivity.html
@@ -6,3 +6,7 @@ description: "Get working and collaborating without sharing your documents with
---
{% include legacy/sections/productivity-tools.html %}
+
+{% include legacy/sections/metadata-removal-tools.html %}
+
+{% include legacy/sections/file-encryption.html %}
diff --git a/privacytools.io/assets/js/redirects.js b/privacytools.io/assets/js/redirects.js
index ef9ebca8..62429476 100644
--- a/privacytools.io/assets/js/redirects.js
+++ b/privacytools.io/assets/js/redirects.js
@@ -21,7 +21,7 @@ if (window.location == 'https://www.privacytools.io/#mycloud') { window.location
if (window.location == 'https://www.privacytools.io/#sync') { window.location = 'https://www.privacytools.io/software/file-sync/';}
if (window.location == 'https://www.privacytools.io/#pw') { window.location = 'https://www.privacytools.io/software/passwords/';}
if (window.location == 'https://www.privacytools.io/#calendar_contacts') { window.location = 'https://www.privacytools.io/software/calendar-contacts/';}
-if (window.location == 'https://www.privacytools.io/#encrypt') { window.location = 'https://www.privacytools.io/software/encryption-tools/';}
+if (window.location == 'https://www.privacytools.io/#encrypt') { window.location = 'https://www.privacytools.io/software/productivity/#encrypt';}
if (window.location == 'https://www.privacytools.io/#darknets') { window.location = 'https://www.privacytools.io/software/networks/';}
if (window.location == 'https://www.privacytools.io/#notebook') { window.location = 'https://www.privacytools.io/software/notebooks/';}
if (window.location == 'https://www.privacytools.io/#productivity') { window.location = 'https://www.privacytools.io/software/productivity/';}