diff --git a/articles/datenschutz.php b/articles/datenschutz.php
index 1fca9b7..9114415 100644
--- a/articles/datenschutz.php
+++ b/articles/datenschutz.php
@@ -37,7 +37,7 @@
         	|
         	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-        	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+        	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
             </div>
         </nav>
     <main>
diff --git a/articles/pythagoras.php b/articles/pythagoras.php
index 3e82420..5cec6b2 100644
--- a/articles/pythagoras.php
+++ b/articles/pythagoras.php
@@ -37,7 +37,7 @@
         	|
         	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-        	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+        	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
             </div>
         </nav>
     <main>
diff --git a/articles/tunneleffekt.php b/articles/tunneleffekt.php
index 6759a3b..c8203dd 100644
--- a/articles/tunneleffekt.php
+++ b/articles/tunneleffekt.php
@@ -37,7 +37,7 @@
     	|
     	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-    	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+    	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
         </div>
     </nav>
     <main>
diff --git a/auth/register.php b/auth/register.php
deleted file mode 100644
index c727260..0000000
--- a/auth/register.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-    Form: Registrierung
-    Funktion: Erstellung neuer Benutzerkonten
--->
-<!DOCTYPE html>
-<html lang="de">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="description" content="EduForge">
-    <meta name="author" content="Niklas Ortmann">
-    <link rel="stylesheet" href="../css/main.css" />
-    <title>EduForge</title>
-</head>
-
-<body>
-
-    <nav style="background:#808080; height: 60px;">
-        <div style="float:left; text-align: center;">
-            <a href="../index.php">
-    	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
-    	    </a>
-        |
-    	<a href = "../informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
-    	|
-    	<a href = "../mathe.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
-    	|
-    	<a href = "../physik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
-    	|
-    	<a href = "../profile.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
-    	|
-    	</div>
-        <div style="float:right; text-align: center;">
-    	<?php
-    	include_once '../includes/search.php';
-    	?>
-    	|
-    	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
-
-    	<a href = "register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
-        </div>
-    </nav>
-
-    <main>
-    <div style="width: 50%">
-        <div style="width: 130px;">
-            <img src="../images/logos/logo.png" alt="" width="120" height="72">
-        </div>
-
-        <h1 style="width: 50%; text-align: center">Jetzt Registrieren!</h1><br>
-
-        <p style="width: 80%;"> Email:</p>
-        <input type="email" name="email"  style="width: 80%;" placeholder="mustermann@web.de" required>
-        <p  style="width: 80%;"> Vorname:</p>
-        <input type="text" name="vorname"  style="width: 80%;" placeholder="Max" required>
-        <p  style="width: 80%;"> Nachname:</p>
-        <input type="text" name="nachname"  style="width: 80%;" placeholder="Mustermann" required>
-
-        <p  style="width: 80%;"> Passwort:</p>
-        <input type="password" name="password"  style="width: 80%;" placeholder="Passwort" required>
-        <div style="width: 80%;">
-            <label>
-                <input type="checkbox" value="remember-me"> angemeldet bleiben
-            </label>
-        </div>
-        <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">kostenlos registrieren</button>
-    </div>
-    </main>
-    <footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
-        <a href="../legal/impressum.php">Impressum</a>
-        <a href="../legal/datenschutz.php">Datenschutz</a>
-        <a href="../legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
-    </footer>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/legal/datenschutz.php b/legal/datenschutz.php
index f2b96a5..a269957 100644
--- a/legal/datenschutz.php
+++ b/legal/datenschutz.php
@@ -38,7 +38,7 @@
             	|
             	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-            	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+            	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
                 </div>
             </nav>
 
diff --git a/legal/impressum.php b/legal/impressum.php
index 42eb37f..8f3d412 100644
--- a/legal/impressum.php
+++ b/legal/impressum.php
@@ -38,7 +38,7 @@
             	|
             	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-            	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+            	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
                 </div>
             </nav>
 
diff --git a/legal/nutzungsbedingungen.php b/legal/nutzungsbedingungen.php
index 15e461c..e9b78b4 100644
--- a/legal/nutzungsbedingungen.php
+++ b/legal/nutzungsbedingungen.php
@@ -37,7 +37,7 @@
             	|
             	<a href = "../login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
 
-            	<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+            	<a href = "../register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
                 </div>
             </nav>
 
diff --git a/login.php b/login.php
index 0977f06..eb329a1 100644
--- a/login.php
+++ b/login.php
@@ -41,7 +41,7 @@ include_once 'content/home.php';
         </div>
         <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">anmelden</button><br>
         <div style="width: 70%; text-align: center">
-            <a href="auth/register.php" style="text-align: center;"> Noch keinen Account? Jetzt hier registrieren! </a>
+            <a href="register.php" style="text-align: center;"> Noch keinen Account? Jetzt hier registrieren! </a>
         </div>
     </div>
 </main>
diff --git a/register.php b/register.php
new file mode 100644
index 0000000..d7ea897
--- /dev/null
+++ b/register.php
@@ -0,0 +1,54 @@
+<!--
+    Form: Registrierung
+    Funktion: Erstellung neuer Benutzerkonten
+-->
+<!DOCTYPE html>
+<html lang="de">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="description" content="EduForge">
+    <meta name="author" content="Niklas Ortmann">
+    <link rel="stylesheet" href="css/main.css" />
+    <title>EduForge</title>
+</head>
+
+<body>
+
+<?php
+include_once 'includes/navbar.php';
+//Dynamischer Inhalt (später mit php...):
+include_once 'content/home.php';
+?>
+
+    <main>
+    <div style="width: 50%">
+        <div style="width: 130px;">
+            <img src="images/logos/logo.png" alt="" width="120" height="72">
+        </div>
+
+        <h1 style="width: 50%; text-align: center">Jetzt Registrieren!</h1><br>
+
+        <p style="width: 80%;"> Email:</p>
+        <input type="email" name="email"  style="width: 80%;" placeholder="mustermann@web.de" required>
+        <p  style="width: 80%;"> Vorname:</p>
+        <input type="text" name="vorname"  style="width: 80%;" placeholder="Max" required>
+        <p  style="width: 80%;"> Nachname:</p>
+        <input type="text" name="nachname"  style="width: 80%;" placeholder="Mustermann" required>
+
+        <p  style="width: 80%;"> Passwort:</p>
+        <input type="password" name="password"  style="width: 80%;" placeholder="Passwort" required>
+        <div style="width: 80%;">
+            <label>
+                <input type="checkbox" value="remember-me"> angemeldet bleiben
+            </label>
+        </div>
+        <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">kostenlos registrieren</button>
+    </div>
+    </main>
+    <?php
+    include_once 'includes/footer.php';
+    ?>
+</body>
+
+</html>
\ No newline at end of file
