diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..da5fa458
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "group_transcendence",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/App_old.svelte b/srcs/requirements/svelte/api_front/old_unused/App_old.svelte
similarity index 97%
rename from srcs/requirements/svelte/api_front/src/old_unused/App_old.svelte
rename to srcs/requirements/svelte/api_front/old_unused/App_old.svelte
index e69b4dcc..4052bae1 100644
--- a/srcs/requirements/svelte/api_front/src/old_unused/App_old.svelte
+++ b/srcs/requirements/svelte/api_front/old_unused/App_old.svelte
@@ -6,7 +6,7 @@
 
   import LoginPage from "./LoginPage.svelte";
 	import UserPage from "../UserPage.svelte";
-    import NotFound from "../NotFound.svelte";
+    import NotFound from "../pages/NotFound.svelte";
 
 	// Ideally fuck all this shit in the long run
 	let pages = ['login', 'user', 'account'];
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/Canvas_1st_attempt.svelte b/srcs/requirements/svelte/api_front/old_unused/Canvas_1st_attempt.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/Canvas_1st_attempt.svelte
rename to srcs/requirements/svelte/api_front/old_unused/Canvas_1st_attempt.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/Canvas_weird_circles.svelte b/srcs/requirements/svelte/api_front/old_unused/Canvas_weird_circles.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/Canvas_weird_circles.svelte
rename to srcs/requirements/svelte/api_front/old_unused/Canvas_weird_circles.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/FlyingPotato.svelte b/srcs/requirements/svelte/api_front/old_unused/FlyingPotato.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/FlyingPotato.svelte
rename to srcs/requirements/svelte/api_front/old_unused/FlyingPotato.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/Header.svelte b/srcs/requirements/svelte/api_front/old_unused/Header.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/Header.svelte
rename to srcs/requirements/svelte/api_front/old_unused/Header.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/Header_Multi_old.svelte b/srcs/requirements/svelte/api_front/old_unused/Header_Multi_old.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/Header_Multi_old.svelte
rename to srcs/requirements/svelte/api_front/old_unused/Header_Multi_old.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/HomePage_old.svelte b/srcs/requirements/svelte/api_front/old_unused/HomePage_old.svelte
similarity index 98%
rename from srcs/requirements/svelte/api_front/src/old_unused/HomePage_old.svelte
rename to srcs/requirements/svelte/api_front/old_unused/HomePage_old.svelte
index 2371dd47..1b861b0c 100644
--- a/srcs/requirements/svelte/api_front/src/old_unused/HomePage_old.svelte
+++ b/srcs/requirements/svelte/api_front/old_unused/HomePage_old.svelte
@@ -6,7 +6,7 @@
   import Footer from "../components/Footer.svelte";
 	import Login from "./Login.svelte";
   import Tabs from "../shared/Tabs.svelte"
-  import Card from "../shared/Card.svelte"
+  import Card from "../pieces/Card.svelte"
 // tmp
 let login = { username: '', password: ''};
   // let's us track any errors in a submited form
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/Login.svelte b/srcs/requirements/svelte/api_front/old_unused/Login.svelte
similarity index 97%
rename from srcs/requirements/svelte/api_front/src/old_unused/Login.svelte
rename to srcs/requirements/svelte/api_front/old_unused/Login.svelte
index fe2aff16..0f4b9b6b 100644
--- a/srcs/requirements/svelte/api_front/src/old_unused/Login.svelte
+++ b/srcs/requirements/svelte/api_front/old_unused/Login.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { now } from "svelte/internal";
-  import Card from "../shared/Card.svelte";
+  import Card from "../pieces/Card.svelte";
   import { createEventDispatcher } from 'svelte';
   // import UserStore from './stores/UserStore';
 
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/LoginPage.svelte b/srcs/requirements/svelte/api_front/old_unused/LoginPage.svelte
similarity index 98%
rename from srcs/requirements/svelte/api_front/src/old_unused/LoginPage.svelte
rename to srcs/requirements/svelte/api_front/old_unused/LoginPage.svelte
index 8d96291a..ddc15600 100644
--- a/srcs/requirements/svelte/api_front/src/old_unused/LoginPage.svelte
+++ b/srcs/requirements/svelte/api_front/old_unused/LoginPage.svelte
@@ -2,8 +2,8 @@
   // import Header from "./Header.svelte";
   import Footer from "../components/Footer.svelte";
   import Tabs from "../shared/Tabs.svelte";
