diff --git a/onionr/static-data/default-plugins/chat/settings.py b/onionr/etc/__init__.py
similarity index 100%
rename from onionr/static-data/default-plugins/chat/settings.py
rename to onionr/etc/__init__.py
diff --git a/onionr/httpapi/insertblock.py b/onionr/httpapi/insertblock.py
index 3680ee4d..9866dbea 100644
--- a/onionr/httpapi/insertblock.py
+++ b/onionr/httpapi/insertblock.py
@@ -50,7 +50,7 @@ def client_api_insert_block():
     try:
         if bData['encrypt']:
             to = bData['to'].strip()
-            if " " in to:
+            if "-" in to:
                 to = mnemonickeys.get_base32(to)
             encrypt = True
             encryptType = 'asym'
diff --git a/onionr/httpapi/miscclientapi/staticfiles.py b/onionr/httpapi/miscclientapi/staticfiles.py
index 3582ed24..abfc566a 100644
--- a/onionr/httpapi/miscclientapi/staticfiles.py
+++ b/onionr/httpapi/miscclientapi/staticfiles.py
@@ -28,7 +28,7 @@ mimetypes.add_type('text/css', '.css')
 
 static_files_bp = Blueprint('staticfiles', __name__)
 
-root = os.getcwd() + '/static-data/www/' # should be set to onionr install directory from onionr startup
+root = os.path.dirname(os.path.realpath(__file__)) + '/../../../static-data/www/' # should be set to onionr install directory from onionr startup
 
 @static_files_bp.route('/chat/', endpoint='chatIndex')
 def chat_index():
diff --git a/onionr/httpapi/miscpublicapi/endpoints.py b/onionr/httpapi/miscpublicapi/endpoints.py
index 62d49397..6c5d1da7 100644
--- a/onionr/httpapi/miscpublicapi/endpoints.py
+++ b/onionr/httpapi/miscpublicapi/endpoints.py
@@ -31,7 +31,7 @@ class PublicEndpoints:
         def banner():
             # Display a bit of information to people who visit a node address in their browser
             try:
-                with open('static-data/index.html', 'r') as html:
+                with open('../static-data/index.html', 'r') as html:
                     resp = Response(html.read(), mimetype='text/html')
             except FileNotFoundError:
                 resp = Response("")
diff --git a/onionr/onionrservices/warden/__init__.py b/onionr/onionrservices/warden/__init__.py
index 7173f75c..58058370 100644
--- a/onionr/onionrservices/warden/__init__.py
+++ b/onionr/onionrservices/warden/__init__.py
@@ -1,3 +1,3 @@
 from . import client # Client connection warden. Monitors & validates connection security.
 from . import server # Server connection warden. Monitors and validates server security
-from . import watchdog # Watchdog. Oversees running services for statistic collection and TTL control
+#from . import watchdog # Watchdog. Oversees running services for statistic collection and TTL control
diff --git a/onionr/onionrsetup/defaultpluginsetup.py b/onionr/onionrsetup/defaultpluginsetup.py
index 4509e072..422248f2 100644
--- a/onionr/onionrsetup/defaultpluginsetup.py
+++ b/onionr/onionrsetup/defaultpluginsetup.py
@@ -21,13 +21,14 @@ import os, shutil
 
 import onionrplugins as plugins
 import logger
+import filepaths
 
 def setup_default_plugins():
     # Copy default plugins into plugins folder
     if not os.path.exists(plugins.get_plugins_folder()):
-        if os.path.exists('static-data/default-plugins/'):
-            names = [f for f in os.listdir("static-data/default-plugins/")]
-            shutil.copytree('static-data/default-plugins/', plugins.get_plugins_folder())
+        if os.path.exists('../static-data/default-plugins/'):
+            names = [f for f in os.listdir("../static-data/default-plugins/")]
+            shutil.copytree('../static-data/default-plugins/', plugins.get_plugins_folder())
 
             # Enable plugins
             for name in names:
