diff --git a/articles/datenschutz.php b/articles/datenschutz.php
index ead9f69..1fca9b7 100644
--- a/articles/datenschutz.php
+++ b/articles/datenschutz.php
@@ -35,7 +35,7 @@
         	include_once '../includes/search.php';
         	?>
         	|
-        	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+        	<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>
             </div>
diff --git a/articles/pythagoras.php b/articles/pythagoras.php
index fde51d5..3e82420 100644
--- a/articles/pythagoras.php
+++ b/articles/pythagoras.php
@@ -35,7 +35,7 @@
         	include_once '../includes/search.php';
         	?>
         	|
-        	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+        	<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>
             </div>
diff --git a/articles/tunneleffekt.php b/articles/tunneleffekt.php
index 2dd0953..6759a3b 100644
--- a/articles/tunneleffekt.php
+++ b/articles/tunneleffekt.php
@@ -35,7 +35,7 @@
     	include_once '../includes/search.php';
     	?>
     	|
-    	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+    	<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>
         </div>
diff --git a/auth/login.php b/auth/login.php
deleted file mode 100644
index e6b2370..0000000
--- a/auth/login.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--
-    Form: Login-Bereich
-    Funktion: Benutzerauthentifizierung und Zugang zum eigenen Profil, Erstellen von Beiträgen, etc.
--->
-<!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: 60%; text-align: center">Bitte anmelden</h1><br>
-
-        <label id="inputEmail" >E-Mail-Adresse / </label>
-        <p style="width: 80%;">Benutzername/E-Mail-Adresse:</p>
-        <input type="email" name="email" style="width: 80%;" placeholder="E-Mail-Adresse" required autofocus>
-        <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" name="remember-me" value="1"> angemeldet bleiben
-            </label>
-        </div>
-        <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">anmelden</button><br>
-        <div style="width: 70%; text-align: center">
-            <a href="register.php" style="text-align: center;"> Noch keinen Account? Jetzt hier registrieren! </a>
-        </div>
-    </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/auth/register.php b/auth/register.php
index 3e82a72..c727260 100644
--- a/auth/register.php
+++ b/auth/register.php
@@ -35,7 +35,7 @@
     	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 = "../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>
diff --git a/legal/datenschutz.php b/legal/datenschutz.php
index 10539a2..f2b96a5 100644
--- a/legal/datenschutz.php
+++ b/legal/datenschutz.php
@@ -36,7 +36,7 @@
             	include_once '../includes/search.php';
             	?>
             	|
-            	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+            	<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>
                 </div>
diff --git a/legal/impressum.php b/legal/impressum.php
index 3270474..42eb37f 100644
--- a/legal/impressum.php
+++ b/legal/impressum.php
@@ -36,7 +36,7 @@
             	include_once '../includes/search.php';
             	?>
             	|
-            	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+            	<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>
                 </div>
diff --git a/legal/nutzungsbedingungen.php b/legal/nutzungsbedingungen.php
index d510345..15e461c 100644
--- a/legal/nutzungsbedingungen.php
+++ b/legal/nutzungsbedingungen.php
@@ -35,7 +35,7 @@
             	include_once '../includes/search.php';
             	?>
             	|
-            	<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+            	<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>
                 </div>
diff --git a/login.php b/login.php
new file mode 100644
index 0000000..0977f06
--- /dev/null
+++ b/login.php
@@ -0,0 +1,53 @@
+<!--
+    Form: Login-Bereich
+    Funktion: Benutzerauthentifizierung und Zugang zum eigenen Profil, Erstellen von Beiträgen, etc.
+-->
+<!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/logo.png" alt="" width="120" height="72">
+        </div>
+
+        <h1 style="width: 60%; text-align: center">Bitte anmelden</h1><br>
+
+        <label id="inputEmail" >E-Mail-Adresse / </label>
+        <p style="width: 80%;">Benutzername/E-Mail-Adresse:</p>
+        <input type="email" name="email" style="width: 80%;" placeholder="E-Mail-Adresse" required autofocus>
+        <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" name="remember-me" value="1"> angemeldet bleiben
+            </label>
+        </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>
+        </div>
+    </div>
+</main>
+<?php
+include_once 'includes/footer.php';
+?>
+</body>
+
+</html>
\ No newline at end of file
