diff --git a/api/placeholder.md b/api/placeholder.md
deleted file mode 100644
index e69de29..0000000
diff --git a/ui/svg/ccc_berlin.svg b/icon/ccc_berlin.svg
similarity index 100%
rename from ui/svg/ccc_berlin.svg
rename to icon/ccc_berlin.svg
diff --git a/ui/svg/cloudflare.svg b/icon/cloudflare.svg
similarity index 100%
rename from ui/svg/cloudflare.svg
rename to icon/cloudflare.svg
diff --git a/ui/svg/digitalcourage.svg b/icon/digitalcourage.svg
similarity index 100%
rename from ui/svg/digitalcourage.svg
rename to icon/digitalcourage.svg
diff --git a/ui/svg/google.svg b/icon/google.svg
similarity index 100%
rename from ui/svg/google.svg
rename to icon/google.svg
diff --git a/ui/svg/netaachen.svg b/icon/netaachen.svg
similarity index 100%
rename from ui/svg/netaachen.svg
rename to icon/netaachen.svg
diff --git a/ui/svg/quad9.svg b/icon/quad9.svg
similarity index 100%
rename from ui/svg/quad9.svg
rename to icon/quad9.svg
diff --git a/ui/svg/telekom_de.svg b/icon/telekom_de.svg
similarity index 100%
rename from ui/svg/telekom_de.svg
rename to icon/telekom_de.svg
diff --git a/ui/svg/uncensoreddns.svg b/icon/uncensoreddns.svg
similarity index 100%
rename from ui/svg/uncensoreddns.svg
rename to icon/uncensoreddns.svg
diff --git a/ui/svg/vodafone_de.svg b/icon/vodafone_de.svg
similarity index 100%
rename from ui/svg/vodafone_de.svg
rename to icon/vodafone_de.svg
diff --git a/ui/html/feather.js b/start/feather.js
similarity index 100%
rename from ui/html/feather.js
rename to start/feather.js
diff --git a/ui/html/favicon.png b/start/html/favicon.png
similarity index 100%
rename from ui/html/favicon.png
rename to start/html/favicon.png
diff --git a/ui/jhtml-compat/feather.js b/start/html/feather.js
similarity index 100%
rename from ui/jhtml-compat/feather.js
rename to start/html/feather.js
diff --git a/ui/html/index.css b/start/html/index.css
similarity index 100%
rename from ui/html/index.css
rename to start/html/index.css
diff --git a/ui/html/index.css.map b/start/html/index.css.map
similarity index 94%
rename from ui/html/index.css.map
rename to start/html/index.css.map
index 2b98575..0e86933 100644
--- a/ui/html/index.css.map
+++ b/start/html/index.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../raw/index.sass"],"names":[],"mappings":"AAUA;EACC;;;AAED;EACC,kBAbU;EAcV,OAZU;EAaV,aATU;EAUV;EACA;EACA;EACA;;;AAED;EACC,aAhBU;;;AAkBX;EACC;;;AAED;EACC;EACA;EACA;;AACA;EACC,kBAhCS;EAiCT;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;;;AAEH;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;;AACF;EACC;;AACA;EACC;;;AAEH;EACC;EACA;;AAEC;EACC;EACA;;AACD;EACC;EACA;EACA;EACA,OAvEQ;EAwER;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA,OA9FM;;AA+FR;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAEJ;EACC;EACA;EACA;;AAED;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC,OA3HQ;EA4HR;;AAEF;EACC,OA3HS;EA4HT;EACA;EACA;;AACA;EACC;;;AAGF;EACC;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;;AACA;EACC;;AACA;EACC;;AACA;EACC,OA5JM;;AA6JP;EACC,OA5JM;;AA6JP;EACC,OAlKM;;AAmKP;EACC,OAjKM;;AAkKR;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;;AACA;EACC,OA1KM;;AA2KP;EACC,OAhLM;;AAiLR;EACC;EACA;;AACA;EACC,kBAtLM;EAuLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;;;AAEN;EACC;EACA;EACA;;AACA;EACC,OA3MS;EA4MT;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACA;EACC,OAtNQ;;AAuNT;EACC,OAxNQ;;AAyNT;EACC;EACA;;AAEF;EACC,OA9NS;EA+NT;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;;AACA;EACC;;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC,kBAvPS;EAwPT;EACA,OAvPS;EAwPT;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACF;EACC;;AACA;EACC,OA1QO;EA2QP;;AACD;EACC,OA7QO;;AA8QR;EACC;EACA;;AACD;EACC;;;AAEJ;EACC;;;AAED;EACC;IACC;;EACD;IACC","file":"index.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../src/index.sass"],"names":[],"mappings":"AAUA;EACC;;;AAED;EACC,kBAbU;EAcV,OAZU;EAaV,aATU;EAUV;EACA;EACA;EACA;;;AAED;EACC,aAhBU;;;AAkBX;EACC;;;AAED;EACC;EACA;EACA;;AACA;EACC,kBAhCS;EAiCT;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;;;AAEH;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;;AACF;EACC;;AACA;EACC;;;AAEH;EACC;EACA;;AAEC;EACC;EACA;;AACD;EACC;EACA;EACA;EACA,OAvEQ;EAwER;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA,OA9FM;;AA+FR;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAEJ;EACC;EACA;EACA;;AAED;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC,OA3HQ;EA4HR;;AAEF;EACC,OA3HS;EA4HT;EACA;EACA;;AACA;EACC;;;AAGF;EACC;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;;AACA;EACC;;AACA;EACC;;AACA;EACC,OA5JM;;AA6JP;EACC,OA5JM;;AA6JP;EACC,OAlKM;;AAmKP;EACC,OAjKM;;AAkKR;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;;AACA;EACC,OA1KM;;AA2KP;EACC,OAhLM;;AAiLR;EACC;EACA;;AACA;EACC,kBAtLM;EAuLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;;;AAEN;EACC;EACA;EACA;;AACA;EACC,OA3MS;EA4MT;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACA;EACC,OAtNQ;;AAuNT;EACC,OAxNQ;;AAyNT;EACC;EACA;;AAEF;EACC,OA9NS;EA+NT;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;;AACA;EACC;;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC,kBAvPS;EAwPT;EACA,OAvPS;EAwPT;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACF;EACC;;AACA;EACC,OA1QO;EA2QP;;AACD;EACC,OA7QO;;AA8QR;EACC;EACA;;AACD;EACC;;;AAEJ;EACC;;;AAED;EACC;IACC;;EACD;IACC","file":"index.css"}
\ No newline at end of file
diff --git a/ui/html/index.html b/start/html/index.html
similarity index 100%
rename from ui/html/index.html
rename to start/html/index.html
diff --git a/ui/html/index.js b/start/html/index.js
similarity index 100%
rename from ui/html/index.js
rename to start/html/index.js
diff --git a/ui/jhtml-compat/index.css b/start/index.css
similarity index 99%
rename from ui/jhtml-compat/index.css
rename to start/index.css
index d0e213e..6ba3513 100644
--- a/ui/jhtml-compat/index.css
+++ b/start/index.css
@@ -337,5 +337,3 @@ input, button {
     transform: rotate(360deg);
   }
 }
