diff --git a/landingpage/landingpage/assets/css/animations.css b/landingpage/assets/css/animations.css
similarity index 100%
rename from landingpage/landingpage/assets/css/animations.css
rename to landingpage/assets/css/animations.css
diff --git a/landingpage/landingpage/assets/css/chatbot.css b/landingpage/assets/css/chatbot.css
similarity index 100%
rename from landingpage/landingpage/assets/css/chatbot.css
rename to landingpage/assets/css/chatbot.css
diff --git a/landingpage/landingpage/assets/css/faq.css b/landingpage/assets/css/faq.css
similarity index 100%
rename from landingpage/landingpage/assets/css/faq.css
rename to landingpage/assets/css/faq.css
diff --git a/landingpage/landingpage/assets/css/flickity.css b/landingpage/assets/css/flickity.css
similarity index 100%
rename from landingpage/landingpage/assets/css/flickity.css
rename to landingpage/assets/css/flickity.css
diff --git a/landingpage/landingpage/assets/css/icons.css b/landingpage/assets/css/icons.css
similarity index 100%
rename from landingpage/landingpage/assets/css/icons.css
rename to landingpage/assets/css/icons.css
diff --git a/landingpage/landingpage/assets/css/main.css b/landingpage/assets/css/main.css
similarity index 100%
rename from landingpage/landingpage/assets/css/main.css
rename to landingpage/assets/css/main.css
diff --git a/landingpage/landingpage/assets/css/responsive.css b/landingpage/assets/css/responsive.css
similarity index 100%
rename from landingpage/landingpage/assets/css/responsive.css
rename to landingpage/assets/css/responsive.css
diff --git a/landingpage/landingpage/assets/css/theme.css b/landingpage/assets/css/theme.css
similarity index 100%
rename from landingpage/landingpage/assets/css/theme.css
rename to landingpage/assets/css/theme.css
diff --git a/landingpage/landingpage/assets/css/variables.css b/landingpage/assets/css/variables.css
similarity index 100%
rename from landingpage/landingpage/assets/css/variables.css
rename to landingpage/assets/css/variables.css
diff --git a/landingpage/landingpage/assets/csv/faq.csv b/landingpage/assets/csv/faq.csv
similarity index 100%
rename from landingpage/landingpage/assets/csv/faq.csv
rename to landingpage/assets/csv/faq.csv
diff --git a/landingpage/landingpage/assets/fonts/LICENSE b/landingpage/assets/fonts/LICENSE
similarity index 100%
rename from landingpage/landingpage/assets/fonts/LICENSE
rename to landingpage/assets/fonts/LICENSE
diff --git a/landingpage/landingpage/assets/fonts/README b/landingpage/assets/fonts/README
similarity index 100%
rename from landingpage/landingpage/assets/fonts/README
rename to landingpage/assets/fonts/README
diff --git a/landingpage/landingpage/assets/fonts/icons.eot b/landingpage/assets/fonts/icons.eot
similarity index 100%
rename from landingpage/landingpage/assets/fonts/icons.eot
rename to landingpage/assets/fonts/icons.eot
diff --git a/landingpage/landingpage/assets/fonts/icons.ttf b/landingpage/assets/fonts/icons.ttf
similarity index 100%
rename from landingpage/landingpage/assets/fonts/icons.ttf
rename to landingpage/assets/fonts/icons.ttf
diff --git a/landingpage/landingpage/assets/fonts/icons.woff b/landingpage/assets/fonts/icons.woff
similarity index 100%
rename from landingpage/landingpage/assets/fonts/icons.woff
rename to landingpage/assets/fonts/icons.woff
diff --git a/landingpage/landingpage/assets/images/GitLab_Logo.svg.png b/landingpage/assets/images/GitLab_Logo.svg.png
similarity index 100%
rename from landingpage/landingpage/assets/images/GitLab_Logo.svg.png
rename to landingpage/assets/images/GitLab_Logo.svg.png
diff --git a/landingpage/landingpage/assets/images/d.jpg b/landingpage/assets/images/d.jpg
similarity index 100%
rename from landingpage/landingpage/assets/images/d.jpg
rename to landingpage/assets/images/d.jpg
diff --git a/landingpage/landingpage/assets/images/d14.png b/landingpage/assets/images/d14.png
similarity index 100%
rename from landingpage/landingpage/assets/images/d14.png
rename to landingpage/assets/images/d14.png
diff --git a/landingpage/landingpage/assets/images/dc.png b/landingpage/assets/images/dc.png
similarity index 100%
rename from landingpage/landingpage/assets/images/dc.png
rename to landingpage/assets/images/dc.png
diff --git a/landingpage/landingpage/assets/images/e.jpg b/landingpage/assets/images/e.jpg
similarity index 100%
rename from landingpage/landingpage/assets/images/e.jpg
rename to landingpage/assets/images/e.jpg
diff --git a/landingpage/landingpage/assets/images/fbiLogo.png b/landingpage/assets/images/fbiLogo.png
similarity index 100%
rename from landingpage/landingpage/assets/images/fbiLogo.png
rename to landingpage/assets/images/fbiLogo.png
diff --git a/landingpage/landingpage/assets/images/hda-logo.png b/landingpage/assets/images/hda-logo.png
similarity index 100%
rename from landingpage/landingpage/assets/images/hda-logo.png
rename to landingpage/assets/images/hda-logo.png
diff --git a/landingpage/landingpage/assets/images/head-accent.png b/landingpage/assets/images/head-accent.png
similarity index 100%
rename from landingpage/landingpage/assets/images/head-accent.png
rename to landingpage/assets/images/head-accent.png
diff --git a/landingpage/landingpage/assets/images/head-accent2.png b/landingpage/assets/images/head-accent2.png
similarity index 100%
rename from landingpage/landingpage/assets/images/head-accent2.png
rename to landingpage/assets/images/head-accent2.png
diff --git a/landingpage/landingpage/assets/images/header-bg.png b/landingpage/assets/images/header-bg.png
similarity index 100%
rename from landingpage/landingpage/assets/images/header-bg.png
rename to landingpage/assets/images/header-bg.png
diff --git a/landingpage/landingpage/assets/images/kimi/bubble_active.png b/landingpage/assets/images/kimi/bubble_active.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/bubble_active.png
rename to landingpage/assets/images/kimi/bubble_active.png
diff --git a/landingpage/landingpage/assets/images/kimi/bubble_inactive.png b/landingpage/assets/images/kimi/bubble_inactive.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/bubble_inactive.png
rename to landingpage/assets/images/kimi/bubble_inactive.png
diff --git a/landingpage/landingpage/assets/images/kimi/confused.png b/landingpage/assets/images/kimi/confused.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/confused.png
rename to landingpage/assets/images/kimi/confused.png
diff --git a/landingpage/landingpage/assets/images/kimi/curious.png b/landingpage/assets/images/kimi/curious.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/curious.png
rename to landingpage/assets/images/kimi/curious.png
diff --git a/landingpage/landingpage/assets/images/kimi/friendly.png b/landingpage/assets/images/kimi/friendly.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/friendly.png
rename to landingpage/assets/images/kimi/friendly.png
diff --git a/landingpage/landingpage/assets/images/kimi/glad.png b/landingpage/assets/images/kimi/glad.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/glad.png
rename to landingpage/assets/images/kimi/glad.png
diff --git a/landingpage/landingpage/assets/images/kimi/happy.png b/landingpage/assets/images/kimi/happy.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/happy.png
rename to landingpage/assets/images/kimi/happy.png
diff --git a/landingpage/landingpage/assets/images/kimi/sad.png b/landingpage/assets/images/kimi/sad.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/sad.png
rename to landingpage/assets/images/kimi/sad.png
diff --git a/landingpage/landingpage/assets/images/kimi/winking.png b/landingpage/assets/images/kimi/winking.png
similarity index 100%
rename from landingpage/landingpage/assets/images/kimi/winking.png
rename to landingpage/assets/images/kimi/winking.png
diff --git a/landingpage/landingpage/assets/images/moodleLogo.png b/landingpage/assets/images/moodleLogo.png
similarity index 100%
rename from landingpage/landingpage/assets/images/moodleLogo.png
rename to landingpage/assets/images/moodleLogo.png
diff --git a/landingpage/landingpage/assets/images/obs_standart.png b/landingpage/assets/images/obs_standart.png
similarity index 100%
rename from landingpage/landingpage/assets/images/obs_standart.png
rename to landingpage/assets/images/obs_standart.png
diff --git a/landingpage/landingpage/assets/images/placeholder.png b/landingpage/assets/images/placeholder.png
similarity index 100%
rename from landingpage/landingpage/assets/images/placeholder.png
rename to landingpage/assets/images/placeholder.png
diff --git a/landingpage/landingpage/assets/images/qis_standart.png b/landingpage/assets/images/qis_standart.png
similarity index 100%
rename from landingpage/landingpage/assets/images/qis_standart.png
rename to landingpage/assets/images/qis_standart.png
diff --git a/landingpage/landingpage/assets/images/roundcube.png b/landingpage/assets/images/roundcube.png
similarity index 100%
rename from landingpage/landingpage/assets/images/roundcube.png
rename to landingpage/assets/images/roundcube.png
diff --git a/landingpage/landingpage/assets/js/flickity.pkgd.min.js b/landingpage/assets/js/flickity.pkgd.min.js
similarity index 100%
rename from landingpage/landingpage/assets/js/flickity.pkgd.min.js
rename to landingpage/assets/js/flickity.pkgd.min.js
diff --git a/landingpage/landingpage/assets/js/landingpg.js b/landingpage/assets/js/landingpg.js
similarity index 100%
rename from landingpage/landingpage/assets/js/landingpg.js
rename to landingpage/assets/js/landingpg.js
diff --git a/landingpage/landingpage/assets/js/mockup.js b/landingpage/assets/js/mockup.js
similarity index 100%
rename from landingpage/landingpage/assets/js/mockup.js
rename to landingpage/assets/js/mockup.js
diff --git a/landingpage/documentation.md b/landingpage/documentation.md
deleted file mode 100644
index 62ce91012232de93180efa92b279651dfcb9d2a4..0000000000000000000000000000000000000000
--- a/landingpage/documentation.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dokumentation
-#### Überarbeitung der landing page:
-
-Bilder suchen + anpassen:
-* Die verschiedenen Bilder getestet und eine passende Farbe ausgewählt.
-* Die Bilder passend zugeschnitten und der Landingpage angepasst.
-Implementation der Animationen (Frag mich section, Chatbubble, wichtige Portale)
-
-Erstellen und Einfügen der FAQ
-
-Einfügen des Responsive Designs (Mobile, Tablet)
diff --git a/landingpage/landingpage/index.html b/landingpage/index.html
similarity index 98%
rename from landingpage/landingpage/index.html
rename to landingpage/index.html
index 338936caadb4822b88cbbc0d64d4336656b38725..d18392f17781c282b401976cb69371db499643ce 100644
--- a/landingpage/landingpage/index.html
+++ b/landingpage/index.html
@@ -155,6 +155,7 @@
                 <a href="#" class="chat__header__minimize" onclick="closeChat()">&#x2304;</a>
             </div>
             <div class="chat__dialogue">
