diff --git a/Frontend/assets/css/mock/common.css b/Frontend/assets/css/tools/mock/common.css
similarity index 100%
rename from Frontend/assets/css/mock/common.css
rename to Frontend/assets/css/tools/mock/common.css
diff --git a/Frontend/assets/css/mock/font/Material-Icons.woff2 b/Frontend/assets/css/tools/mock/font/Material-Icons.woff2
similarity index 100%
rename from Frontend/assets/css/mock/font/Material-Icons.woff2
rename to Frontend/assets/css/tools/mock/font/Material-Icons.woff2
diff --git a/Frontend/assets/css/mock/font/Nunito-VariableFont_wght.ttf b/Frontend/assets/css/tools/mock/font/Nunito-VariableFont_wght.ttf
similarity index 100%
rename from Frontend/assets/css/mock/font/Nunito-VariableFont_wght.ttf
rename to Frontend/assets/css/tools/mock/font/Nunito-VariableFont_wght.ttf
diff --git a/Frontend/assets/css/mock/font/fontello.eot b/Frontend/assets/css/tools/mock/font/fontello.eot
similarity index 100%
rename from Frontend/assets/css/mock/font/fontello.eot
rename to Frontend/assets/css/tools/mock/font/fontello.eot
diff --git a/Frontend/assets/css/mock/font/fontello.svg b/Frontend/assets/css/tools/mock/font/fontello.svg
similarity index 100%
rename from Frontend/assets/css/mock/font/fontello.svg
rename to Frontend/assets/css/tools/mock/font/fontello.svg
diff --git a/Frontend/assets/css/mock/font/fontello.ttf b/Frontend/assets/css/tools/mock/font/fontello.ttf
similarity index 100%
rename from Frontend/assets/css/mock/font/fontello.ttf
rename to Frontend/assets/css/tools/mock/font/fontello.ttf
diff --git a/Frontend/assets/css/mock/font/fontello.woff b/Frontend/assets/css/tools/mock/font/fontello.woff
similarity index 100%
rename from Frontend/assets/css/mock/font/fontello.woff
rename to Frontend/assets/css/tools/mock/font/fontello.woff
diff --git a/Frontend/assets/css/mock/font/fontello.woff2 b/Frontend/assets/css/tools/mock/font/fontello.woff2
similarity index 100%
rename from Frontend/assets/css/mock/font/fontello.woff2
rename to Frontend/assets/css/tools/mock/font/fontello.woff2
diff --git a/Frontend/assets/css/mock/fontello.css b/Frontend/assets/css/tools/mock/fontello.css
similarity index 100%
rename from Frontend/assets/css/mock/fontello.css
rename to Frontend/assets/css/tools/mock/fontello.css
diff --git a/Frontend/assets/css/mock/main.css b/Frontend/assets/css/tools/mock/main.css
similarity index 100%
rename from Frontend/assets/css/mock/main.css
rename to Frontend/assets/css/tools/mock/main.css
diff --git a/Frontend/assets/css/mock/r11addons.css b/Frontend/assets/css/tools/mock/r11addons.css
similarity index 100%
rename from Frontend/assets/css/mock/r11addons.css
rename to Frontend/assets/css/tools/mock/r11addons.css
diff --git a/Frontend/assets/css/mock/r11flexbox.css b/Frontend/assets/css/tools/mock/r11flexbox.css
similarity index 100%
rename from Frontend/assets/css/mock/r11flexbox.css
rename to Frontend/assets/css/tools/mock/r11flexbox.css
diff --git a/Frontend/assets/css/mock/r11modal.css b/Frontend/assets/css/tools/mock/r11modal.css
similarity index 100%
rename from Frontend/assets/css/mock/r11modal.css
rename to Frontend/assets/css/tools/mock/r11modal.css
diff --git a/Frontend/assets/css/mock/r11tables.css b/Frontend/assets/css/tools/mock/r11tables.css
similarity index 100%
rename from Frontend/assets/css/mock/r11tables.css
rename to Frontend/assets/css/tools/mock/r11tables.css
diff --git a/Frontend/assets/css/mock/r11tool.css b/Frontend/assets/css/tools/mock/r11tool.css
similarity index 100%
rename from Frontend/assets/css/mock/r11tool.css
rename to Frontend/assets/css/tools/mock/r11tool.css
diff --git a/Frontend/assets/css/mock/r11tooltip.css b/Frontend/assets/css/tools/mock/r11tooltip.css
similarity index 100%
rename from Frontend/assets/css/mock/r11tooltip.css
rename to Frontend/assets/css/tools/mock/r11tooltip.css
diff --git a/Frontend/assets/scripts/mock/datatransfer.js b/Frontend/assets/scripts/tools/mock/datatransfer.js
similarity index 100%
rename from Frontend/assets/scripts/mock/datatransfer.js
rename to Frontend/assets/scripts/tools/mock/datatransfer.js
diff --git a/Frontend/assets/scripts/mock/fiddle.js b/Frontend/assets/scripts/tools/mock/fiddle.js
similarity index 100%
rename from Frontend/assets/scripts/mock/fiddle.js
rename to Frontend/assets/scripts/tools/mock/fiddle.js
diff --git a/Frontend/assets/scripts/mock/historyloader.js b/Frontend/assets/scripts/tools/mock/historyloader.js
similarity index 100%
rename from Frontend/assets/scripts/mock/historyloader.js
rename to Frontend/assets/scripts/tools/mock/historyloader.js
diff --git a/Frontend/assets/scripts/mock/modal.js b/Frontend/assets/scripts/tools/mock/modal.js
similarity index 100%
rename from Frontend/assets/scripts/mock/modal.js
rename to Frontend/assets/scripts/tools/mock/modal.js
diff --git a/Frontend/assets/scripts/mock/uianimation.js b/Frontend/assets/scripts/tools/mock/uianimation.js
similarity index 100%
rename from Frontend/assets/scripts/mock/uianimation.js
rename to Frontend/assets/scripts/tools/mock/uianimation.js
diff --git a/Frontend/tools/mock.html b/Frontend/tools/mock.html
index b6cae21..86ceb67 100644
--- a/Frontend/tools/mock.html
+++ b/Frontend/tools/mock.html
@@ -3,10 +3,10 @@
 <head>
     <title>R11 MockedServices</title>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="../assets/css/mock/fontello.css" type="text/css">