-
-/*# sourceMappingURL=index.css.map */
diff --git a/ui/jhtml-compat/index.js b/start/index.js
similarity index 100%
rename from ui/jhtml-compat/index.js
rename to start/index.js
diff --git a/ui/jhtml-compat/index.php b/start/index.php
similarity index 100%
rename from ui/jhtml-compat/index.php
rename to start/index.php
diff --git a/ui/raw/favicon.png b/start/src/favicon.png
similarity index 100%
rename from ui/raw/favicon.png
rename to start/src/favicon.png
diff --git a/ui/raw/feather.js b/start/src/feather.js
similarity index 100%
rename from ui/raw/feather.js
rename to start/src/feather.js
diff --git a/ui/raw/index.js b/start/src/index.js
similarity index 100%
rename from ui/raw/index.js
rename to start/src/index.js
diff --git a/ui/raw/index.pug b/start/src/index.pug
similarity index 100%
rename from ui/raw/index.pug
rename to start/src/index.pug
diff --git a/ui/raw/index.sass b/start/src/index.sass
similarity index 100%
rename from ui/raw/index.sass
rename to start/src/index.sass
diff --git a/ui/compile.sh b/start/util/compile.sh
similarity index 67%
rename from ui/compile.sh
rename to start/util/compile.sh
index 7ca6bec..5de6046 100755
--- a/ui/compile.sh
+++ b/start/util/compile.sh
@@ -3,7 +3,7 @@
 ### compile to regular html and css
 
 # compile pug
-pug raw/index.pug -o html
+pug ../src/index.pug -o ../html
 echo "<title>dnswatch</title>
 <link rel=\"stylesheet\" href=\"index.css\">
 <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;700&amp;display=swap\">
@@ -11,15 +11,15 @@ echo "<title>dnswatch</title>
 <meta content=\"text/html;charset=utf-8\" http-equiv=\"Content-Type\">
 <meta content=\"utf-8\" http-equiv=\"encoding\">
 <script src=\"index.js\"></script>
