diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/controller/MainController.java b/Backend/mocked-services/src/main/java/com/r11/tools/controller/MainController.java
deleted file mode 100644
index e4c3b66..0000000
--- a/Backend/mocked-services/src/main/java/com/r11/tools/controller/MainController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.r11.tools.controller;
-
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * Class responsible for returning homepage html
- * @author Gabriel Modzelewski
- */
-@Controller
-@RequestMapping("/")
-public class MainController {
-    /**
-     * Default path to get the homepage
-     * @return the view of homepage
-     */
-    @SneakyThrows
-    @GetMapping
-    public ModelAndView showHome(){
-        ModelAndView mov = new ModelAndView();
-        mov.setViewName("html/mock");
-        return mov;
-    }
-}
diff --git a/Backend/mocked-services/src/main/resources/static/css/common.css b/Frontend/assets/css/tools/mock/common.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/common.css
rename to Frontend/assets/css/tools/mock/common.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/Material-Icons.woff2 b/Frontend/assets/css/tools/mock/font/Material-Icons.woff2
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/Material-Icons.woff2
rename to Frontend/assets/css/tools/mock/font/Material-Icons.woff2
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/Nunito-VariableFont_wght.ttf b/Frontend/assets/css/tools/mock/font/Nunito-VariableFont_wght.ttf
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/Nunito-VariableFont_wght.ttf
rename to Frontend/assets/css/tools/mock/font/Nunito-VariableFont_wght.ttf
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/fontello.eot b/Frontend/assets/css/tools/mock/font/fontello.eot
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/fontello.eot
rename to Frontend/assets/css/tools/mock/font/fontello.eot
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/fontello.svg b/Frontend/assets/css/tools/mock/font/fontello.svg
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/fontello.svg
rename to Frontend/assets/css/tools/mock/font/fontello.svg
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/fontello.ttf b/Frontend/assets/css/tools/mock/font/fontello.ttf
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/fontello.ttf
rename to Frontend/assets/css/tools/mock/font/fontello.ttf
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/fontello.woff b/Frontend/assets/css/tools/mock/font/fontello.woff
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/fontello.woff
rename to Frontend/assets/css/tools/mock/font/fontello.woff
diff --git a/Backend/mocked-services/src/main/resources/static/css/font/fontello.woff2 b/Frontend/assets/css/tools/mock/font/fontello.woff2
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/font/fontello.woff2
rename to Frontend/assets/css/tools/mock/font/fontello.woff2
diff --git a/Backend/mocked-services/src/main/resources/static/css/fontello.css b/Frontend/assets/css/tools/mock/fontello.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/fontello.css
rename to Frontend/assets/css/tools/mock/fontello.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/main.css b/Frontend/assets/css/tools/mock/main.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/main.css
rename to Frontend/assets/css/tools/mock/main.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11addons.css b/Frontend/assets/css/tools/mock/r11addons.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11addons.css
rename to Frontend/assets/css/tools/mock/r11addons.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11flexbox.css b/Frontend/assets/css/tools/mock/r11flexbox.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11flexbox.css
rename to Frontend/assets/css/tools/mock/r11flexbox.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11modal.css b/Frontend/assets/css/tools/mock/r11modal.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11modal.css
rename to Frontend/assets/css/tools/mock/r11modal.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11tables.css b/Frontend/assets/css/tools/mock/r11tables.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11tables.css
rename to Frontend/assets/css/tools/mock/r11tables.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11tool.css b/Frontend/assets/css/tools/mock/r11tool.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11tool.css
rename to Frontend/assets/css/tools/mock/r11tool.css
diff --git a/Backend/mocked-services/src/main/resources/static/css/r11tooltip.css b/Frontend/assets/css/tools/mock/r11tooltip.css
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/css/r11tooltip.css
rename to Frontend/assets/css/tools/mock/r11tooltip.css
diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js
index 493333a..9d2335c 100644
--- a/Frontend/assets/scripts/frame.js
+++ b/Frontend/assets/scripts/frame.js
@@ -42,7 +42,7 @@ function init() {
     tools.set("xslt", "tools/xslt.html");
     tools.set("xmlform", "tools/xmlFormatter.html");
     tools.set("jsonform", "tools/jsonFormatter.html");
-    tools.set("mock", getMockHost());
+    tools.set("mock", "tools/mock.html");
 
     changeActiveTools('XML');
     loadLastPage();
diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Frontend/assets/scripts/tools/mock/datatransfer.js
similarity index 99%
rename from Backend/mocked-services/src/main/resources/static/js/datatransfer.js
rename to Frontend/assets/scripts/tools/mock/datatransfer.js
index ba21743..922d5eb 100644
--- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js
+++ b/Frontend/assets/scripts/tools/mock/datatransfer.js
@@ -4,7 +4,7 @@ var json = {};
 var jsonIndex = 0;
 var lastId = 1;
 var htable_row = 0;
-var host = getDomain();
+var host = window.location.protocol + "//" + window.location.hostname + ":8097";
 var dataModified = false;
 const addMessageName = 'addMessage';
 const loadMessageName = 'changeMessage';
diff --git a/Backend/mocked-services/src/main/resources/static/js/fiddle.js b/Frontend/assets/scripts/tools/mock/fiddle.js
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/js/fiddle.js
rename to Frontend/assets/scripts/tools/mock/fiddle.js
diff --git a/Backend/mocked-services/src/main/resources/static/js/historyloader.js b/Frontend/assets/scripts/tools/mock/historyloader.js
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/js/historyloader.js
rename to Frontend/assets/scripts/tools/mock/historyloader.js
diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Frontend/assets/scripts/tools/mock/modal.js
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/js/modal.js
rename to Frontend/assets/scripts/tools/mock/modal.js
diff --git a/Backend/mocked-services/src/main/resources/static/js/uianimation.js b/Frontend/assets/scripts/tools/mock/uianimation.js
similarity index 100%
rename from Backend/mocked-services/src/main/resources/static/js/uianimation.js
rename to Frontend/assets/scripts/tools/mock/uianimation.js
diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index 9c89779..3532208 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -65,28 +65,6 @@ function clearDataField() {
 }
 
 
-/**
- * The `escapeHTML` function is used to escape special characters in an HTML element's innerHTML property.
- * This is done to prevent these characters from being interpreted as HTML tags or attributes, 
- * which could potentially cause security vulnerabilities or unintended behavior.
- * 
- * @function
- * @name escapeHTML
- * @kind function
- * @param {any} element
- * @returns {void}
- */
-function escapeHTML(elementID) {
-    document.getElementById(elementID).innerHTML = document.getElementById(elementID).innerHTML
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#039;");
-}
-
-
-
 /**
 * It fills the XML area with a sample XML.
 * 
@@ -111,6 +89,16 @@ function fillDefaultXML(element) {
     }
 }
 
+
+/**
+* It fills the XSD area with a sample XSD and XML area with matching XML.
+* 
+* @function
+* @name fillDefaultXSD
+* @kind function
+* @param {any} element
+* @returns {void}
+*/
 function fillDefaultXSD(){
     const serverAddress = window.location.protocol + "//" + window.location.hostname + ":8086";
     fetch(serverAddress + "/assets/samples/sampleXSD.xsd")
diff --git a/Frontend/index.html b/Frontend/index.html
index 4073ca4..d8aeaa6 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -5,7 +5,6 @@
     <link rel="stylesheet" href="assets/css/frame.css">
     <script src="assets/scripts/common/jquery-3.6.0.slim.min.js"></script>
     <script src="assets/scripts/frame.js"></script>
-    <!-- <link rel="stylesheet" href="common.css"> -->
     <link rel="shortcut icon" href="assets/images/favicon.ico" type="image/x-icon"> 
     <!-- Meta tags for SEO and SEM -->
     <title>Release11 Web Tools</title>
diff --git a/Backend/mocked-services/src/main/resources/static/html/mock.html b/Frontend/tools/mock.html
similarity index 89%
rename from Backend/mocked-services/src/main/resources/static/html/mock.html
rename to Frontend/tools/mock.html
index d3ff264..6039601 100644
--- a/Backend/mocked-services/src/main/resources/static/html/mock.html
+++ b/Frontend/tools/mock.html
@@ -3,12 +3,10 @@
 <head>
     <title>R11 MockedServices</title>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="../css/fontello.css" type="text/css">
-    <link rel="stylesheet" href="../css/main.css" type="text/css">
-    <!-- <link rel="stylesheet" href="css/common.css" type="text/css"> -->
-    <link rel="stylesheet" href="../css/common.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="../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>
 <body>
     <div class="container">
@@ -155,14 +153,6 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                <!-- <tr class="even">
-                                                    <td>2021-01-01T10:57:26</td>
-                                                    <td>Client request</td>
-                                                </tr>
-                                                <tr>
-                                                    <td>2021-01-01T10:57:26</td>
-                                                    <td>Client request</td>
-                                                </tr> -->
                                             </tbody>
                                         </table>
                                     </div>
@@ -179,19 +169,6 @@
                 </div>
                 <!-- tile list -->
                 <div id="listItems">
-                    <!-- <div class="tile">
-                        <div class="content">
-                            <div class="display-space-between">
-                                <div class="centered-vertically">
-                                    <p>Id: 2</p>
-                                    <p>Status: 200</p>
-                                </div>
-                                <div>
-                                    <button id="test1" class="modification-button btn-tile"><i class="icon-cancel"></i></button>
-                                </div>
-                            </div>
-                        </div>
-                    </div> -->
                 </div>
                 <div id="new-tile" class="max-width centered-content small-vertical-margin">
                     <button id="btn-newtile" class="modification-button btn-addtile"><i class="icon-plus"></i></button>
@@ -302,7 +279,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 +294,10 @@
             <button>No</button>
         </div>
     </div>
-    <script type="text/javascript" src="../js/modal.js"></script>
-    <script type="text/javascript" src="../js/uianimation.js"></script>
-    <script type="text/javascript" src="../js/datatransfer.js"></script>
-    <script type="text/javascript" src="../js/historyloader.js"></script>
-    <script type="text/javascript" src="../js/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>