-    <link rel="stylesheet" href="../assets/css/mock/main.css" type="text/css">
+    <link rel="stylesheet" href="../assets/css/tools/mock/fontello.css" type="text/css">
+    <link rel="stylesheet" href="../assets/css/tools/mock/main.css" type="text/css">
     <!-- <link rel="stylesheet" href="css/common.css" type="text/css"> -->
-    <link rel="stylesheet" href="../assets/css/mock/common.css" type="text/css">
+    <link rel="stylesheet" href="../assets/css/tools/mock/common.css" type="text/css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <!-- <script src="../js/dyn_host.js"></script> -->
 </head>
@@ -302,7 +302,7 @@
             <div>Message saved<i class="r-exclamation"></i></div>
             <button>&times;</button>
         </div>
-        <div class="body">Your message has been successfuly saved.<br>You might view it under the link.</div>
+        <div class="body">Your message has been successfully saved.<br>You might view it under the link.</div>
     </div>
     <div id="modal-query" class="modal">
         <div class="header">
@@ -317,10 +317,10 @@
             <button>No</button>
         </div>
     </div>
-    <script type="text/javascript" src="../assets/scripts/mock/modal.js"></script>
-    <script type="text/javascript" src="../assets/scripts/mock//uianimation.js"></script>
-    <script type="text/javascript" src="../assets/scripts/mock/datatransfer.js"></script>
-    <script type="text/javascript" src="../assets/scripts/mock/historyloader.js"></script>
-    <script type="text/javascript" src="../assets/scripts/mock/fiddle.js"></script>
+    <script type="text/javascript" src="../assets/scripts/tools/mock/modal.js"></script>
+    <script type="text/javascript" src="../assets/scripts/tools/mock//uianimation.js"></script>
+    <script type="text/javascript" src="../assets/scripts/tools/mock/datatransfer.js"></script>
+    <script type="text/javascript" src="../assets/scripts/tools/mock/historyloader.js"></script>
+    <script type="text/javascript" src="../assets/scripts/tools/mock/fiddle.js"></script>
 </body>
 </html>