diff --git a/app/webapp/Component.js b/app/webapp/Component.js
index 6ca35092..46a8e363 100644
--- a/app/webapp/Component.js
+++ b/app/webapp/Component.js
@@ -1,5 +1,5 @@
-sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server", "sap/ui/VersionInfo"
-    ], function (UIComponent, Models, Server, VersionInfo) {
+sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server", "sap/ui/VersionInfo", "z2ui5/cc/DebugTool"
+    ], function (UIComponent, Models, Server, VersionInfo, DebugTool) {
     return UIComponent.extend("z2ui5.Component", {
         metadata: {
             manifest: "json"
@@ -35,7 +35,7 @@ sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server"
             document.addEventListener("keydown", function (zEvent) {
                 if (zEvent?.ctrlKey && zEvent?.key === "F12") {
                    if (!z2ui5.debugTool){
-                     z2ui5.debugTool = new z2ui5.cc.DebugTool();
+                     z2ui5.debugTool = new DebugTool();
                      z2ui5.debugTool.show();
                    } else { 
                      z2ui5.debugTool.close();
diff --git a/app/webapp/controller/View1.controller.js b/app/webapp/controller/View1.controller.js
index d62a6cb5..36f48cbf 100644
--- a/app/webapp/controller/View1.controller.js
+++ b/app/webapp/controller/View1.controller.js
@@ -1,9 +1,9 @@
 sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/model/json/JSONModel",
     "sap/ui/core/BusyIndicator", "sap/m/MessageBox", "sap/m/MessageToast", "sap/ui/core/Fragment", "sap/m/BusyDialog",
-    "sap/ui/VersionInfo", "z2ui5/cc/Server",  "z2ui5/cc/DebugTool",
+    "sap/ui/VersionInfo", "z2ui5/cc/Server",
 ],
     function (Controller, XMLView, JSONModel, BusyIndicator, MessageBox, MessageToast, Fragment, mBusyDialog, VersionInfo,
-        Server, DebugTool) {
+        Server) {
         "use strict";
         return Controller.extend("z2ui5.controller.View1", {
 
diff --git a/src/01/03/z2ui5_cl_app_component_js.clas.abap b/src/01/03/z2ui5_cl_app_component_js.clas.abap
index 59f17602..389431d7 100644
--- a/src/01/03/z2ui5_cl_app_component_js.clas.abap
+++ b/src/01/03/z2ui5_cl_app_component_js.clas.abap
@@ -18,8 +18,8 @@ CLASS z2ui5_cl_app_component_js IMPLEMENTATION.
 
   METHOD get.
 
-    result =              `sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server", "sap/ui/VersionInfo"` && |\n|  &&
-             `    ], function (UIComponent, Models, Server, VersionInfo) {` && |\n|  &&
+    result =              `sap.ui.define(["sap/ui/core/UIComponent", "z2ui5/model/models","z2ui5/cc/Server", "sap/ui/VersionInfo", "z2ui5/cc/DebugTool"` && |\n|  &&
+             `    ], function (UIComponent, Models, Server, VersionInfo, DebugTool) {` && |\n|  &&
              `    return UIComponent.extend("z2ui5.Component", {` && |\n|  &&
              `        metadata: {` && |\n|  &&
              `            manifest: "json"` && |\n|  &&
@@ -55,7 +55,7 @@ CLASS z2ui5_cl_app_component_js IMPLEMENTATION.
              `            document.addEventListener("keydown", function (zEvent) {` && |\n|  &&
              `                if (zEvent?.ctrlKey && zEvent?.key === "F12") {` && |\n|  &&
              `                   if (!z2ui5.debugTool){` && |\n|  &&
-             `                     z2ui5.debugTool = new z2ui5.cc.DebugTool();` && |\n|  &&
+             `                     z2ui5.debugTool = new DebugTool();` && |\n|  &&
              `                     z2ui5.debugTool.show();` && |\n|  &&
              `                   } else {` && |\n|  &&
              `                     z2ui5.debugTool.close();` && |\n|  &&
diff --git a/src/01/03/z2ui5_cl_app_view1_js.clas.abap b/src/01/03/z2ui5_cl_app_view1_js.clas.abap
index 10a3fb5f..56d597d3 100644
--- a/src/01/03/z2ui5_cl_app_view1_js.clas.abap
+++ b/src/01/03/z2ui5_cl_app_view1_js.clas.abap
@@ -20,10 +20,10 @@ CLASS z2ui5_cl_app_view1_js IMPLEMENTATION.
 
     result =              `sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/model/json/JSONModel",` && |\n|  &&
              `    "sap/ui/core/BusyIndicator", "sap/m/MessageBox", "sap/m/MessageToast", "sap/ui/core/Fragment", "sap/m/BusyDialog",` && |\n|  &&
-             `    "sap/ui/VersionInfo", "z2ui5/cc/Server",  "z2ui5/cc/DebugTool",` && |\n|  &&
+             `    "sap/ui/VersionInfo", "z2ui5/cc/Server",` && |\n|  &&
              `],` && |\n|  &&
              `    function (Controller, XMLView, JSONModel, BusyIndicator, MessageBox, MessageToast, Fragment, mBusyDialog, VersionInfo,` && |\n|  &&
-             `        Server, DebugTool) {` && |\n|  &&
+             `        Server) {` && |\n|  &&
              `        "use strict";` && |\n|  &&
              `        return Controller.extend("z2ui5.controller.View1", {` && |\n|  &&
              `` && |\n|  &&