diff --git a/onionr/static-data/default_plugin.py b/onionr/static-data/default_plugin.py
deleted file mode 100755
index 7704d32b..00000000
--- a/onionr/static-data/default_plugin.py
+++ /dev/null
@@ -1,44 +0,0 @@
-'''
-    $name plugin template file.
-    Generated on $date by $user.
-'''
-
-# Imports some useful libraries
-import logger, config
-from onionrblockapi import Block
-
-plugin_name = '$name'
-
-def on_init(api, data = None):
-    '''
-        This event is called after Onionr is initialized, but before the command
-        inputted is executed. Could be called when daemon is starting or when
-        just the client is running.
-    '''
-
-    # Doing this makes it so that the other functions can access the api object
-    # by simply referencing the variable `pluginapi`.
-    global pluginapi
-    pluginapi = api
-
-    return
-
-def on_start(api, data = None):
-    '''
-        This event can be called for multiple reasons:
-        1) The daemon is starting
-        2) The user called `onionr --start-plugins` or `onionr --reload-plugins`
-        3) For whatever reason, the plugins are reloading
-    '''
-
-    return
-
-def on_stop(api, data = None):
-    '''
-        This event can be called for multiple reasons:
-        1) The daemon is stopping
-        2) The user called `onionr --stop-plugins` or `onionr --reload-plugins`
-        3) For whatever reason, the plugins are reloading
-    '''
-
-    return
diff --git a/onionr/utils/readstatic.py b/onionr/utils/readstatic.py
index 55cf1340..c61fd0c3 100644
--- a/onionr/utils/readstatic.py
+++ b/onionr/utils/readstatic.py
@@ -21,7 +21,7 @@
 from typing import Union
 import os
 def get_static_dir()->str:
-    return os.path.dirname(os.path.realpath(__file__)) + '/../static-data/'
+    return os.path.dirname(os.path.realpath(__file__)) + '/../../static-data/'
 
 def read_static(file:str, ret_bin:bool=False)->Union[str, bytes]:
     static_file = get_static_dir() + file