-  import Card from "../shared/Card.svelte";
-  import Canvas from "../components/Canvas.svelte";
+  import Card from "../pieces/Card.svelte";
+  import Canvas from "../pieces/Canvas.svelte";
   import ScrollTo from "../shared/ScrollTo.svelte";
   import UserStore from "./UserStore.js";
   import { createEventDispatcher } from "svelte";
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/TwoFactorAuthentication_old.svelte b/srcs/requirements/svelte/api_front/old_unused/TwoFactorAuthentication_old.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/TwoFactorAuthentication_old.svelte
rename to srcs/requirements/svelte/api_front/old_unused/TwoFactorAuthentication_old.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/UserPage.svelte b/srcs/requirements/svelte/api_front/old_unused/UserPage.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/UserPage.svelte
rename to srcs/requirements/svelte/api_front/old_unused/UserPage.svelte
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/UserStore.js b/srcs/requirements/svelte/api_front/old_unused/UserStore.js
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/UserStore.js
rename to srcs/requirements/svelte/api_front/old_unused/UserStore.js
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/loginStatusStore_old.js b/srcs/requirements/svelte/api_front/old_unused/loginStatusStore_old.js
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/loginStatusStore_old.js
rename to srcs/requirements/svelte/api_front/old_unused/loginStatusStore_old.js
diff --git a/srcs/requirements/svelte/api_front/src/old_unused/possible_fonts.css b/srcs/requirements/svelte/api_front/old_unused/possible_fonts.css
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/old_unused/possible_fonts.css
rename to srcs/requirements/svelte/api_front/old_unused/possible_fonts.css
diff --git a/srcs/requirements/svelte/api_front/src/TmpTest.svelte b/srcs/requirements/svelte/api_front/src/TmpTest.svelte
deleted file mode 100644
index 419591b3..00000000
--- a/srcs/requirements/svelte/api_front/src/TmpTest.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<script>
-
-  import { onMount } from "svelte";
-
-  onMount( () => console.log('in TMP TEST'))
-
-</script>
-
-
-
-<h1>TMP TEST</h1>
\ No newline at end of file
diff --git a/srcs/requirements/svelte/api_front/src/NotFound.svelte b/srcs/requirements/svelte/api_front/src/pages/NotFound.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/NotFound.svelte
rename to srcs/requirements/svelte/api_front/src/pages/NotFound.svelte
diff --git a/srcs/requirements/svelte/api_front/src/SplashPage.svelte b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
similarity index 97%
rename from srcs/requirements/svelte/api_front/src/SplashPage.svelte
rename to srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
index 08531d3c..705bc77c 100644
--- a/srcs/requirements/svelte/api_front/src/SplashPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import Canvas from "./components/Canvas.svelte";
+  import Canvas from "../pieces/Canvas.svelte";
   import { push } from "svelte-spa-router";
   import { onMount } from 'svelte';
-  import { loginStatus } from './stores/loginStatusStore.js';
+  import { loginStatus } from '../stores/loginStatusStore.js';
 
   // go over agian in detail to make sure this actually does what you want
   // it needs some work, seems confused a lot of the time...
diff --git a/srcs/requirements/svelte/api_front/src/TwoFactorAuthentication.svelte b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
similarity index 97%
rename from srcs/requirements/svelte/api_front/src/TwoFactorAuthentication.svelte
rename to srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
index 39369a2f..ab48e223 100644
--- a/srcs/requirements/svelte/api_front/src/TwoFactorAuthentication.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { push } from "svelte-spa-router";
-  import { loginStatus } from './stores/loginStatusStore';
+  import { loginStatus } from '../stores/loginStatusStore';
 
   // onMount( async() => {
   //  await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