-<script src=\"https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js\"></script>" | cat - html/index.html > temp
-mv temp html/index.html
-echo "<script src=\"feather.js\"></script>" >> html/index.html
+<script src=\"https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js\"></script>" | cat - ../html/index.html > temp
+mv temp ../html/index.html
+echo "<script src=\"feather.js\"></script>" >> ../html/index.html
 
 # compile sass
-sass raw/index.sass html/index.css
+sass ../src/index.sass ../html/index.css
 
 # move js
-cp raw/*.js html
+cp ../src/*.js ../html
 
 # move favicon
-cp raw/favicon.png html
+cp ../src/favicon.png ../html
diff --git a/start/util/jhtml-compile.sh b/start/util/jhtml-compile.sh
new file mode 100755
index 0000000..4317790
--- /dev/null
+++ b/start/util/jhtml-compile.sh
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+### make code compatible with jhtml
+
+# compile pug
+pug ../src/index.pug -o ..
+mv ../index.html ../index.php
+echo "*title(\"dnswatch\")
+*icon()
+*style(\"///index.css\")
+*style(\"https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;700&amp;display=swap\")
+*js(\"///index.js\")
+*js(\"https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js\")
+*postjs(\"///feather.js\")" | cat - ../index.php > temp
+mv temp ../index.php
+
+# compile sass
+sass ../src/index.sass ../index.css --no-source-map
+echo '*stop()' | cat - ../index.css > temp
+mv temp ../index.css
+
+# move js
+cp ../src/*.js ..
+echo '*stop()' | cat - ../index.js > temp
+mv temp ../index.js
diff --git a/ui/jhtml-compat/index.css.map b/ui/jhtml-compat/index.css.map
deleted file mode 100644
index 2b98575..0000000
--- a/ui/jhtml-compat/index.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["../raw/index.sass"],"names":[],"mappings":"AAUA;EACC;;;AAED;EACC,kBAbU;EAcV,OAZU;EAaV,aATU;EAUV;EACA;EACA;EACA;;;AAED;EACC,aAhBU;;;AAkBX;EACC;;;AAED;EACC;EACA;EACA;;AACA;EACC,kBAhCS;EAiCT;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;;;AAEH;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;;AACF;EACC;;AACA;EACC;;;AAEH;EACC;EACA;;AAEC;EACC;EACA;;AACD;EACC;EACA;EACA;EACA,OAvEQ;EAwER;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA,OA9FM;;AA+FR;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAEJ;EACC;EACA;EACA;;AAED;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC,OA3HQ;EA4HR;;AAEF;EACC,OA3HS;EA4HT;EACA;EACA;;AACA;EACC;;;AAGF;EACC;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;;AACA;EACC;;AACA;EACC;;AACA;EACC,OA5JM;;AA6JP;EACC,OA5JM;;AA6JP;EACC,OAlKM;;AAmKP;EACC,OAjKM;;AAkKR;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;;AACA;EACC,OA1KM;;AA2KP;EACC,OAhLM;;AAiLR;EACC;EACA;;AACA;EACC,kBAtLM;EAuLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;;;AAEN;EACC;EACA;EACA;;AACA;EACC,OA3MS;EA4MT;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACA;EACC,OAtNQ;;AAuNT;EACC,OAxNQ;;AAyNT;EACC;EACA;;AAEF;EACC,OA9NS;EA+NT;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;;AACA;EACC;;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC,kBAvPS;EAwPT;EACA,OAvPS;EAwPT;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;AACF;EACC;;AACA;EACC,OA1QO;EA2QP;;AACD;EACC,OA7QO;;AA8QR;EACC;EACA;;AACD;EACC;;;AAEJ;EACC;;;AAED;EACC;IACC;;EACD;IACC","file":"index.css"}
\ No newline at end of file
diff --git a/ui/jhtml-compile.sh b/ui/jhtml-compile.sh
deleted file mode 100755
index 7a853a9..0000000
--- a/ui/jhtml-compile.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-### make code compatible with jhtml
-
-# compile pug
-pug raw/index.pug -o jhtml-compat
-mv jhtml-compat/index.html jhtml-compat/index.php
-echo "*title(\"dnswatch\")
-*icon()
-*style(\"///index.css\")
-*style(\"https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;700&amp;display=swap\")
-*js(\"///index.js\")
-*js(\"https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js\")
-*postjs(\"///feather.js\")" | cat - jhtml-compat/index.php > temp
-mv temp jhtml-compat/index.php
-
-# compile sass
-sass raw/index.sass jhtml-compat/index.css
-echo '*stop()' | cat - jhtml-compat/index.css > temp
-mv temp jhtml-compat/index.css
-
-# move js
-cp raw/*.js jhtml-compat
-echo '*stop()' | cat - jhtml-compat/index.js > temp
-mv temp jhtml-compat/index.js