diff --git a/webui-src/assets/images/retroshare.svg b/webui-src/app/assets/images/retroshare.svg
similarity index 100%
rename from webui-src/assets/images/retroshare.svg
rename to webui-src/app/assets/images/retroshare.svg
diff --git a/webui-src/assets/images/user.svg b/webui-src/app/assets/images/user.svg
similarity index 100%
rename from webui-src/assets/images/user.svg
rename to webui-src/app/assets/images/user.svg
diff --git a/webui-src/assets/webfonts/Roboto-Bold.ttf b/webui-src/app/assets/webfonts/Roboto-Bold.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Bold.ttf
rename to webui-src/app/assets/webfonts/Roboto-Bold.ttf
diff --git a/webui-src/assets/webfonts/Roboto-Bold.woff b/webui-src/app/assets/webfonts/Roboto-Bold.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Bold.woff
rename to webui-src/app/assets/webfonts/Roboto-Bold.woff
diff --git a/webui-src/assets/webfonts/Roboto-Bold.woff2 b/webui-src/app/assets/webfonts/Roboto-Bold.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Bold.woff2
rename to webui-src/app/assets/webfonts/Roboto-Bold.woff2
diff --git a/webui-src/assets/webfonts/Roboto-BoldItalic.ttf b/webui-src/app/assets/webfonts/Roboto-BoldItalic.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-BoldItalic.ttf
rename to webui-src/app/assets/webfonts/Roboto-BoldItalic.ttf
diff --git a/webui-src/assets/webfonts/Roboto-BoldItalic.woff b/webui-src/app/assets/webfonts/Roboto-BoldItalic.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-BoldItalic.woff
rename to webui-src/app/assets/webfonts/Roboto-BoldItalic.woff
diff --git a/webui-src/assets/webfonts/Roboto-BoldItalic.woff2 b/webui-src/app/assets/webfonts/Roboto-BoldItalic.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-BoldItalic.woff2
rename to webui-src/app/assets/webfonts/Roboto-BoldItalic.woff2
diff --git a/webui-src/assets/webfonts/Roboto-Italic.ttf b/webui-src/app/assets/webfonts/Roboto-Italic.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Italic.ttf
rename to webui-src/app/assets/webfonts/Roboto-Italic.ttf
diff --git a/webui-src/assets/webfonts/Roboto-Italic.woff b/webui-src/app/assets/webfonts/Roboto-Italic.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Italic.woff
rename to webui-src/app/assets/webfonts/Roboto-Italic.woff
diff --git a/webui-src/assets/webfonts/Roboto-Italic.woff2 b/webui-src/app/assets/webfonts/Roboto-Italic.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Italic.woff2
rename to webui-src/app/assets/webfonts/Roboto-Italic.woff2
diff --git a/webui-src/assets/webfonts/Roboto-Light.ttf b/webui-src/app/assets/webfonts/Roboto-Light.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Light.ttf
rename to webui-src/app/assets/webfonts/Roboto-Light.ttf
diff --git a/webui-src/assets/webfonts/Roboto-Light.woff b/webui-src/app/assets/webfonts/Roboto-Light.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Light.woff
rename to webui-src/app/assets/webfonts/Roboto-Light.woff
diff --git a/webui-src/assets/webfonts/Roboto-Light.woff2 b/webui-src/app/assets/webfonts/Roboto-Light.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Light.woff2
rename to webui-src/app/assets/webfonts/Roboto-Light.woff2
diff --git a/webui-src/assets/webfonts/Roboto-LightItalic.ttf b/webui-src/app/assets/webfonts/Roboto-LightItalic.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-LightItalic.ttf
rename to webui-src/app/assets/webfonts/Roboto-LightItalic.ttf
diff --git a/webui-src/assets/webfonts/Roboto-LightItalic.woff b/webui-src/app/assets/webfonts/Roboto-LightItalic.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-LightItalic.woff
rename to webui-src/app/assets/webfonts/Roboto-LightItalic.woff
diff --git a/webui-src/assets/webfonts/Roboto-LightItalic.woff2 b/webui-src/app/assets/webfonts/Roboto-LightItalic.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-LightItalic.woff2
rename to webui-src/app/assets/webfonts/Roboto-LightItalic.woff2
diff --git a/webui-src/assets/webfonts/Roboto-Medium.ttf b/webui-src/app/assets/webfonts/Roboto-Medium.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Medium.ttf
rename to webui-src/app/assets/webfonts/Roboto-Medium.ttf
diff --git a/webui-src/assets/webfonts/Roboto-Medium.woff b/webui-src/app/assets/webfonts/Roboto-Medium.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Medium.woff
rename to webui-src/app/assets/webfonts/Roboto-Medium.woff
diff --git a/webui-src/assets/webfonts/Roboto-Medium.woff2 b/webui-src/app/assets/webfonts/Roboto-Medium.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Medium.woff2
rename to webui-src/app/assets/webfonts/Roboto-Medium.woff2
diff --git a/webui-src/assets/webfonts/Roboto-MediumItalic.ttf b/webui-src/app/assets/webfonts/Roboto-MediumItalic.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-MediumItalic.ttf
rename to webui-src/app/assets/webfonts/Roboto-MediumItalic.ttf
diff --git a/webui-src/assets/webfonts/Roboto-MediumItalic.woff b/webui-src/app/assets/webfonts/Roboto-MediumItalic.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-MediumItalic.woff
rename to webui-src/app/assets/webfonts/Roboto-MediumItalic.woff
diff --git a/webui-src/assets/webfonts/Roboto-MediumItalic.woff2 b/webui-src/app/assets/webfonts/Roboto-MediumItalic.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-MediumItalic.woff2
rename to webui-src/app/assets/webfonts/Roboto-MediumItalic.woff2
diff --git a/webui-src/assets/webfonts/Roboto-Regular.ttf b/webui-src/app/assets/webfonts/Roboto-Regular.ttf
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Regular.ttf
rename to webui-src/app/assets/webfonts/Roboto-Regular.ttf
diff --git a/webui-src/assets/webfonts/Roboto-Regular.woff b/webui-src/app/assets/webfonts/Roboto-Regular.woff
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Regular.woff
rename to webui-src/app/assets/webfonts/Roboto-Regular.woff
diff --git a/webui-src/assets/webfonts/Roboto-Regular.woff2 b/webui-src/app/assets/webfonts/Roboto-Regular.woff2
similarity index 100%
rename from webui-src/assets/webfonts/Roboto-Regular.woff2
rename to webui-src/app/assets/webfonts/Roboto-Regular.woff2
diff --git a/webui-src/assets/webfonts/fa-solid-900.eot b/webui-src/app/assets/webfonts/fa-solid-900.eot
similarity index 100%
rename from webui-src/assets/webfonts/fa-solid-900.eot
rename to webui-src/app/assets/webfonts/fa-solid-900.eot
diff --git a/webui-src/assets/webfonts/fa-solid-900.svg b/webui-src/app/assets/webfonts/fa-solid-900.svg
similarity index 100%
rename from webui-src/assets/webfonts/fa-solid-900.svg
rename to webui-src/app/assets/webfonts/fa-solid-900.svg
diff --git a/webui-src/assets/webfonts/fa-solid-900.ttf b/webui-src/app/assets/webfonts/fa-solid-900.ttf
similarity index 100%
rename from webui-src/assets/webfonts/fa-solid-900.ttf
rename to webui-src/app/assets/webfonts/fa-solid-900.ttf
diff --git a/webui-src/assets/webfonts/fa-solid-900.woff b/webui-src/app/assets/webfonts/fa-solid-900.woff
similarity index 100%
rename from webui-src/assets/webfonts/fa-solid-900.woff
rename to webui-src/app/assets/webfonts/fa-solid-900.woff
diff --git a/webui-src/assets/webfonts/fa-solid-900.woff2 b/webui-src/app/assets/webfonts/fa-solid-900.woff2
similarity index 100%
rename from webui-src/assets/webfonts/fa-solid-900.woff2
rename to webui-src/app/assets/webfonts/fa-solid-900.woff2
diff --git a/webui-src/app/widgets.js b/webui-src/app/components/widgets.js
similarity index 100%
rename from webui-src/app/widgets.js
rename to webui-src/app/components/widgets.js
diff --git a/webui-src/app/home.js b/webui-src/app/home.js
index 5baf9214..6592dad8 100644
--- a/webui-src/app/home.js
+++ b/webui-src/app/home.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const logo = () => {
   return {
diff --git a/webui-src/app/main.js b/webui-src/app/main.js
index fba7d8c4..94bc5fe7 100644
--- a/webui-src/app/main.js
+++ b/webui-src/app/main.js
@@ -2,15 +2,15 @@ const m = require('mithril');
 
 const login = require('login');
 const home = require('home');
-const network = require('network/network');
-const people = require('people/people_resolver');
-const chat = require('chat/chat');
-const mail = require('mail/mail_resolver');
-const files = require('files/files_resolver');
-const channels = require('channels/channels');
-const forums = require('forums/forums');
-const boards = require('boards/boards');
-const config = require('config/config_resolver');
+const network = require('pages/network/network');
+const people = require('pages/people/people_resolver');
+const chat = require('pages/chat/chat');
+const mail = require('pages/mail/mail_resolver');
+const files = require('pages/files/files_resolver');
+const channels = require('pages/channels/channels');
+const forums = require('pages/forums/forums');
+const boards = require('pages/boards/boards');
+const config = require('pages/config/config_resolver');
 
 const navIcon = {
   home: m('i.fas.fa-home.sidenav-icon'),
diff --git a/webui-src/app/boards/board_view.js b/webui-src/app/pages/boards/board_view.js
similarity index 99%
rename from webui-src/app/boards/board_view.js
rename to webui-src/app/pages/boards/board_view.js
index 7a69e67d..7d334a75 100644
--- a/webui-src/app/boards/board_view.js
+++ b/webui-src/app/pages/boards/board_view.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 const Data = util.Data;
 
 const messageGroups = ['Public', 'Restricted Circle', 'Restricted Node Group'];
diff --git a/webui-src/app/boards/boards.js b/webui-src/app/pages/boards/boards.js
similarity index 85%
rename from webui-src/app/boards/boards.js
rename to webui-src/app/pages/boards/boards.js
index e31c11ad..9a3733c3 100644
--- a/webui-src/app/boards/boards.js
+++ b/webui-src/app/pages/boards/boards.js
@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('boards/boards_util');
-const viewUtil = require('boards/board_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/boards/boards_util');
+const viewUtil = require('pages/boards/board_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getBoards = {
   All: [],
@@ -29,10 +29,10 @@ const getBoards = {
 };
 
 const sections = {
-  MyBoards: require('boards/my_boards'),
-  SubscribedBoards: require('boards/subscribed_boards'),
-  PopularBoards: require('boards/popular_boards'),
-  OtherBoards: require('boards/other_boards'),
+  MyBoards: require('pages/boards/my_boards'),
+  SubscribedBoards: require('pages/boards/subscribed_boards'),
+  PopularBoards: require('pages/boards/popular_boards'),
+  OtherBoards: require('pages/boards/other_boards'),
 };
 
 const Layout = () => {
diff --git a/webui-src/app/boards/boards_util.js b/webui-src/app/pages/boards/boards_util.js
similarity index 100%
rename from webui-src/app/boards/boards_util.js
rename to webui-src/app/pages/boards/boards_util.js
diff --git a/webui-src/app/boards/my_boards.js b/webui-src/app/pages/boards/my_boards.js
similarity index 93%
rename from webui-src/app/boards/my_boards.js
rename to webui-src/app/pages/boards/my_boards.js
index dd345e74..b57b316f 100644
--- a/webui-src/app/boards/my_boards.js
+++ b/webui-src/app/pages/boards/my_boards.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/boards/other_boards.js b/webui-src/app/pages/boards/other_boards.js
similarity index 93%
rename from webui-src/app/boards/other_boards.js
rename to webui-src/app/pages/boards/other_boards.js
index 685e67b4..2a700814 100644
--- a/webui-src/app/boards/other_boards.js
+++ b/webui-src/app/pages/boards/other_boards.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/boards/popular_boards.js b/webui-src/app/pages/boards/popular_boards.js
similarity index 93%
rename from webui-src/app/boards/popular_boards.js
rename to webui-src/app/pages/boards/popular_boards.js
index 752b24e2..5337366c 100644
--- a/webui-src/app/boards/popular_boards.js
+++ b/webui-src/app/pages/boards/popular_boards.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/boards/subscribed_boards.js b/webui-src/app/pages/boards/subscribed_boards.js
similarity index 93%
rename from webui-src/app/boards/subscribed_boards.js
rename to webui-src/app/pages/boards/subscribed_boards.js
index 812933ee..5b6f22b4 100644
--- a/webui-src/app/boards/subscribed_boards.js
+++ b/webui-src/app/pages/boards/subscribed_boards.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/channels/channel_view.js b/webui-src/app/pages/channels/channel_view.js
similarity index 98%
rename from webui-src/app/channels/channel_view.js
rename to webui-src/app/pages/channels/channel_view.js
index 81adda27..6865816b 100644
--- a/webui-src/app/channels/channel_view.js
+++ b/webui-src/app/pages/channels/channel_view.js
@@ -1,12 +1,12 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('channels/channels_util');
-const widget = require('widgets');
+const util = require('pages/channels/channels_util');
+const widget = require('components/widgets');
 const Data = util.Data;
-const peopleUtil = require('people/people_util');
-const sha1 = require('channels/sha1');
-const fileUtil = require('files/files_util');
-const fileDown = require('files/files_downloads');
+const peopleUtil = require('pages/people/people_util');
+const sha1 = require('pages/channels/sha1');
+const fileUtil = require('pages/files/files_util');
+const fileDown = require('pages/files/files_downloads');
 
 const filesUploadHashes = {
   // figure out a better way later.
diff --git a/webui-src/app/channels/channels.js b/webui-src/app/pages/channels/channels.js
similarity index 88%
rename from webui-src/app/channels/channels.js
rename to webui-src/app/pages/channels/channels.js
index d9dde399..8429a744 100644
--- a/webui-src/app/channels/channels.js
+++ b/webui-src/app/pages/channels/channels.js
@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('channels/channels_util');
-const viewUtil = require('channels/channel_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/channels/channels_util');
+const viewUtil = require('pages/channels/channel_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getChannels = {
   All: [],
@@ -35,10 +35,10 @@ const getChannels = {
 };
 
 const sections = {
-  MyChannels: require('channels/my_channels'),
-  SubscribedChannels: require('channels/subscribed_channels'),
-  PopularChannels: require('channels/popular_channels'),
-  OtherChannels: require('channels/other_channels'),
+  MyChannels: require('pages/channels/my_channels'),
+  SubscribedChannels: require('pages/channels/subscribed_channels'),
+  PopularChannels: require('pages/channels/popular_channels'),
+  OtherChannels: require('pages/channels/other_channels'),
 };
 
 const Layout = () => {
diff --git a/webui-src/app/channels/channels_util.js b/webui-src/app/pages/channels/channels_util.js
similarity index 100%
rename from webui-src/app/channels/channels_util.js
rename to webui-src/app/pages/channels/channels_util.js
diff --git a/webui-src/app/channels/my_channels.js b/webui-src/app/pages/channels/my_channels.js
similarity index 92%
rename from webui-src/app/channels/my_channels.js
rename to webui-src/app/pages/channels/my_channels.js
index 9978bab0..b66f0f65 100644
--- a/webui-src/app/channels/my_channels.js
+++ b/webui-src/app/pages/channels/my_channels.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/channels/other_channels.js b/webui-src/app/pages/channels/other_channels.js
similarity index 92%
rename from webui-src/app/channels/other_channels.js
rename to webui-src/app/pages/channels/other_channels.js
index cc8c5bf6..8863366d 100644
--- a/webui-src/app/channels/other_channels.js
+++ b/webui-src/app/pages/channels/other_channels.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/channels/popular_channels.js b/webui-src/app/pages/channels/popular_channels.js
similarity index 92%
rename from webui-src/app/channels/popular_channels.js
rename to webui-src/app/pages/channels/popular_channels.js
index db58754a..8212d7e5 100644
--- a/webui-src/app/channels/popular_channels.js
+++ b/webui-src/app/pages/channels/popular_channels.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/channels/sha1.js b/webui-src/app/pages/channels/sha1.js
similarity index 100%
rename from webui-src/app/channels/sha1.js
rename to webui-src/app/pages/channels/sha1.js
diff --git a/webui-src/app/channels/subscribed_channels.js b/webui-src/app/pages/channels/subscribed_channels.js
similarity index 92%
rename from webui-src/app/channels/subscribed_channels.js
rename to webui-src/app/pages/channels/subscribed_channels.js
index 0a28f01c..ed5bb77f 100644
--- a/webui-src/app/channels/subscribed_channels.js
+++ b/webui-src/app/pages/channels/subscribed_channels.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/chat/chat.js b/webui-src/app/pages/chat/chat.js
similarity index 99%
rename from webui-src/app/chat/chat.js
rename to webui-src/app/pages/chat/chat.js
index b9d903aa..64048eec 100644
--- a/webui-src/app/chat/chat.js
+++ b/webui-src/app/pages/chat/chat.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const peopleUtil = require('people/people_util');
+const peopleUtil = require('pages/people/people_util');
 
 // **************** utility functions ********************
 
diff --git a/webui-src/app/config/config_files.js b/webui-src/app/pages/config/config_files.js
similarity index 98%
rename from webui-src/app/config/config_files.js
rename to webui-src/app/pages/config/config_files.js
index b193c666..5b0daffc 100644
--- a/webui-src/app/config/config_files.js
+++ b/webui-src/app/pages/config/config_files.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('config/config_util');
+const util = require('pages/config/config_util');
 
 const SharedDirectories = () => {
   let directories = [];
@@ -230,4 +230,4 @@ const Layout = () => {
   };
 };
 
-module.exports = Layout;
\ No newline at end of file
+module.exports = Layout;
diff --git a/webui-src/app/config/config_mail.js b/webui-src/app/pages/config/config_mail.js
similarity index 98%
rename from webui-src/app/config/config_mail.js
rename to webui-src/app/pages/config/config_mail.js
index a71a9e6e..3db46a27 100644
--- a/webui-src/app/config/config_mail.js
+++ b/webui-src/app/pages/config/config_mail.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const util = require('config/config_util');
+const widget = require('components/widgets');
+const util = require('pages/config/config_util');
 
 const msgTagObj = {
   tagId: 100,
diff --git a/webui-src/app/config/config_network.js b/webui-src/app/pages/config/config_network.js
similarity index 99%
rename from webui-src/app/config/config_network.js
rename to webui-src/app/pages/config/config_network.js
index ffbb2d7e..4106448d 100644
--- a/webui-src/app/config/config_network.js
+++ b/webui-src/app/pages/config/config_network.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
 
-const util = require('config/config_util');
+const util = require('pages/config/config_util');
 
 const SetNwMode = () => {
   const networkModes = [
diff --git a/webui-src/app/config/config_node.js b/webui-src/app/pages/config/config_node.js
similarity index 100%
rename from webui-src/app/config/config_node.js
rename to webui-src/app/pages/config/config_node.js
diff --git a/webui-src/app/config/config_people.js b/webui-src/app/pages/config/config_people.js
similarity index 100%
rename from webui-src/app/config/config_people.js
rename to webui-src/app/pages/config/config_people.js
diff --git a/webui-src/app/config/config_resolver.js b/webui-src/app/pages/config/config_resolver.js
similarity index 51%
rename from webui-src/app/config/config_resolver.js
rename to webui-src/app/pages/config/config_resolver.js
index fe216278..33f31da2 100644
--- a/webui-src/app/config/config_resolver.js
+++ b/webui-src/app/pages/config/config_resolver.js
@@ -1,13 +1,13 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const sections = {
-  network: require('config/config_network'),
-  node: require('config/config_node'),
-  services: require('config/config_services'),
-  files: require('config/config_files'),
-  people: require('config/config_people'),
-  mail: require('config/config_mail'),
+  network: require('pages/config/config_network'),
+  node: require('pages/config/config_node'),
+  services: require('pages/config/config_services'),
+  files: require('pages/config/config_files'),
+  people: require('pages/config/config_people'),
+  mail: require('pages/config/config_mail'),
 };
 
 const Layout = {
diff --git a/webui-src/app/config/config_services.js b/webui-src/app/pages/config/config_services.js
similarity index 100%
rename from webui-src/app/config/config_services.js
rename to webui-src/app/pages/config/config_services.js
diff --git a/webui-src/app/config/config_util.js b/webui-src/app/pages/config/config_util.js
similarity index 100%
rename from webui-src/app/config/config_util.js
rename to webui-src/app/pages/config/config_util.js
diff --git a/webui-src/app/files/files_downloads.js b/webui-src/app/pages/files/files_downloads.js
similarity index 98%
rename from webui-src/app/files/files_downloads.js
rename to webui-src/app/pages/files/files_downloads.js
index 9a41a30c..1f0d4664 100644
--- a/webui-src/app/files/files_downloads.js
+++ b/webui-src/app/pages/files/files_downloads.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const widget = require('widgets');
+const util = require('pages/files/files_util');
+const widget = require('components/widgets');
 
 const Downloads = {
   strategies: {},
diff --git a/webui-src/app/files/files_manager.js b/webui-src/app/pages/files/files_manager.js
similarity index 98%
rename from webui-src/app/files/files_manager.js
rename to webui-src/app/pages/files/files_manager.js
index b8ff8cb2..760c61cb 100644
--- a/webui-src/app/files/files_manager.js
+++ b/webui-src/app/pages/files/files_manager.js
@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const futil = require('files/files_util');
-const cutil = require('config/config_util');
+const widget = require('components/widgets');
+const futil = require('pages/files/files_util');
+const cutil = require('pages/config/config_util');
 
 const shareManagerInfo = `
   This is a list of shared folders. You can add and remove folders using the buttons at the bottom.
diff --git a/webui-src/app/files/files_proxy.js b/webui-src/app/pages/files/files_proxy.js
similarity index 91%
rename from webui-src/app/files/files_proxy.js
rename to webui-src/app/pages/files/files_proxy.js
index 74ceeb9a..3ac4c280 100644
--- a/webui-src/app/files/files_proxy.js
+++ b/webui-src/app/pages/files/files_proxy.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const futil = require('files/files_util');
+const futil = require('pages/files/files_util');
 
 const fileProxyObj = futil.createProxy({}, () => {
   m.redraw();
diff --git a/webui-src/app/files/files_resolver.js b/webui-src/app/pages/files/files_resolver.js
similarity index 67%
rename from webui-src/app/files/files_resolver.js
rename to webui-src/app/pages/files/files_resolver.js
index 2c985be7..05cb1529 100644
--- a/webui-src/app/files/files_resolver.js
+++ b/webui-src/app/pages/files/files_resolver.js
@@ -1,13 +1,13 @@
 const m = require('mithril');
 
-const widget = require('widgets');
+const widget = require('components/widgets');
 
-const downloads = require('files/files_downloads');
-const uploads = require('files/files_uploads');
-const util = require('files/files_util');
-const search = require('files/files_search');
-const myfile = require('files/my_files');
-const friendfile = require('files/friends_files');
+const downloads = require('pages/files/files_downloads');
+const uploads = require('pages/files/files_uploads');
+const util = require('pages/files/files_util');
+const search = require('pages/files/files_search');
+const myfile = require('pages/files/my_files');
+const friendfile = require('pages/files/friends_files');
 
 const MyFiles = () => {
   return {
diff --git a/webui-src/app/files/files_search.js b/webui-src/app/pages/files/files_search.js
similarity index 96%
rename from webui-src/app/files/files_search.js
rename to webui-src/app/pages/files/files_search.js
index 0a3f9f04..5f848e8e 100644
--- a/webui-src/app/files/files_search.js
+++ b/webui-src/app/pages/files/files_search.js
@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const futil = require('files/files_util');
-const fproxy = require('files/files_proxy');
+const widget = require('components/widgets');
+const futil = require('pages/files/files_util');
+const fproxy = require('pages/files/files_proxy');
 
 let matchString = '';
 let currentItem = 0;
diff --git a/webui-src/app/files/files_uploads.js b/webui-src/app/pages/files/files_uploads.js
similarity index 98%
rename from webui-src/app/files/files_uploads.js
rename to webui-src/app/pages/files/files_uploads.js
index 7a301f66..34e705a7 100644
--- a/webui-src/app/files/files_uploads.js
+++ b/webui-src/app/pages/files/files_uploads.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
+const util = require('pages/files/files_util');
 
 const Uploads = {
   statusMap: {},
diff --git a/webui-src/app/files/files_util.js b/webui-src/app/pages/files/files_util.js
similarity index 99%
rename from webui-src/app/files/files_util.js
rename to webui-src/app/pages/files/files_util.js
index c773c384..cd242b33 100644
--- a/webui-src/app/files/files_util.js
+++ b/webui-src/app/pages/files/files_util.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const RS_FILE_CTRL_PAUSE = 0x00000100;
 const RS_FILE_CTRL_START = 0x00000200;
diff --git a/webui-src/app/files/friends_files.js b/webui-src/app/pages/files/friends_files.js
similarity index 97%
rename from webui-src/app/files/friends_files.js
rename to webui-src/app/pages/files/friends_files.js
index 3eb9af25..7510f8cb 100644
--- a/webui-src/app/files/friends_files.js
+++ b/webui-src/app/pages/files/friends_files.js
@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const widget = require('widgets');
-const fileDown = require('files/files_downloads');
+const util = require('pages/files/files_util');
+const widget = require('components/widgets');
+const fileDown = require('pages/files/files_downloads');
 
 function displayfiles() {
   const childrenList = []; // stores children details
diff --git a/webui-src/app/files/my_files.js b/webui-src/app/pages/files/my_files.js
similarity index 96%
rename from webui-src/app/files/my_files.js
rename to webui-src/app/pages/files/my_files.js
index d040aeb5..c93f92c9 100644
--- a/webui-src/app/files/my_files.js
+++ b/webui-src/app/pages/files/my_files.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const manager = require('files/files_manager');
+const util = require('pages/files/files_util');
+const manager = require('pages/files/files_manager');
 
 const DisplayFiles = () => {
   const childrenList = []; // stores children details
diff --git a/webui-src/app/forums/forum_view.js b/webui-src/app/pages/forums/forum_view.js
similarity index 99%
rename from webui-src/app/forums/forum_view.js
rename to webui-src/app/pages/forums/forum_view.js
index 68159df9..d7fa6970 100644
--- a/webui-src/app/forums/forum_view.js
+++ b/webui-src/app/pages/forums/forum_view.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('forums/forums_util');
-const peopleUtil = require('people/people_util');
+const util = require('pages/forums/forums_util');
+const peopleUtil = require('pages/people/people_util');
 const { updatedisplayforums } = require('./forums_util');
 
 function createforum() {
diff --git a/webui-src/app/forums/forums.js b/webui-src/app/pages/forums/forums.js
similarity index 85%
rename from webui-src/app/forums/forums.js
rename to webui-src/app/pages/forums/forums.js
index d3e66470..aff011ac 100644
--- a/webui-src/app/forums/forums.js
+++ b/webui-src/app/pages/forums/forums.js
@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('forums/forums_util');
-const viewUtil = require('forums/forum_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/forums/forums_util');
+const viewUtil = require('pages/forums/forum_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getForums = {
   All: [],
@@ -25,10 +25,10 @@ const getForums = {
   },
 };
 const sections = {
-  MyForums: require('forums/my_forums'),
-  SubscribedForums: require('forums/subscribed_forums'),
-  PopularForums: require('forums/popular_forums'),
-  OtherForums: require('forums/other_forums'),
+  MyForums: require('pages/forums/my_forums'),
+  SubscribedForums: require('pages/forums/subscribed_forums'),
+  PopularForums: require('pages/forums/popular_forums'),
+  OtherForums: require('pages/forums/other_forums'),
 };
 
 const Layout = () => {
diff --git a/webui-src/app/forums/forums_util.js b/webui-src/app/pages/forums/forums_util.js
similarity index 100%
rename from webui-src/app/forums/forums_util.js
rename to webui-src/app/pages/forums/forums_util.js
diff --git a/webui-src/app/forums/my_forums.js b/webui-src/app/pages/forums/my_forums.js
similarity index 93%
rename from webui-src/app/forums/my_forums.js
rename to webui-src/app/pages/forums/my_forums.js
index 344a5765..8b860422 100644
--- a/webui-src/app/forums/my_forums.js
+++ b/webui-src/app/pages/forums/my_forums.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/forums/other_forums.js b/webui-src/app/pages/forums/other_forums.js
similarity index 100%
rename from webui-src/app/forums/other_forums.js
rename to webui-src/app/pages/forums/other_forums.js
diff --git a/webui-src/app/forums/popular_forums.js b/webui-src/app/pages/forums/popular_forums.js
similarity index 93%
rename from webui-src/app/forums/popular_forums.js
rename to webui-src/app/pages/forums/popular_forums.js
index f3cc5919..3327f6df 100644
--- a/webui-src/app/forums/popular_forums.js
+++ b/webui-src/app/pages/forums/popular_forums.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/forums/subscribed_forums.js b/webui-src/app/pages/forums/subscribed_forums.js
similarity index 93%
rename from webui-src/app/forums/subscribed_forums.js
rename to webui-src/app/pages/forums/subscribed_forums.js
index 94119249..ce02504a 100644
--- a/webui-src/app/forums/subscribed_forums.js
+++ b/webui-src/app/pages/forums/subscribed_forums.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_attachment.js b/webui-src/app/pages/mail/mail_attachment.js
similarity index 97%
rename from webui-src/app/mail/mail_attachment.js
rename to webui-src/app/pages/mail/mail_attachment.js
index 38253649..b82baf78 100644
--- a/webui-src/app/mail/mail_attachment.js
+++ b/webui-src/app/pages/mail/mail_attachment.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   const files = [];
diff --git a/webui-src/app/mail/mail_compose.js b/webui-src/app/pages/mail/mail_compose.js
similarity index 98%
rename from webui-src/app/mail/mail_compose.js
rename to webui-src/app/pages/mail/mail_compose.js
index fbf8a58a..c7de6b57 100644
--- a/webui-src/app/mail/mail_compose.js
+++ b/webui-src/app/pages/mail/mail_compose.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const peopleUtil = require('people/people_util');
+const widget = require('components/widgets');
+const peopleUtil = require('pages/people/people_util');
 
 const Layout = () => {
   const Data = {
diff --git a/webui-src/app/mail/mail_draftbox.js b/webui-src/app/pages/mail/mail_draftbox.js
similarity index 91%
rename from webui-src/app/mail/mail_draftbox.js
rename to webui-src/app/pages/mail/mail_draftbox.js
index a68a2bf1..397de946 100644
--- a/webui-src/app/mail/mail_draftbox.js
+++ b/webui-src/app/pages/mail/mail_draftbox.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_important.js b/webui-src/app/pages/mail/mail_important.js
similarity index 91%
rename from webui-src/app/mail/mail_important.js
rename to webui-src/app/pages/mail/mail_important.js
index cfa1006f..ed7020cd 100644
--- a/webui-src/app/mail/mail_important.js
+++ b/webui-src/app/pages/mail/mail_important.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_inbox.js b/webui-src/app/pages/mail/mail_inbox.js
similarity index 91%
rename from webui-src/app/mail/mail_inbox.js
rename to webui-src/app/pages/mail/mail_inbox.js
index 4cfa3901..ca9bff0f 100644
--- a/webui-src/app/mail/mail_inbox.js
+++ b/webui-src/app/pages/mail/mail_inbox.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_later.js b/webui-src/app/pages/mail/mail_later.js
similarity index 91%
rename from webui-src/app/mail/mail_later.js
rename to webui-src/app/pages/mail/mail_later.js
index 97e49ae4..e508253b 100644
--- a/webui-src/app/mail/mail_later.js
+++ b/webui-src/app/pages/mail/mail_later.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_outbox.js b/webui-src/app/pages/mail/mail_outbox.js
similarity index 91%
rename from webui-src/app/mail/mail_outbox.js
rename to webui-src/app/pages/mail/mail_outbox.js
index 481e22b9..cb813278 100644
--- a/webui-src/app/mail/mail_outbox.js
+++ b/webui-src/app/pages/mail/mail_outbox.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_personal.js b/webui-src/app/pages/mail/mail_personal.js
similarity index 91%
rename from webui-src/app/mail/mail_personal.js
rename to webui-src/app/pages/mail/mail_personal.js
index db7f681d..7d90103c 100644
--- a/webui-src/app/mail/mail_personal.js
+++ b/webui-src/app/pages/mail/mail_personal.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_resolver.js b/webui-src/app/pages/mail/mail_resolver.js
similarity index 74%
rename from webui-src/app/mail/mail_resolver.js
rename to webui-src/app/pages/mail/mail_resolver.js
index 8cafa76b..a8513651 100644
--- a/webui-src/app/mail/mail_resolver.js
+++ b/webui-src/app/pages/mail/mail_resolver.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('mail/mail_util');
-const compose = require('mail/mail_compose');
+const util = require('pages/mail/mail_util');
+const compose = require('pages/mail/mail_compose');
 
 const Messages = {
   all: [],
@@ -22,24 +22,24 @@ const Messages = {
   load() {
     rs.rsJsonApiRequest('/rsMsgs/getMessageSummaries', { box: util.BOX_ALL }, (data) => {
       Messages.all = data.msgList;
-      Messages.inbox = Messages.all.filter(
-        (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_INBOX
-      );
-      Messages.sent = Messages.all.filter(
-        (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_SENTBOX
-      );
-      Messages.outbox = Messages.all.filter(
-        (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_OUTBOX
-      );
-      Messages.drafts = Messages.all.filter(
-        (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_DRAFTBOX
-      );
-      Messages.trash = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_TRASH);
-      Messages.starred = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_STAR);
-      Messages.system = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_SYSTEM);
-      Messages.spam = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_SPAM);
+      Messages.inbox = Messages.all
+        .filter((msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_INBOX)
+        .reverse();
+      Messages.sent = Messages.all
+        .filter((msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_SENTBOX)
+        .reverse();
+      Messages.outbox = Messages.all
+        .filter((msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_OUTBOX)
+        .reverse();
+      Messages.drafts = Messages.all
+        .filter((msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_DRAFTBOX)
+        .reverse();
+      Messages.trash = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_TRASH).reverse();
+      Messages.starred = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_STAR).reverse();
+      Messages.system = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_SYSTEM).reverse();
+      Messages.spam = Messages.all.filter((msg) => msg.msgflags & util.RS_MSG_SPAM).reverse();
 
-      Messages.attachment = Messages.all.filter((msg) => msg.count);
+      Messages.attachment = Messages.all.filter((msg) => msg.count).reverse();
 
       // Messages.important = Messages.all.filter(
       //   (msg) => msg.msgflags & util.RS_MSGTAGTYPE_IMPORTANT
@@ -53,22 +53,22 @@ const Messages = {
 };
 
 const sections = {
-  inbox: require('mail/mail_inbox'),
-  outbox: require('mail/mail_outbox'),
-  drafts: require('mail/mail_draftbox'),
-  sent: require('mail/mail_sentbox'),
-  trash: require('mail/mail_trashbox'),
+  inbox: require('pages/mail/mail_inbox'),
+  outbox: require('pages/mail/mail_outbox'),
+  drafts: require('pages/mail/mail_draftbox'),
+  sent: require('pages/mail/mail_sentbox'),
+  trash: require('pages/mail/mail_trashbox'),
 };
 const sectionsquickview = {
-  starred: require('mail/mail_starred'),
-  system: require('mail/mail_system'),
-  spam: require('mail/mail_spam'),
-  attachment: require('mail/mail_attachment'),
-  important: require('mail/mail_important'),
-  work: require('mail/mail_work'),
-  todo: require('mail/mail_todo'),
-  later: require('mail/mail_later'),
-  personal: require('mail/mail_personal'),
+  starred: require('pages/mail/mail_starred'),
+  system: require('pages/mail/mail_system'),
+  spam: require('pages/mail/mail_spam'),
+  attachment: require('pages/mail/mail_attachment'),
+  important: require('pages/mail/mail_important'),
+  work: require('pages/mail/mail_work'),
+  todo: require('pages/mail/mail_todo'),
+  later: require('pages/mail/mail_later'),
+  personal: require('pages/mail/mail_personal'),
 };
 const tagselect = {
   showval: 'Tags',
diff --git a/webui-src/app/mail/mail_sentbox.js b/webui-src/app/pages/mail/mail_sentbox.js
similarity index 91%
rename from webui-src/app/mail/mail_sentbox.js
rename to webui-src/app/pages/mail/mail_sentbox.js
index 7320a90c..4a15637d 100644
--- a/webui-src/app/mail/mail_sentbox.js
+++ b/webui-src/app/pages/mail/mail_sentbox.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_spam.js b/webui-src/app/pages/mail/mail_spam.js
similarity index 91%
rename from webui-src/app/mail/mail_spam.js
rename to webui-src/app/pages/mail/mail_spam.js
index f038cf71..da4d6afe 100644
--- a/webui-src/app/mail/mail_spam.js
+++ b/webui-src/app/pages/mail/mail_spam.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_starred.js b/webui-src/app/pages/mail/mail_starred.js
similarity index 91%
rename from webui-src/app/mail/mail_starred.js
rename to webui-src/app/pages/mail/mail_starred.js
index ef4cc3e2..c0bb0077 100644
--- a/webui-src/app/mail/mail_starred.js
+++ b/webui-src/app/pages/mail/mail_starred.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_system.js b/webui-src/app/pages/mail/mail_system.js
similarity index 91%
rename from webui-src/app/mail/mail_system.js
rename to webui-src/app/pages/mail/mail_system.js
index 8439184a..b8ef4bd2 100644
--- a/webui-src/app/mail/mail_system.js
+++ b/webui-src/app/pages/mail/mail_system.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_todo.js b/webui-src/app/pages/mail/mail_todo.js
similarity index 91%
rename from webui-src/app/mail/mail_todo.js
rename to webui-src/app/pages/mail/mail_todo.js
index 8f5daa31..17a19058 100644
--- a/webui-src/app/mail/mail_todo.js
+++ b/webui-src/app/pages/mail/mail_todo.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_trashbox.js b/webui-src/app/pages/mail/mail_trashbox.js
similarity index 91%
rename from webui-src/app/mail/mail_trashbox.js
rename to webui-src/app/pages/mail/mail_trashbox.js
index 03846208..d3a3e251 100644
--- a/webui-src/app/mail/mail_trashbox.js
+++ b/webui-src/app/pages/mail/mail_trashbox.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/mail/mail_util.js b/webui-src/app/pages/mail/mail_util.js
similarity index 98%
rename from webui-src/app/mail/mail_util.js
rename to webui-src/app/pages/mail/mail_util.js
index 7431403a..e4aaa010 100644
--- a/webui-src/app/mail/mail_util.js
+++ b/webui-src/app/pages/mail/mail_util.js
@@ -1,9 +1,9 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const widget = require('widgets');
-const peopleUtil = require('people/people_util');
-const compose = require('mail/mail_compose');
+const util = require('pages/files/files_util');
+const widget = require('components/widgets');
+const peopleUtil = require('pages/people/people_util');
+const compose = require('pages/mail/mail_compose');
 
 // rsmsgs.h
 const RS_MSG_BOXMASK = 0x000f;
diff --git a/webui-src/app/mail/mail_work.js b/webui-src/app/pages/mail/mail_work.js
similarity index 91%
rename from webui-src/app/mail/mail_work.js
rename to webui-src/app/pages/mail/mail_work.js
index 220347c0..b8148c77 100644
--- a/webui-src/app/mail/mail_work.js
+++ b/webui-src/app/pages/mail/mail_work.js
@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('mail/mail_util');
+const util = require('pages/mail/mail_util');
 
 const Layout = () => {
   return {
diff --git a/webui-src/app/network/network.js b/webui-src/app/pages/network/network.js
similarity index 97%
rename from webui-src/app/network/network.js
rename to webui-src/app/pages/network/network.js
index 2b3d494e..a0edc395 100644
--- a/webui-src/app/network/network.js
+++ b/webui-src/app/pages/network/network.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const Data = require('network/network_data');
+const widget = require('components/widgets');
+const Data = require('pages/network/network_data');
 
 const ConfirmRemove = () => {
   return {
diff --git a/webui-src/app/network/network_data.js b/webui-src/app/pages/network/network_data.js
similarity index 100%
rename from webui-src/app/network/network_data.js
rename to webui-src/app/pages/network/network_data.js
diff --git a/webui-src/app/people/people.js b/webui-src/app/pages/people/people.js
similarity index 90%
rename from webui-src/app/people/people.js
rename to webui-src/app/pages/people/people.js
index 4c64942a..e0f2f790 100644
--- a/webui-src/app/people/people.js
+++ b/webui-src/app/pages/people/people.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
 
-const peopleUtil = require('people/people_util');
+const peopleUtil = require('pages/people/people_util');
 
 const AllContacts = () => {
   const list = peopleUtil.sortUsers(rs.userList.users);
diff --git a/webui-src/app/people/people_own_contacts.js b/webui-src/app/pages/people/people_own_contacts.js
similarity index 90%
rename from webui-src/app/people/people_own_contacts.js
rename to webui-src/app/pages/people/people_own_contacts.js
index 3787f84f..9a3c477f 100644
--- a/webui-src/app/people/people_own_contacts.js
+++ b/webui-src/app/pages/people/people_own_contacts.js
@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const peopleUtil = require('people/people_util');
+const peopleUtil = require('pages/people/people_util');
 
 const MyContacts = () => {
   const list = peopleUtil.contactlist(rs.userList.users);
diff --git a/webui-src/app/people/people_ownids.js b/webui-src/app/pages/people/people_ownids.js
similarity index 98%
rename from webui-src/app/people/people_ownids.js
rename to webui-src/app/pages/people/people_ownids.js
index 9f179460..468d4bc7 100644
--- a/webui-src/app/people/people_ownids.js
+++ b/webui-src/app/pages/people/people_ownids.js
@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const peopleUtil = require('people/people_util');
+const widget = require('components/widgets');
+const peopleUtil = require('pages/people/people_util');
 
 const SignedIdentiy = () => {
   let passphase = '';
diff --git a/webui-src/app/people/people_resolver.js b/webui-src/app/pages/people/people_resolver.js
similarity index 64%
rename from webui-src/app/people/people_resolver.js
rename to webui-src/app/pages/people/people_resolver.js
index 07f5efc0..40c26a2f 100644
--- a/webui-src/app/people/people_resolver.js
+++ b/webui-src/app/pages/people/people_resolver.js
@@ -1,10 +1,10 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const sections = {
-  OwnIdentity: require('people/people_ownids'),
-  MyContacts: require('people/people_own_contacts'),
-  All: require('people/people'),
+  OwnIdentity: require('pages/people/people_ownids'),
+  MyContacts: require('pages/people/people_own_contacts'),
+  All: require('pages/people/people'),
 };
 
 const Layout = {
diff --git a/webui-src/app/people/people_util.js b/webui-src/app/pages/people/people_util.js
similarity index 100%
rename from webui-src/app/people/people_util.js
rename to webui-src/app/pages/people/people_util.js
diff --git a/webui-src/make-src/build.bat b/webui-src/make-src/build.bat
index 62f4e0ea..efc44110 100644
--- a/webui-src/make-src/build.bat
+++ b/webui-src/make-src/build.bat
@@ -40,7 +40,7 @@ for /R %%F in (*.js) do call :addfile-js "%basefolder%" "%%F"
 popd
 
 echo copying assets folder
-xcopy /s %src%\assets\ %publicdest%
+xcopy /s %src%\app\assets\ %publicdest%
 
 echo "### WebUI build complete ###"
 
diff --git a/webui-src/make-src/build.sh b/webui-src/make-src/build.sh
index 9a7bef15..82bef70c 100755
--- a/webui-src/make-src/build.sh
+++ b/webui-src/make-src/build.sh
@@ -55,7 +55,7 @@ if [ "$2" = "" ]||[ "$2" = "app.js" ]; then
 fi
 
 echo copying assets folder
-cp -r $src/assets/* $publicdest/
+cp -r $src/app/assets/* $publicdest/
 
 if [ "$2" != "" ]&&[ "$3" != "" ]; then
 	if [ ! -d "$3/webui" ]; then