diff --git a/onionr/static-data/README.md b/static-data/README.md
similarity index 100%
rename from onionr/static-data/README.md
rename to static-data/README.md
diff --git a/onionr/static-data/bootstrap-nodes.txt b/static-data/bootstrap-nodes.txt
similarity index 100%
rename from onionr/static-data/bootstrap-nodes.txt
rename to static-data/bootstrap-nodes.txt
diff --git a/onionr/static-data/connect-check.txt b/static-data/connect-check.txt
similarity index 100%
rename from onionr/static-data/connect-check.txt
rename to static-data/connect-check.txt
diff --git a/onionr/static-data/default-plugins/chat/controlapi.py b/static-data/default-plugins/chat/controlapi.py
similarity index 100%
rename from onionr/static-data/default-plugins/chat/controlapi.py
rename to static-data/default-plugins/chat/controlapi.py
diff --git a/onionr/static-data/default-plugins/chat/info.json b/static-data/default-plugins/chat/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/chat/info.json
rename to static-data/default-plugins/chat/info.json
diff --git a/onionr/static-data/default-plugins/chat/main.py b/static-data/default-plugins/chat/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/chat/main.py
rename to static-data/default-plugins/chat/main.py
diff --git a/onionr/static-data/default-plugins/chat/peerserver.py b/static-data/default-plugins/chat/peerserver.py
similarity index 100%
rename from onionr/static-data/default-plugins/chat/peerserver.py
rename to static-data/default-plugins/chat/peerserver.py
diff --git a/onionr/static-data/www/profiles/profiles.js b/static-data/default-plugins/chat/settings.py
old mode 100755
new mode 100644
similarity index 100%
rename from onionr/static-data/www/profiles/profiles.js
rename to static-data/default-plugins/chat/settings.py
diff --git a/onionr/static-data/default-plugins/encrypt/info.json b/static-data/default-plugins/encrypt/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/encrypt/info.json
rename to static-data/default-plugins/encrypt/info.json
diff --git a/onionr/static-data/default-plugins/encrypt/main.py b/static-data/default-plugins/encrypt/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/encrypt/main.py
rename to static-data/default-plugins/encrypt/main.py
diff --git a/onionr/static-data/default-plugins/flow/flowapi.py b/static-data/default-plugins/flow/flowapi.py
similarity index 100%
rename from onionr/static-data/default-plugins/flow/flowapi.py
rename to static-data/default-plugins/flow/flowapi.py
diff --git a/onionr/static-data/default-plugins/flow/info.json b/static-data/default-plugins/flow/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/flow/info.json
rename to static-data/default-plugins/flow/info.json
diff --git a/onionr/static-data/default-plugins/flow/main.py b/static-data/default-plugins/flow/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/flow/main.py
rename to static-data/default-plugins/flow/main.py
diff --git a/onionr/static-data/default-plugins/metadataprocessor/info.json b/static-data/default-plugins/metadataprocessor/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/metadataprocessor/info.json
rename to static-data/default-plugins/metadataprocessor/info.json
diff --git a/onionr/static-data/default-plugins/metadataprocessor/main.py b/static-data/default-plugins/metadataprocessor/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/metadataprocessor/main.py
rename to static-data/default-plugins/metadataprocessor/main.py
diff --git a/onionr/static-data/default-plugins/pms/info.json b/static-data/default-plugins/pms/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/pms/info.json
rename to static-data/default-plugins/pms/info.json
diff --git a/onionr/static-data/default-plugins/pms/loadinbox.py b/static-data/default-plugins/pms/loadinbox.py
similarity index 100%
rename from onionr/static-data/default-plugins/pms/loadinbox.py
rename to static-data/default-plugins/pms/loadinbox.py
diff --git a/onionr/static-data/default-plugins/pms/mailapi.py b/static-data/default-plugins/pms/mailapi.py
similarity index 100%
rename from onionr/static-data/default-plugins/pms/mailapi.py
rename to static-data/default-plugins/pms/mailapi.py
diff --git a/onionr/static-data/default-plugins/pms/main.py b/static-data/default-plugins/pms/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/pms/main.py
rename to static-data/default-plugins/pms/main.py
diff --git a/onionr/static-data/default-plugins/pms/sentboxdb.py b/static-data/default-plugins/pms/sentboxdb.py
similarity index 100%
rename from onionr/static-data/default-plugins/pms/sentboxdb.py
rename to static-data/default-plugins/pms/sentboxdb.py
diff --git a/onionr/static-data/default-plugins/searchengine/info.json b/static-data/default-plugins/searchengine/info.json
similarity index 100%
rename from onionr/static-data/default-plugins/searchengine/info.json
rename to static-data/default-plugins/searchengine/info.json
diff --git a/onionr/static-data/default-plugins/searchengine/main.py b/static-data/default-plugins/searchengine/main.py
similarity index 100%
rename from onionr/static-data/default-plugins/searchengine/main.py
rename to static-data/default-plugins/searchengine/main.py
diff --git a/onionr/static-data/default_config.json b/static-data/default_config.json
similarity index 100%
rename from onionr/static-data/default_config.json
rename to static-data/default_config.json
diff --git a/static-data/default_plugin.py b/static-data/default_plugin.py
new file mode 100755
index 00000000..4eff077b
--- /dev/null
+++ b/static-data/default_plugin.py
@@ -0,0 +1,16 @@
+'''
+    $name plugin template file.
+    Generated on $date by $user.
+'''
+
+plugin_name = '$name'
+
+def on_init(api, data = None):
+    '''
+        This event is called after Onionr is initialized, but before the command
+        inputted is executed. Could be called when daemon is starting or when
+        just the client is running.
+    '''
+
+    pluginapi = api
+
diff --git a/onionr/static-data/header.txt b/static-data/header.txt
similarity index 100%
rename from onionr/static-data/header.txt
rename to static-data/header.txt
diff --git a/onionr/static-data/index.html b/static-data/index.html
similarity index 100%
rename from onionr/static-data/index.html
rename to static-data/index.html
diff --git a/onionr/static-data/www/board/autorefresh.js b/static-data/www/board/autorefresh.js
similarity index 100%
rename from onionr/static-data/www/board/autorefresh.js
rename to static-data/www/board/autorefresh.js
diff --git a/onionr/static-data/www/board/board.js b/static-data/www/board/board.js
similarity index 100%
rename from onionr/static-data/www/board/board.js
rename to static-data/www/board/board.js
diff --git a/onionr/static-data/www/board/index.html b/static-data/www/board/index.html
similarity index 100%
rename from onionr/static-data/www/board/index.html
rename to static-data/www/board/index.html
diff --git a/onionr/static-data/www/board/sethumanreadable.js b/static-data/www/board/sethumanreadable.js
similarity index 95%
rename from onionr/static-data/www/board/sethumanreadable.js
rename to static-data/www/board/sethumanreadable.js
index 6ebd3eb4..0d8f6eee 100644
--- a/onionr/static-data/www/board/sethumanreadable.js
+++ b/static-data/www/board/sethumanreadable.js
@@ -35,5 +35,5 @@ function setHumanReadableIDOnPost(el, key){
         })
         return
     }