diff --git a/srcs/requirements/svelte/api_front/src/components/UnauthorizedAccessPage.svelte b/srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/components/UnauthorizedAccessPage.svelte
rename to srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte
diff --git a/srcs/requirements/svelte/api_front/src/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/ProfileDisplay.svelte
rename to srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
diff --git a/srcs/requirements/svelte/api_front/src/ProfilePage.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
similarity index 85%
rename from srcs/requirements/svelte/api_front/src/ProfilePage.svelte
rename to srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
index 21f83f3c..d3860ebb 100644
--- a/srcs/requirements/svelte/api_front/src/ProfilePage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 
-  import Header from "./components/Header.svelte";
-  import Footer from "./components/Footer.svelte";
+  import Header from "../../pieces/Header.svelte";
+  import Footer from "../../pieces/Footer.svelte";
   // import { createEventDispatcher } from "svelte";
   import { push } from "svelte-spa-router";
   import Router, { link } from "svelte-spa-router";
-  import { profileRoutes, prefix } from "./routes/profileRoutes.js";
+  import { profileRoutes, prefix } from "../../routes/profileRoutes.js";
 
   // let dispatch = createEventDispatcher();
 
diff --git a/srcs/requirements/svelte/api_front/src/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
similarity index 95%
rename from srcs/requirements/svelte/api_front/src/ProfileSettings.svelte
rename to srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
index 2ba80293..512156b7 100644
--- a/srcs/requirements/svelte/api_front/src/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 
-  import Card from './shared/Card.svelte';
+  import Card from '../../pieces/Card.svelte';
   import {onMount} from 'svelte';
   import { push } from 'svelte-spa-router';
-  import { loginStatus } from './stores/loginStatusStore'
+  import { loginStatus } from '../../stores/loginStatusStore'
 
   let user;
 
diff --git a/srcs/requirements/svelte/api_front/src/components/Canvas.svelte b/srcs/requirements/svelte/api_front/src/pieces/Canvas.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/components/Canvas.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/Canvas.svelte
diff --git a/srcs/requirements/svelte/api_front/src/shared/Card.svelte b/srcs/requirements/svelte/api_front/src/pieces/Card.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/shared/Card.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/Card.svelte
diff --git a/srcs/requirements/svelte/api_front/src/components/Footer.svelte b/srcs/requirements/svelte/api_front/src/pieces/Footer.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/components/Footer.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/Footer.svelte
diff --git a/srcs/requirements/svelte/api_front/src/components/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/components/Header.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/Header.svelte
diff --git a/srcs/requirements/svelte/api_front/src/shared/ScrollTo.svelte b/srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/shared/ScrollTo.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte
diff --git a/srcs/requirements/svelte/api_front/src/shared/Tabs.svelte b/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/shared/Tabs.svelte
rename to srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte
diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
index c662b26d..de8e6d3c 100644
--- a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
+++ b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
@@ -1,8 +1,8 @@
-import NotFound from "../NotFound.svelte";
-import ProfilePage from "../ProfilePage.svelte";
-import SplashPage from "../SplashPage.svelte";
-import TwoFactorAuthentication from '../TwoFactorAuthentication.svelte';
-import UnauthorizedAccessPage from '../components/UnauthorizedAccessPage.svelte';
+import NotFound from "../pages/NotFound.svelte";
+import ProfilePage from "../pages/profile/ProfilePage.svelte";
+import SplashPage from "../pages/SplashPage.svelte";
+import TwoFactorAuthentication from '../pages/TwoFactorAuthentication.svelte';
+import UnauthorizedAccessPage from '../pages/UnauthorizedAccessPage.svelte';
 import { loginStatus } from "../stores/loginStatusStore";
 import { wrap } from 'svelte-spa-router/wrap'
 import { get } from 'svelte/store';
diff --git a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js
index 80027901..7a70f0ff 100644
--- a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js
+++ b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js
@@ -1,7 +1,7 @@
 
-import NotFound from "../NotFound.svelte";
-import ProfileDisplay from '../ProfileDisplay.svelte';
-import ProfileSettings from '../ProfileSettings.svelte';
+import NotFound from "../pages/NotFound.svelte";
+import ProfileDisplay from '../pages/profile/ProfileDisplay.svelte';
+import ProfileSettings from '../pages/profile/ProfileSettings.svelte';
 import { loginStatus } from "../stores/loginStatusStore";
 import { wrap } from 'svelte-spa-router/wrap'