+                <!--
                 <div class="chat__dialogue__answer speech-bubble speech-bubble--left-top">
                     <p>Hallo ich bin KIMI :)<br>Wie kann ich dir helfen?</p>
                 </div>
@@ -164,10 +165,12 @@
                 <div class="chat__dialogue__answer speech-bubble speech-bubble--left-top">
                     <p>Danke dir :)</p>
                 </div>
+                -->
             </div>
+
             <div class="chat__footer">
-                <input type="text" class="chat__input" name="question" >
-                <a class="chat__input__submit" href="#">&#x25B6;</a>
+                <input type="text" class="chat__input" name="question" id="question">
+                <a class="chat__input__submit" href="#" id="submitText">&#x25B6;</a>
             </div>
         </div>
         <div class="chatbot__bubble chatbot__bubble--inactive" onclick="toggleChat()">
diff --git a/landingpage/landingpage/.gitignore b/landingpage/landingpage/.gitignore
deleted file mode 100644
index 485dee64bcfb48793379b200a1afd14e85a8aaf4..0000000000000000000000000000000000000000
--- a/landingpage/landingpage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea
diff --git a/landingpage/need_to_implement/.gitkeep b/landingpage/need_to_implement/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/landingpage/need_to_implement/faq/.gitkeep b/landingpage/need_to_implement/faq/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/landingpage/need_to_implement/faq/faq.csv b/landingpage/need_to_implement/faq/faq.csv
deleted file mode 100644
index a9aa4a790c109ecd349178ce5568e49690a76c59..0000000000000000000000000000000000000000
--- a/landingpage/need_to_implement/faq/faq.csv
+++ /dev/null
@@ -1 +0,0 @@
-What ist KIMI?,KIMI is our chatbot,what does KIMI?,KIMI help students who are new to university,Test question?,Answer for test question
diff --git a/landingpage/need_to_implement/faq/faq.php b/landingpage/need_to_implement/faq/faq.php
deleted file mode 100644
index f0f29ba5c09b85b8b99552fa3394e1234fd5bfde..0000000000000000000000000000000000000000
--- a/landingpage/need_to_implement/faq/faq.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-    <title>Title</title>
-    <style type="text/css">
-.question{
-    color:blue;
-    font-weight: bold;
-    text-align: center;
-
-}
-.answer{
-    color:black;
-    text-align: center;
-
-    }
-.faq-header{
-            font-family:bold;
-            text-align: center;
-        }
-</style>
-    </head>
-    <body>
-        <p class="faq-header">Frequently Asked Questions</p>
-<?php
-if (($handle = fopen("faq.csv", "r")) !== FALSE) {
-    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
-        $num = count($data);
-        for ($c=0; $c < $num; $c++) {
-            
-            if (($c % 2) ==0) {echo "<p class=\"question\" > " ;echo $data[$c];}
-            else if (($c % 2) ==1) {echo "<p class=\"answer\" > " . $data[$c];}
-            
-            echo "</p>";
-                       
-        }
-    }
-    fclose($handle);
-}
-?>
-    </body>
-</html>
\ No newline at end of file