-    el.innerText = humanReadableKeys[key].split(' ').slice(0, 3).join(' ')
+    el.innerText = humanReadableKeys[key].split('-').slice(0, 3).join(' ')
 }
\ No newline at end of file
diff --git a/onionr/static-data/www/board/theme.css b/static-data/www/board/theme.css
similarity index 100%
rename from onionr/static-data/www/board/theme.css
rename to static-data/www/board/theme.css
diff --git a/onionr/static-data/www/chat/css/convos.css b/static-data/www/chat/css/convos.css
similarity index 100%
rename from onionr/static-data/www/chat/css/convos.css
rename to static-data/www/chat/css/convos.css
diff --git a/onionr/static-data/www/chat/index.html b/static-data/www/chat/index.html
similarity index 100%
rename from onionr/static-data/www/chat/index.html
rename to static-data/www/chat/index.html
diff --git a/onionr/static-data/www/chat/js/change-convo.js b/static-data/www/chat/js/change-convo.js
similarity index 100%
rename from onionr/static-data/www/chat/js/change-convo.js
rename to static-data/www/chat/js/change-convo.js
diff --git a/onionr/static-data/www/chat/js/main.js b/static-data/www/chat/js/main.js
similarity index 100%
rename from onionr/static-data/www/chat/js/main.js
rename to static-data/www/chat/js/main.js
diff --git a/onionr/static-data/www/chat/js/message-feed.js b/static-data/www/chat/js/message-feed.js
similarity index 100%
rename from onionr/static-data/www/chat/js/message-feed.js
rename to static-data/www/chat/js/message-feed.js
diff --git a/onionr/static-data/www/chat/js/messages.js b/static-data/www/chat/js/messages.js
similarity index 100%
rename from onionr/static-data/www/chat/js/messages.js
rename to static-data/www/chat/js/messages.js
diff --git a/onionr/static-data/www/chat/js/resizes.js b/static-data/www/chat/js/resizes.js
similarity index 100%
rename from onionr/static-data/www/chat/js/resizes.js
rename to static-data/www/chat/js/resizes.js
diff --git a/onionr/static-data/www/friends/friends.js b/static-data/www/friends/friends.js
similarity index 100%
rename from onionr/static-data/www/friends/friends.js
rename to static-data/www/friends/friends.js
diff --git a/onionr/static-data/www/friends/index.html b/static-data/www/friends/index.html
similarity index 100%
rename from onionr/static-data/www/friends/index.html
rename to static-data/www/friends/index.html
diff --git a/onionr/static-data/www/friends/style.css b/static-data/www/friends/style.css
similarity index 100%
rename from onionr/static-data/www/friends/style.css
rename to static-data/www/friends/style.css
diff --git a/onionr/static-data/www/mail/index.html b/static-data/www/mail/index.html
similarity index 100%
rename from onionr/static-data/www/mail/index.html
rename to static-data/www/mail/index.html
diff --git a/onionr/static-data/www/mail/mail.css b/static-data/www/mail/mail.css
similarity index 100%
rename from onionr/static-data/www/mail/mail.css
rename to static-data/www/mail/mail.css
diff --git a/onionr/static-data/www/mail/mail.js b/static-data/www/mail/mail.js
similarity index 100%
rename from onionr/static-data/www/mail/mail.js
rename to static-data/www/mail/mail.js
diff --git a/onionr/static-data/www/mail/sendmail.js b/static-data/www/mail/sendmail.js
similarity index 97%
rename from onionr/static-data/www/mail/sendmail.js
rename to static-data/www/mail/sendmail.js
index 88f6c6d8..7ecd878b 100755
--- a/onionr/static-data/www/mail/sendmail.js
+++ b/static-data/www/mail/sendmail.js
@@ -58,7 +58,7 @@ sendForm.onsubmit = function(){
             return false
         }
     }
