diff --git a/src/pages/panel/sitekey/add.rs b/src/pages/panel/sitekey/add.rs
index 5ef0b780..a9b38b65 100644
--- a/src/pages/panel/sitekey/add.rs
+++ b/src/pages/panel/sitekey/add.rs
@@ -26,7 +26,7 @@ lazy_static! {
 }
 
 #[derive(TemplateOnce, Clone)]
-#[template(path = "panel/sitekey/add/index.html")]
+#[template(path = "panel/sitekey/add/advance/index.html")]
 pub struct IndexPage<'a> {
     pub levels: usize,
     pub form_title: &'a str,
diff --git a/templates/panel/sitekey/add/add-level.html b/templates/panel/sitekey/add/advance/add-level.html
similarity index 100%
rename from templates/panel/sitekey/add/add-level.html
rename to templates/panel/sitekey/add/advance/add-level.html
diff --git a/templates/panel/sitekey/add/css/main.scss b/templates/panel/sitekey/add/advance/css/main.scss
similarity index 93%
rename from templates/panel/sitekey/add/css/main.scss
rename to templates/panel/sitekey/add/advance/css/main.scss
index b10d966f..311346a7 100644
--- a/templates/panel/sitekey/add/css/main.scss
+++ b/templates/panel/sitekey/add/advance/css/main.scss
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@import '../../../../reset';
-@import '../../../../vars';
-@import '../../../../components/button';
-@import '../../../../components/forms';
+@import '../../../../../reset';
+@import '../../../../../vars';
+@import '../../../../../components/button';
+@import '../../../../../components/forms';
 
 .sitekey-form {
   display: flex;
diff --git a/templates/panel/sitekey/add/css/mobile.scss b/templates/panel/sitekey/add/advance/css/mobile.scss
similarity index 100%
rename from templates/panel/sitekey/add/css/mobile.scss
rename to templates/panel/sitekey/add/advance/css/mobile.scss
diff --git a/templates/panel/sitekey/add/existing-level.html b/templates/panel/sitekey/add/advance/existing-level.html
similarity index 100%
rename from templates/panel/sitekey/add/existing-level.html
rename to templates/panel/sitekey/add/advance/existing-level.html
diff --git a/templates/panel/sitekey/add/form.html b/templates/panel/sitekey/add/advance/form.html
similarity index 100%
rename from templates/panel/sitekey/add/form.html
rename to templates/panel/sitekey/add/advance/form.html
diff --git a/templates/panel/sitekey/add/advance/index.html b/templates/panel/sitekey/add/advance/index.html
new file mode 100644
index 00000000..0a0ee36f
--- /dev/null
+++ b/templates/panel/sitekey/add/advance/index.html
@@ -0,0 +1,15 @@
+<. include!("../../../../components/headers/index.html"); .> 
+<. include!("../../../navbar/index.html"); .>
+<div class="tmp-layout">
+<. include!("../../../header/index.html"); .>
+
+<main class="panel-main">
+  <. include!("../../../help-banner/index.html"); .>
+  <!-- Main content container -->
+  <div class="inner-container">
+    <!-- Main menu/ important actions roaster -->
+
+    <. include!("./form.html"); .>
+  </div>
+  <!-- end of container -->
+<. include!("../../../../components/footers.html"); .>
diff --git a/templates/panel/sitekey/add/ts/addLevelButton.test.ts b/templates/panel/sitekey/add/advance/ts/addLevelButton.test.ts
similarity index 98%
rename from templates/panel/sitekey/add/ts/addLevelButton.test.ts
rename to templates/panel/sitekey/add/advance/ts/addLevelButton.test.ts
index aba58657..4cfb2d48 100644
--- a/templates/panel/sitekey/add/ts/addLevelButton.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/addLevelButton.test.ts
@@ -17,7 +17,7 @@
 
 import getNumLevels from "./levels/getNumLevels";
 import {getAddForm, trim, addLevel} from "./setupTests";
-import setup from "../../../../components/error/setUpTests";
+import setup from "../../../../../components/error/setUpTests";
 
 document.body.innerHTML = getAddForm();
 document.body.appendChild(setup());
diff --git a/templates/panel/sitekey/add/ts/addLevelButton.ts b/templates/panel/sitekey/add/advance/ts/addLevelButton.ts
similarity index 99%
rename from templates/panel/sitekey/add/ts/addLevelButton.ts
rename to templates/panel/sitekey/add/advance/ts/addLevelButton.ts
index 6beacf7a..23df4721 100644
--- a/templates/panel/sitekey/add/ts/addLevelButton.ts
+++ b/templates/panel/sitekey/add/advance/ts/addLevelButton.ts
@@ -23,7 +23,7 @@ import {
 } from "./removeLevelButton";
 import CONST from "./const";
 
-import log from "../../../../logger";
+import log from "../../../../../logger";
 
 /**
  * Gets executed when 'Add' Button is clicked to add levels
diff --git a/templates/panel/sitekey/add/ts/const.ts b/templates/panel/sitekey/add/advance/ts/const.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/const.ts
rename to templates/panel/sitekey/add/advance/ts/const.ts
diff --git a/templates/panel/sitekey/add/ts/form/index.ts b/templates/panel/sitekey/add/advance/ts/form/index.ts
similarity index 88%
rename from templates/panel/sitekey/add/ts/form/index.ts
rename to templates/panel/sitekey/add/advance/ts/form/index.ts
index 9311ceed..8ebcaaef 100644
--- a/templates/panel/sitekey/add/ts/form/index.ts
+++ b/templates/panel/sitekey/add/advance/ts/form/index.ts
@@ -17,15 +17,15 @@
 
 import { LEVELS } from "../levels";
 
-import getFormUrl from "../../../../../utils/getFormUrl";
-import genJsonPayload from "../../../../../utils/genJsonPayload";
+import getFormUrl from "../../../../../../utils/getFormUrl";
+import genJsonPayload from "../../../../../../utils/genJsonPayload";
 
-import VIEWS from "../../../../../views/v1/routes";
+import VIEWS from "../../../../../../views/v1/routes";
 
 import validateDescription from "./validateDescription";
 import validateDuration from "./validateDuration";
 
-import createError from "../../../../../components/error";
+import createError from "../../../../../../components/error";
 
 export const SITE_KEY_FORM_CLASS = "sitekey-form";
 export const FORM = <HTMLFormElement>(
diff --git a/templates/panel/sitekey/add/ts/form/validateDescription.test.ts b/templates/panel/sitekey/add/advance/ts/form/validateDescription.test.ts
similarity index 91%
rename from templates/panel/sitekey/add/ts/form/validateDescription.test.ts
rename to templates/panel/sitekey/add/advance/ts/form/validateDescription.test.ts
index 9c3e615d..962155c8 100644
--- a/templates/panel/sitekey/add/ts/form/validateDescription.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/form/validateDescription.test.ts
@@ -17,9 +17,9 @@
 
 import validateDescription from "./validateDescription";
 import {getAddForm, fillDescription} from "../setupTests";
-import {mockAlert} from "../../../../../setUpTests";
+import {mockAlert} from "../../../../../../setUpTests";
 
-import setup from "../../../../../components/error/setUpTests";
+import setup from "../../../../../../components/error/setUpTests";
 
 mockAlert();
 
diff --git a/templates/panel/sitekey/add/ts/form/validateDescription.ts b/templates/panel/sitekey/add/advance/ts/form/validateDescription.ts
similarity index 93%
rename from templates/panel/sitekey/add/ts/form/validateDescription.ts
rename to templates/panel/sitekey/add/advance/ts/form/validateDescription.ts
index 0a7702e2..d8038d8d 100644
--- a/templates/panel/sitekey/add/ts/form/validateDescription.ts
+++ b/templates/panel/sitekey/add/advance/ts/form/validateDescription.ts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import isBlankString from "../../../../../utils/isBlankString";
+import isBlankString from "../../../../../../utils/isBlankString";
 
 const validateDescription = (e: Event): string => {
   const inputElement = <HTMLInputElement>document.getElementById("description");
diff --git a/templates/panel/sitekey/add/ts/form/validateDuration.test.ts b/templates/panel/sitekey/add/advance/ts/form/validateDuration.test.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/form/validateDuration.test.ts
rename to templates/panel/sitekey/add/advance/ts/form/validateDuration.test.ts
diff --git a/templates/panel/sitekey/add/ts/form/validateDuration.ts b/templates/panel/sitekey/add/advance/ts/form/validateDuration.ts
similarity index 95%
rename from templates/panel/sitekey/add/ts/form/validateDuration.ts
rename to templates/panel/sitekey/add/advance/ts/form/validateDuration.ts
index 4aedea92..4be40a18 100644
--- a/templates/panel/sitekey/add/ts/form/validateDuration.ts
+++ b/templates/panel/sitekey/add/advance/ts/form/validateDuration.ts
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import isNumber from "../../../../../utils/isNumber";
+import isNumber from "../../../../../../utils/isNumber";
 
 const validateDuration = (): number => {
   const duartionElement = <HTMLInputElement>document.getElementById("duration");
diff --git a/templates/panel/sitekey/add/ts/index.ts b/templates/panel/sitekey/add/advance/ts/index.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/index.ts
rename to templates/panel/sitekey/add/advance/ts/index.ts
diff --git a/templates/panel/sitekey/add/ts/levels/getLevelFields.test.ts b/templates/panel/sitekey/add/advance/ts/levels/getLevelFields.test.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/levels/getLevelFields.test.ts
rename to templates/panel/sitekey/add/advance/ts/levels/getLevelFields.test.ts
diff --git a/templates/panel/sitekey/add/ts/levels/getLevelFields.ts b/templates/panel/sitekey/add/advance/ts/levels/getLevelFields.ts
similarity index 97%
rename from templates/panel/sitekey/add/ts/levels/getLevelFields.ts
rename to templates/panel/sitekey/add/advance/ts/levels/getLevelFields.ts
index 01ca933e..a6b52e20 100644
--- a/templates/panel/sitekey/add/ts/levels/getLevelFields.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/getLevelFields.ts
@@ -18,7 +18,7 @@
 import { Level } from "./index";
 import CONST from "../const";
 
-import log from "../../../../../logger";
+import log from "../../../../../../logger";
 
 /** Fetches level from DOM using the ID passesd and validates */
 const getLevelFields = (id: number): Level => {
diff --git a/templates/panel/sitekey/add/ts/levels/getNumLevels.test.ts b/templates/panel/sitekey/add/advance/ts/levels/getNumLevels.test.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/levels/getNumLevels.test.ts
rename to templates/panel/sitekey/add/advance/ts/levels/getNumLevels.test.ts
diff --git a/templates/panel/sitekey/add/ts/levels/getNumLevels.ts b/templates/panel/sitekey/add/advance/ts/levels/getNumLevels.ts
similarity index 96%
rename from templates/panel/sitekey/add/ts/levels/getNumLevels.ts
rename to templates/panel/sitekey/add/advance/ts/levels/getNumLevels.ts
index ec239b58..1f19a86b 100644
--- a/templates/panel/sitekey/add/ts/levels/getNumLevels.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/getNumLevels.ts
@@ -17,7 +17,7 @@
 
 import CONST from "../const";
 
-import log from "../../../../../logger";
+import log from "../../../../../../logger";
 
 /** returns number of level input fields currently in DOM */
 const getNumLevels = (): number => {
diff --git a/templates/panel/sitekey/add/ts/levels/index.ts b/templates/panel/sitekey/add/advance/ts/levels/index.ts
similarity index 98%
rename from templates/panel/sitekey/add/ts/levels/index.ts
rename to templates/panel/sitekey/add/advance/ts/levels/index.ts
index 1bd60b47..ce19cf36 100644
--- a/templates/panel/sitekey/add/ts/levels/index.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/index.ts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import log from "../../../../../logger";
+import log from "../../../../../../logger";
 
 /** Datatype represenging an mCaptcha level */
 export type Level = {
diff --git a/templates/panel/sitekey/add/ts/levels/levels.test.ts b/templates/panel/sitekey/add/advance/ts/levels/levels.test.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/levels/levels.test.ts
rename to templates/panel/sitekey/add/advance/ts/levels/levels.test.ts
diff --git a/templates/panel/sitekey/add/ts/levels/updateLevel.ts b/templates/panel/sitekey/add/advance/ts/levels/updateLevel.ts
similarity index 97%
rename from templates/panel/sitekey/add/ts/levels/updateLevel.ts
rename to templates/panel/sitekey/add/advance/ts/levels/updateLevel.ts
index 5fd141f4..5c6d1500 100644
--- a/templates/panel/sitekey/add/ts/levels/updateLevel.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/updateLevel.ts
@@ -19,7 +19,7 @@ import CONST from "../const";
 import getLevelFields from "./getLevelFields";
 import { LEVELS } from "./index";
 
-import createError from "../../../../../components/error";
+import createError from "../../../../../../components/error";
 
 /** on-change event handler to update level */
 const updateLevel = (e: Event): void => {
diff --git a/templates/panel/sitekey/add/ts/levels/validateLevel.test.ts b/templates/panel/sitekey/add/advance/ts/levels/validateLevel.test.ts
similarity index 95%
rename from templates/panel/sitekey/add/ts/levels/validateLevel.test.ts
rename to templates/panel/sitekey/add/advance/ts/levels/validateLevel.test.ts
index 8daab97c..9da70f4b 100644
--- a/templates/panel/sitekey/add/ts/levels/validateLevel.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/validateLevel.test.ts
@@ -17,7 +17,7 @@
 
 import validateLevel from "./validateLevel";
 import {getAddForm, level1, fillAddLevel} from "../setupTests";
-import setup from "../../../../../components/error/setUpTests";
+import setup from "../../../../../../components/error/setUpTests";
 
 document.body.innerHTML = getAddForm();
 
diff --git a/templates/panel/sitekey/add/ts/levels/validateLevel.ts b/templates/panel/sitekey/add/advance/ts/levels/validateLevel.ts
similarity index 94%
rename from templates/panel/sitekey/add/ts/levels/validateLevel.ts
rename to templates/panel/sitekey/add/advance/ts/levels/validateLevel.ts
index dc1b9f62..51001d8a 100644
--- a/templates/panel/sitekey/add/ts/levels/validateLevel.ts
+++ b/templates/panel/sitekey/add/advance/ts/levels/validateLevel.ts
@@ -17,7 +17,7 @@
 
 import {LEVELS} from "./index";
 import getLevelFields from "./getLevelFields";
-import createError from "../../../../../components/error/";
+import createError from "../../../../../../components/error/";
 
 /**
  * Fetches level from DOM using the ID passesd and validates
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/index.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/index.ts
similarity index 98%
rename from templates/panel/sitekey/add/ts/removeLevelButton/index.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/index.ts
index ebc9d6b8..14d162b5 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/index.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/index.ts
@@ -18,7 +18,7 @@ import { LEVELS } from "../levels/index";
 import updateLevelNumbersOnDOM from "./updateDom";
 import CONST from "../const";
 
-import log from "../../../../../logger";
+import log from "../../../../../../logger";
 
 const REMOVE_LEVEL_BUTTON = "sitekey-form__level-remove-level-button";
 
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/removeLevelButton.test.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/removeLevelButton.test.ts
similarity index 94%
rename from templates/panel/sitekey/add/ts/removeLevelButton/removeLevelButton.test.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/removeLevelButton.test.ts
index 2f670799..004ecb69 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/removeLevelButton.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/removeLevelButton.test.ts
@@ -19,8 +19,8 @@ import getNumLevels from "../levels/getNumLevels";
 import { getAddForm, addLevel } from "../setupTests";
 import CONST from "../const";
 
-import log from "../../../../../logger";
-import { MODE } from "../../../../../logger";
+import log from "../../../../../../logger";
+import { MODE } from "../../../../../../logger";
 
 document.body.innerHTML = getAddForm();
 
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/index.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/index.ts
similarity index 98%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/index.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/index.ts
index a041678a..aae60db8 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/index.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/index.ts
@@ -16,7 +16,7 @@
  */
 import getNumLevels from "../../levels/getNumLevels";
 import CONST from "../../const";
-import log from "../../../../../../logger";
+import log from "../../../../../../../logger";
 
 import updateLabels from "./updateLabel";
 import updateInputs from "./updateInputs";
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/setupTests.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/setupTests.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/setupTests.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/setupTests.ts
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.test.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.test.ts
similarity index 98%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.test.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.test.ts
index 9d10c019..e17fda1b 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.test.ts
@@ -19,8 +19,8 @@ import {getAddForm, trim} from "../../setupTests";
 import updateInputs from "./updateInputs";
 import CONST from "../../const";
 
-import log from "../../../../../../logger";
-import {MODE} from "../../../../../../logger";
+import log from "../../../../../../../logger";
+import {MODE} from "../../../../../../../logger";
 
 import {setupAddlevels} from "./setupTests";
 
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.ts
similarity index 97%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.ts
index d15d0e86..61e81edf 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateInputs.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateInputs.ts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import CONST from "../../const";
-import log from "../../../../../../logger";
+import log from "../../../../../../../logger";
 
 /** update input IDs with new level */
 const updateInput = (levelGroup: Element, newLevel: number): void => {
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.test.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.test.ts
similarity index 97%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.test.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.test.ts
index 750eeeea..7fa78d18 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.test.ts
@@ -19,8 +19,8 @@ import { trim } from "../../setupTests";
 import updateLabels from "./updateLabel";
 import CONST from "../../const";
 
-import log from "../../../../../../logger";
-import { MODE } from "../../../../../../logger";
+import log from "../../../../../../../logger";
+import { MODE } from "../../../../../../../logger";
 
 /** get initial form to test remove button functionality */
 export const labelLevel = (level: number): string => {
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.ts
similarity index 97%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.ts
index 72e2787b..37d7f789 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLabel.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLabel.ts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import CONST from "../../const";
-import log from "../../../../../../logger";
+import log from "../../../../../../../logger";
 
 /** update level lables to match new level */
 const updateLabels = (levelGroup: Element, newLevel: number): void => {
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts
similarity index 96%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts
index 451b65a0..ce18375b 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLevelGroup.test.ts
@@ -19,8 +19,8 @@ import { trim} from "../../setupTests";
 import updateLevelGroup from "./updateLevelGroup";
 import CONST from "../../const";
 
-import log from "../../../../../../logger";
-import {MODE} from "../../../../../../logger";
+import log from "../../../../../../../logger";
+import {MODE} from "../../../../../../../logger";
 
 
 /** get initial form to test remove button functionality */
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLevelGroup.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLevelGroup.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateLevelGroup.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateLevelGroup.ts
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts
similarity index 96%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts
index e744feaa..903a5938 100644
--- a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts
+++ b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateRemoveButton.test.ts
@@ -19,8 +19,8 @@ import {trim} from "../../setupTests";
 import updateRemoveButton from "./updateRemoveButton";
 import CONST from "../../const";
 
-import log from "../../../../../../logger";
-import {MODE} from "../../../../../../logger";
+import log from "../../../../../../../logger";
+import {MODE} from "../../../../../../../logger";
 
 /** get initial form to test remove button functionality */
 export const labelLevel = (level: number): string => {
diff --git a/templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateRemoveButton.ts b/templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateRemoveButton.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/removeLevelButton/updateDom/updateRemoveButton.ts
rename to templates/panel/sitekey/add/advance/ts/removeLevelButton/updateDom/updateRemoveButton.ts
diff --git a/templates/panel/sitekey/add/ts/setupTests.ts b/templates/panel/sitekey/add/advance/ts/setupTests.ts
similarity index 100%
rename from templates/panel/sitekey/add/ts/setupTests.ts
rename to templates/panel/sitekey/add/advance/ts/setupTests.ts
diff --git a/templates/panel/sitekey/add/index.html b/templates/panel/sitekey/add/index.html
deleted file mode 100644
index 47a16e61..00000000
--- a/templates/panel/sitekey/add/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<. include!("../../../components/headers/index.html"); .> 
-<. include!("../../navbar/index.html"); .>
-<div class="tmp-layout">
-<. include!("../../header/index.html"); .>
-
-<main class="panel-main">
-  <. include!("../../help-banner/index.html"); .>
-  <!-- Main content container -->
-  <div class="inner-container">
-    <!-- Main menu/ important actions roaster -->
-
-    <. include!("./form.html"); .>
-  </div>
-  <!-- end of container -->
-<. include!("../../../components/footers.html"); .>
diff --git a/templates/panel/sitekey/edit/edit.test.ts b/templates/panel/sitekey/edit/edit.test.ts
index 17d4a6ff..598245fc 100644
--- a/templates/panel/sitekey/edit/edit.test.ts
+++ b/templates/panel/sitekey/edit/edit.test.ts
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import getNumLevels from "../add/ts/levels/getNumLevels";
-import {addLevel} from "../add/ts/setupTests";
+import getNumLevels from "../add/advance/ts/levels/getNumLevels";
+import {addLevel} from "../add/advance/ts/setupTests";
 import setup from "../../../components/error/setUpTests";
 import * as SETUP from "./setupTest";
 
diff --git a/templates/panel/sitekey/edit/index.html b/templates/panel/sitekey/edit/index.html
index 5bb713c2..14d709a9 100644
--- a/templates/panel/sitekey/edit/index.html
+++ b/templates/panel/sitekey/edit/index.html
@@ -5,7 +5,7 @@
            <. include!("./existing-level.html"); .>  
     <. } .>
 	<. let level = levels.len() + 1; .>
-	<. include!("../add/add-level.html"); .>
+	<. include!("../add/advance/add-level.html"); .>
   <button data-sitekey="<.= key .>" 
 	  id="sitekey-form__submit" class="sitekey-form__submit" type="submit">
     Submit
diff --git a/templates/panel/sitekey/edit/index.ts b/templates/panel/sitekey/edit/index.ts
index 110175d1..ceb706d7 100644
--- a/templates/panel/sitekey/edit/index.ts
+++ b/templates/panel/sitekey/edit/index.ts
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import * as Add from "../add/ts/form/";
-import addLevelButtonAddEventListener from "../add/ts/addLevelButton";
-import { addRemoveLevelButtonEventListenerAll } from "../add/ts/removeLevelButton";
-import getNumLevels from "../add/ts/levels/getNumLevels";
-import validateLevel from "../add/ts/levels/validateLevel";
-import * as UpdateLevel from "../add/ts/levels/updateLevel";
-import validateDescription from "../add/ts/form/validateDescription";
-import validateDuration from "../add/ts/form/validateDuration";
-import { LEVELS } from "../add/ts/levels";
+import * as Add from "../add/advance/ts/form/";
+import addLevelButtonAddEventListener from "../add/advance/ts/addLevelButton";
+import { addRemoveLevelButtonEventListenerAll } from "../add/advance/ts/removeLevelButton";
+import getNumLevels from "../add/advance/ts/levels/getNumLevels";
+import validateLevel from "../add/advance/ts/levels/validateLevel";
+import * as UpdateLevel from "../add/advance/ts/levels/updateLevel";
+import validateDescription from "../add/advance/ts/form/validateDescription";
+import validateDuration from "../add/advance/ts/form/validateDuration";
+import { LEVELS } from "../add/advance/ts/levels";
 
 import getFormUrl from "../../../utils/getFormUrl";
 import genJsonPayload from "../../../utils/genJsonPayload";