diff --git a/.env.example b/.env.example
index 09d436f..ce81892 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1 @@
 DATABASE_URL=
-
-KEYCLOAK_CLIENT_ID=
-KEYCLOAK_CLIENT_SECRET=
-KEYCLOAK_ISSUER=
\ No newline at end of file
diff --git a/src/lib/components/LoginForm.svelte b/src/lib/components/Forms/LoginForm.svelte
similarity index 89%
rename from src/lib/components/LoginForm.svelte
rename to src/lib/components/Forms/LoginForm.svelte
index 481f51b..2bbd020 100644
--- a/src/lib/components/LoginForm.svelte
+++ b/src/lib/components/Forms/LoginForm.svelte
@@ -5,10 +5,10 @@
 	import { goto } from '$app/navigation';
 
 	import Logo from '$lib/components/Logo.svelte';
-	import FormInput from '$lib/components/FormInput.svelte';
-	import Button from '$lib/components/Button.svelte';
-	import ButtonText from '$lib/components/ButtonText.svelte';
-	import ButtonIcon from '$lib/components/ButtonIcon.svelte';
+	import FormInput from '$lib/components/Inputs/FormInput.svelte';
+	import Button from '$lib/components/Inputs/Button.svelte';
+	import ButtonText from '$lib/components/Inputs/ButtonText.svelte';
+	import ButtonIcon from '$lib/components/Inputs/ButtonIcon.svelte';
 
 	export let callback;
 
diff --git a/src/lib/components/RegisterForm.svelte b/src/lib/components/Forms/RegisterForm.svelte
similarity index 92%
rename from src/lib/components/RegisterForm.svelte
rename to src/lib/components/Forms/RegisterForm.svelte
index 8fb83a0..df3dd7b 100644
--- a/src/lib/components/RegisterForm.svelte
+++ b/src/lib/components/Forms/RegisterForm.svelte
@@ -5,10 +5,10 @@
 	import { goto } from '$app/navigation';
 
 	import Logo from '$lib/components/Logo.svelte';
-	import FormInput from '$lib/components/FormInput.svelte';
-	import Button from '$lib/components/Button.svelte';
-	import ButtonText from '$lib/components/ButtonText.svelte';
-	import ButtonIcon from '$lib/components/ButtonIcon.svelte';
+	import FormInput from '$lib/components/Inputs/FormInput.svelte';
+	import Button from '$lib/components/Inputs/Button.svelte';
+	import ButtonText from '$lib/components/Inputs/ButtonText.svelte';
+	import ButtonIcon from '$lib/components/Inputs/ButtonIcon.svelte';
 
 	export let callback;
 
diff --git a/src/lib/components/Button.svelte b/src/lib/components/Inputs/Button.svelte
similarity index 100%
rename from src/lib/components/Button.svelte
rename to src/lib/components/Inputs/Button.svelte
diff --git a/src/lib/components/ButtonIcon.svelte b/src/lib/components/Inputs/ButtonIcon.svelte
similarity index 100%
rename from src/lib/components/ButtonIcon.svelte
rename to src/lib/components/Inputs/ButtonIcon.svelte
diff --git a/src/lib/components/ButtonText.svelte b/src/lib/components/Inputs/ButtonText.svelte
similarity index 100%
rename from src/lib/components/ButtonText.svelte
rename to src/lib/components/Inputs/ButtonText.svelte
diff --git a/src/lib/components/FormInput.svelte b/src/lib/components/Inputs/FormInput.svelte
similarity index 100%
rename from src/lib/components/FormInput.svelte
rename to src/lib/components/Inputs/FormInput.svelte
diff --git a/src/lib/components/Link.svelte b/src/lib/components/Inputs/Link.svelte
similarity index 100%
rename from src/lib/components/Link.svelte
rename to src/lib/components/Inputs/Link.svelte
diff --git a/src/lib/components/ThemeSwitcher.svelte b/src/lib/components/ThemeSwitcher.svelte
index 73352dd..9d06943 100644
--- a/src/lib/components/ThemeSwitcher.svelte
+++ b/src/lib/components/ThemeSwitcher.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { Sun, Moon } from 'lucide-svelte';
 	import { darkMode } from '../stores';
-	import Button from './Button.svelte';
+	import Button from '$lib/components/Inputs/Button.svelte';
 
 	function toggleTheme() {
 		$darkMode = !$darkMode;
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 3a1dc22..d847af6 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -4,8 +4,8 @@
 
 	import { goBack } from '$lib/';
 
-	import Button from '$lib/components/Button.svelte';
-	import Link from '$lib/components/Link.svelte';
+	import Button from '$lib/components/Inputs/Button.svelte';
+	import Link from '$lib/components/Inputs/Link.svelte';
 </script>
 
 <div class="flex justify-center items-center h-screen">
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index cd1cb63..86b0b3b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -7,10 +7,10 @@
 	import { goto } from '$app/navigation';
 
 	import ThemeSwitcher from '$lib/components/ThemeSwitcher.svelte';
-	import Button from '$lib/components/Button.svelte';
+	import Button from '$lib/components/Inputs/Button.svelte';
 	import Logo from '$lib/components/Logo.svelte';
-	import LoginForm from '$lib/components/LoginForm.svelte';
-	import RegisterForm from '$lib/components/RegisterForm.svelte';
+	import LoginForm from '$lib/components/Forms/LoginForm.svelte';
+	import RegisterForm from '$lib/components/Forms/RegisterForm.svelte';
 
 	let state = writable('/landing');
 
diff --git a/src/routes/api/user/+server.js b/src/routes/api/user/+server.js
index ce44197..7806e5c 100644
--- a/src/routes/api/user/+server.js
+++ b/src/routes/api/user/+server.js
@@ -1,4 +1,8 @@
+import { json } from '@sveltejs/kit';
+
 /** @type {import('./$types').RequestHandler} */
 export async function GET(event) {
 	const { request, cookies, locals } = event;
+
+	return json(locals?.user);
 }
diff --git a/src/routes/dashboard/+page.server.js b/src/routes/dashboard/+page.server.js
new file mode 100644
index 0000000..a55ea5d
--- /dev/null
+++ b/src/routes/dashboard/+page.server.js
@@ -0,0 +1,3 @@
+export function load({ locals }) {
+	return { user: locals?.user };
+}
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
index 1985d33..e9c85ab 100644
--- a/src/routes/dashboard/+page.svelte
+++ b/src/routes/dashboard/+page.svelte
@@ -1,5 +1,9 @@
 <script>
 	import { user } from '$lib/stores';
+
+	export let data;
+
+	user.set(data?.user);
 </script>
 
 <p>