-    if (! to.value.includes(" ") && to.value.length !== 56 && to.value.length !== 52){
+    if (! to.value.includes("-") && to.value.length !== 56 && to.value.length !== 52){
         PNotify.error({
             text: 'User ID is not valid'
         })
diff --git a/onionr/static-data/www/mail/sethumanreadable.js b/static-data/www/mail/sethumanreadable.js
similarity index 100%
rename from onionr/static-data/www/mail/sethumanreadable.js
rename to static-data/www/mail/sethumanreadable.js
diff --git a/onionr/static-data/www/private/images/made-with-bulma--dark.png b/static-data/www/private/images/made-with-bulma--dark.png
similarity index 100%
rename from onionr/static-data/www/private/images/made-with-bulma--dark.png
rename to static-data/www/private/images/made-with-bulma--dark.png
diff --git a/onionr/static-data/www/private/images/python-powered.png b/static-data/www/private/images/python-powered.png
similarity index 100%
rename from onionr/static-data/www/private/images/python-powered.png
rename to static-data/www/private/images/python-powered.png
diff --git a/onionr/static-data/www/private/index.html b/static-data/www/private/index.html
similarity index 100%
rename from onionr/static-data/www/private/index.html
rename to static-data/www/private/index.html
diff --git a/onionr/static-data/www/private/js/console.js b/static-data/www/private/js/console.js
similarity index 100%
rename from onionr/static-data/www/private/js/console.js
rename to static-data/www/private/js/console.js
diff --git a/onionr/static-data/www/private/main.css b/static-data/www/private/main.css
similarity index 100%
rename from onionr/static-data/www/private/main.css
rename to static-data/www/private/main.css
diff --git a/onionr/static-data/www/profiles/index.html b/static-data/www/profiles/index.html
similarity index 100%
rename from onionr/static-data/www/profiles/index.html
rename to static-data/www/profiles/index.html
diff --git a/static-data/www/profiles/profiles.js b/static-data/www/profiles/profiles.js
new file mode 100755
index 00000000..e69de29b
diff --git a/onionr/static-data/www/shared/about.html b/static-data/www/shared/about.html
similarity index 100%
rename from onionr/static-data/www/shared/about.html
rename to static-data/www/shared/about.html
diff --git a/onionr/static-data/www/shared/base32.js b/static-data/www/shared/base32.js
similarity index 100%
rename from onionr/static-data/www/shared/base32.js
rename to static-data/www/shared/base32.js
diff --git a/onionr/static-data/www/shared/configeditor.js b/static-data/www/shared/configeditor.js
similarity index 100%
rename from onionr/static-data/www/shared/configeditor.js
rename to static-data/www/shared/configeditor.js
diff --git a/onionr/static-data/www/shared/direct-connections.js b/static-data/www/shared/direct-connections.js
similarity index 100%
rename from onionr/static-data/www/shared/direct-connections.js
rename to static-data/www/shared/direct-connections.js
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/LICENSE.txt b/static-data/www/shared/fontawesome-free-5.10.2/LICENSE.txt
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/LICENSE.txt
rename to static-data/www/shared/fontawesome-free-5.10.2/LICENSE.txt
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/css/all.min.css b/static-data/www/shared/fontawesome-free-5.10.2/css/all.min.css
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/css/all.min.css
rename to static-data/www/shared/fontawesome-free-5.10.2/css/all.min.css
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.eot b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.eot
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.eot
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.eot
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.svg b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.svg
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.svg
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.svg
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.ttf b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.ttf
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.ttf
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.ttf
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff2 b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff2
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff2
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-brands-400.woff2
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.eot b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.eot
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.eot
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.eot
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.svg b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.svg
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.svg
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.svg
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.ttf b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.ttf
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.ttf
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.ttf
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff2 b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff2
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff2
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-regular-400.woff2
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.eot b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.eot
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.eot
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.eot
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.svg b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.svg
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.svg
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.svg
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.ttf b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.ttf
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.ttf
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.ttf
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff
diff --git a/onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff2 b/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff2
similarity index 100%
rename from onionr/static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff2
rename to static-data/www/shared/fontawesome-free-5.10.2/webfonts/fa-solid-900.woff2
diff --git a/onionr/static-data/www/shared/identicon.js b/static-data/www/shared/identicon.js
similarity index 100%
rename from onionr/static-data/www/shared/identicon.js
rename to static-data/www/shared/identicon.js
diff --git a/onionr/static-data/www/shared/images/anon.svg b/static-data/www/shared/images/anon.svg
similarity index 100%
rename from onionr/static-data/www/shared/images/anon.svg
rename to static-data/www/shared/images/anon.svg
diff --git a/onionr/static-data/www/shared/images/favicon.ico b/static-data/www/shared/images/favicon.ico
similarity index 100%
rename from onionr/static-data/www/shared/images/favicon.ico
rename to static-data/www/shared/images/favicon.ico
diff --git a/onionr/static-data/www/shared/images/onionr-icon.png b/static-data/www/shared/images/onionr-icon.png
similarity index 100%
rename from onionr/static-data/www/shared/images/onionr-icon.png
rename to static-data/www/shared/images/onionr-icon.png
diff --git a/onionr/static-data/www/shared/images/onionr-text.png b/static-data/www/shared/images/onionr-text.png
similarity index 100%
rename from onionr/static-data/www/shared/images/onionr-text.png
rename to static-data/www/shared/images/onionr-text.png
diff --git a/onionr/static-data/www/shared/loadabout.js b/static-data/www/shared/loadabout.js
similarity index 100%
rename from onionr/static-data/www/shared/loadabout.js
rename to static-data/www/shared/loadabout.js
diff --git a/onionr/static-data/www/shared/main/PNotifyBrightTheme.css b/static-data/www/shared/main/PNotifyBrightTheme.css
similarity index 100%
rename from onionr/static-data/www/shared/main/PNotifyBrightTheme.css
rename to static-data/www/shared/main/PNotifyBrightTheme.css
diff --git a/onionr/static-data/www/shared/main/bulma.min.css b/static-data/www/shared/main/bulma.min.css
similarity index 100%
rename from onionr/static-data/www/shared/main/bulma.min.css
rename to static-data/www/shared/main/bulma.min.css
diff --git a/onionr/static-data/www/shared/main/stats.js b/static-data/www/shared/main/stats.js
similarity index 100%
rename from onionr/static-data/www/shared/main/stats.js
rename to static-data/www/shared/main/stats.js
diff --git a/onionr/static-data/www/shared/main/style.css b/static-data/www/shared/main/style.css
similarity index 100%
rename from onionr/static-data/www/shared/main/style.css
rename to static-data/www/shared/main/style.css
diff --git a/onionr/static-data/www/shared/main/styles-new.css b/static-data/www/shared/main/styles-new.css
similarity index 100%
rename from onionr/static-data/www/shared/main/styles-new.css
rename to static-data/www/shared/main/styles-new.css
diff --git a/onionr/static-data/www/shared/misc.js b/static-data/www/shared/misc.js
similarity index 100%
rename from onionr/static-data/www/shared/misc.js
rename to static-data/www/shared/misc.js
diff --git a/onionr/static-data/www/shared/navbar.js b/static-data/www/shared/navbar.js
similarity index 100%
rename from onionr/static-data/www/shared/navbar.js
rename to static-data/www/shared/navbar.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/LICENSE b/static-data/www/shared/node_modules/pnotify/LICENSE
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/LICENSE
rename to static-data/www/shared/node_modules/pnotify/LICENSE
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/README.md b/static-data/www/shared/node_modules/pnotify/README.md
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/README.md
rename to static-data/www/shared/node_modules/pnotify/README.md
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotify.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyAnimate.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyButtons.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCallbacks.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyCompat.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyConfirm.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyDesktop.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyHistory.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyMobile.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyNonBlock.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyReference.js.map
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js
diff --git a/onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js.map b/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js.map
similarity index 100%
rename from onionr/static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js.map
rename to static-data/www/shared/node_modules/pnotify/dist/iife/PNotifyStyleMaterial.js.map
diff --git a/onionr/static-data/www/shared/panel.js b/static-data/www/shared/panel.js
similarity index 100%
rename from onionr/static-data/www/shared/panel.js
rename to static-data/www/shared/panel.js
diff --git a/onionr/static-data/www/shared/sites.js b/static-data/www/shared/sites.js
similarity index 100%
rename from onionr/static-data/www/shared/sites.js
rename to static-data/www/shared/sites.js
diff --git a/onionr/static-data/www/shared/useridenticons.js b/static-data/www/shared/useridenticons.js
similarity index 100%
rename from onionr/static-data/www/shared/useridenticons.js
rename to static-data/www/shared/useridenticons.js