diff --git a/.idea/WebDB.iml b/.idea/WebDB.iml
index 0d7f9d7..b313593 100644
--- a/.idea/WebDB.iml
+++ b/.idea/WebDB.iml
@@ -14,15 +14,5 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/website/php/connect.php b/website/connect.php
similarity index 100%
rename from website/php/connect.php
rename to website/connect.php
diff --git a/website/admin.php b/website/public/admin.php
similarity index 66%
rename from website/admin.php
rename to website/public/admin.php
index 7529705..5faa096 100644
--- a/website/admin.php
+++ b/website/public/admin.php
@@ -1,7 +1,7 @@
-
+
@@ -12,13 +12,13 @@
* This view adds the main layout over the screen.
* Header and menu.
*/
-include("views/main.php");
+include("../views/main.php");
/* Add your view files here. */
-include("views/adminpanel.php");
+include("../views/adminpanel.php");
/* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
?>
diff --git a/website/chat.php b/website/public/chat.php
similarity index 66%
rename from website/chat.php
rename to website/public/chat.php
index b2ed584..f077a4d 100644
--- a/website/chat.php
+++ b/website/public/chat.php
@@ -1,7 +1,7 @@
-
+
@@ -12,13 +12,13 @@
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
-include("views/main.php");
+include("../views/main.php");
/* Add your view files here. */
-include("views/chat-view.php");
+include("../views/chat-view.php");
/* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
?>
diff --git a/website/fonts/FontAwesome.otf b/website/public/fonts/FontAwesome.otf
similarity index 100%
rename from website/fonts/FontAwesome.otf
rename to website/public/fonts/FontAwesome.otf
diff --git a/website/fonts/fontawesome-webfont.eot b/website/public/fonts/fontawesome-webfont.eot
similarity index 100%
rename from website/fonts/fontawesome-webfont.eot
rename to website/public/fonts/fontawesome-webfont.eot
diff --git a/website/fonts/fontawesome-webfont.svg b/website/public/fonts/fontawesome-webfont.svg
similarity index 100%
rename from website/fonts/fontawesome-webfont.svg
rename to website/public/fonts/fontawesome-webfont.svg
diff --git a/website/fonts/fontawesome-webfont.ttf b/website/public/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from website/fonts/fontawesome-webfont.ttf
rename to website/public/fonts/fontawesome-webfont.ttf
diff --git a/website/fonts/fontawesome-webfont.woff b/website/public/fonts/fontawesome-webfont.woff
similarity index 100%
rename from website/fonts/fontawesome-webfont.woff
rename to website/public/fonts/fontawesome-webfont.woff
diff --git a/website/fonts/fontawesome-webfont.woff2 b/website/public/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from website/fonts/fontawesome-webfont.woff2
rename to website/public/fonts/fontawesome-webfont.woff2
diff --git a/website/group.php b/website/public/group.php
similarity index 67%
rename from website/group.php
rename to website/public/group.php
index 819c630..ee20feb 100644
--- a/website/group.php
+++ b/website/public/group.php
@@ -1,7 +1,7 @@
-
+
@@ -12,13 +12,13 @@
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
-include("views/main.php");
+include("../views/main.php");
/* Add your view files here. */
-include("views/group.php");
+include("../views/group.php");
/* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
?>
diff --git a/website/img/add-friend.png b/website/public/img/add-friend.png
similarity index 100%
rename from website/img/add-friend.png
rename to website/public/img/add-friend.png
diff --git a/website/img/leave-group.png b/website/public/img/leave-group.png
similarity index 100%
rename from website/img/leave-group.png
rename to website/public/img/leave-group.png
diff --git a/website/img/top-logo.png b/website/public/img/top-logo.png
similarity index 100%
rename from website/img/top-logo.png
rename to website/public/img/top-logo.png
diff --git a/website/js/dobPicker.js b/website/public/js/dobPicker.js
similarity index 100%
rename from website/js/dobPicker.js
rename to website/public/js/dobPicker.js
diff --git a/website/js/dobPicker.min.js b/website/public/js/dobPicker.min.js
similarity index 100%
rename from website/js/dobPicker.min.js
rename to website/public/js/dobPicker.min.js
diff --git a/website/js/header.js b/website/public/js/header.js
similarity index 100%
rename from website/js/header.js
rename to website/public/js/header.js
diff --git a/website/js/jquery.js b/website/public/js/jquery.js
similarity index 100%
rename from website/js/jquery.js
rename to website/public/js/jquery.js
diff --git a/website/js/menu.js b/website/public/js/menu.js
similarity index 100%
rename from website/js/menu.js
rename to website/public/js/menu.js
diff --git a/website/login.php b/website/public/login.php
similarity index 99%
rename from website/login.php
rename to website/public/login.php
index 4fc0321..dbce625 100644
--- a/website/login.php
+++ b/website/public/login.php
@@ -17,7 +17,7 @@
alt="MyHyvesbook+">
-