diff --git a/about.html b/about.html
index e4aada8ea..558dab1b6 100644
--- a/about.html
+++ b/about.html
@@ -121,7 +121,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=1.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=1.html
index 97d984b61..98f5d6ecb 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=1.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=1.html
@@ -119,7 +119,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=2.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=2.html
index e10c88f28..d4129a831 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=2.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=2.html
@@ -119,7 +119,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=3.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=3.html
index b8047ad4e..d0f0f51c3 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=3.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=3.html
@@ -119,7 +119,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=4.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=4.html
index 83923fb3a..f01b4f552 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=4.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=4.html
@@ -119,7 +119,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=5.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=5.html
index c95f1795f..c8df0ba03 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=5.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=5.html
@@ -119,7 +119,7 @@
Developer
diff --git a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=6.html b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=6.html
index c16a79c0c..78662e8c3 100644
--- a/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=6.html
+++ b/blogs-news/news-blogs_category_All_sort_bef_combine_created_DESC_sort_by_created_sort_order=DESC_page=6.html
@@ -119,7 +119,7 @@
Developer
diff --git a/code-of-conduct.html b/code-of-conduct.html
index 7fa31f836..171740416 100644
--- a/code-of-conduct.html
+++ b/code-of-conduct.html
@@ -118,7 +118,7 @@
Developer
diff --git a/developer.html b/developer.html
index c1adb67c9..513323b53 100644
--- a/developer.html
+++ b/developer.html
@@ -119,7 +119,7 @@
Developer
diff --git a/downloads.html b/downloads.html
index 0d2987c9e..354c3214c 100644
--- a/downloads.html
+++ b/downloads.html
@@ -119,7 +119,7 @@
Developer
@@ -152,7 +152,7 @@
-
- Software
+ Software
-
Downloads
diff --git a/events.html b/events.html
index 4f52d717e..423cc7bf9 100644
--- a/events.html
+++ b/events.html
@@ -118,7 +118,7 @@
Developer
diff --git a/index.html b/index.html
index fa282d43c..1bf9ced57 100644
--- a/index.html
+++ b/index.html
@@ -119,7 +119,7 @@
Developer
@@ -554,7 +554,7 @@
VIEW ALL
diff --git a/news-blogs.html b/news-blogs.html
index 0bc3ad15c..5372d53a5 100644
--- a/news-blogs.html
+++ b/news-blogs.html
@@ -119,7 +119,7 @@
Developer
diff --git a/software.html b/software/software.html
similarity index 98%
rename from software.html
rename to software/software.html
index ca40dd49d..0043948d3 100644
--- a/software.html
+++ b/software/software.html
@@ -108,7 +108,7 @@
Developer
@@ -140,7 +140,7 @@
-
- Software
+ Software
-
Downloads
@@ -834,7 +834,7 @@