diff --git a/android/app/src/main/java/fr/iut/sciencequest/MainActivity.kt b/android/app/src/main/java/fr/iut/sciencequest/MainActivity.kt
index 3ea7785..bd86650 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/MainActivity.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/MainActivity.kt
@@ -1,18 +1,13 @@
 package fr.iut.sciencequest
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
-import fr.iut.sciencequest.model.dto.extensions.ToModel
 import fr.iut.sciencequest.navigation.NavHost
-import fr.iut.sciencequest.stub.StubScientifique1
 import fr.iut.sciencequest.ui.theme.ScienceQuestTheme
 
 class MainActivity : ComponentActivity() {
diff --git a/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt b/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt
index 3d1a68f..8307321 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/navigation/NavHost.kt
@@ -1,18 +1,11 @@
 package fr.iut.sciencequest.navigation
 
-import android.content.Context
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import fr.iut.sciencequest.ViewModels.KahootViewModel
-import fr.iut.sciencequest.ViewModels.PenduViewModel
-import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
-import fr.iut.sciencequest.stub.StubQuestionWithReponses
 import fr.iut.sciencequest.view.AccountScreen
 import fr.iut.sciencequest.view.HomeScreen
 import fr.iut.sciencequest.view.LoginScreen
diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt
index b4555d0..10d6995 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt
@@ -14,8 +14,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import fr.iut.sciencequest.ViewModels.KahootViewModel
 
 @Composable
 fun HomeScreen(goToHome: () -> Unit,
diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/Login.kt b/android/app/src/main/java/fr/iut/sciencequest/view/Login.kt
index 82cd26f..9b8ecd8 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/view/Login.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/view/Login.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import fr.iut.sciencequest.R
-import fr.iut.sciencequest.ViewModels.LoginViewModel
+import fr.iut.sciencequest.viewModels.LoginViewModel
 
 @Composable
 fun LoginScreen(viewModel: LoginViewModel = viewModel(),
diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt b/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt
index faf4d9f..7158e3c 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/view/games/Kahoot.kt
@@ -21,15 +21,12 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import fr.iut.sciencequest.R
-import fr.iut.sciencequest.ViewModels.KahootViewModel
+import fr.iut.sciencequest.viewModels.KahootViewModel
 import fr.iut.sciencequest.model.dto.extensions.ToModel
-import fr.iut.sciencequest.model.dto.question.QuestionWithSimpleResponseDTO
-import fr.iut.sciencequest.model.dto.reponse.ReponseSimpleDTO
 import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse
 import fr.iut.sciencequest.model.metier.reponse.ReponseSimple
 import fr.iut.sciencequest.stub.StubQuestionWithReponses
 import fr.iut.sciencequest.view.TopBar
-import java.util.Timer
 
 @Composable
 fun KahootScreen(viewModel: KahootViewModel = viewModel(factory = KahootViewModel.Factory),
diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt
index 975aad9..701e659 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import fr.iut.sciencequest.R
-import fr.iut.sciencequest.ViewModels.PenduViewModel
+import fr.iut.sciencequest.viewModels.PenduViewModel
 import fr.iut.sciencequest.view.TopBar
 
 @Composable
diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt
index 089fe0a..00928fb 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/view/scientifiques/ScientifiqueListeScreen.kt
@@ -1,19 +1,14 @@
 package fr.iut.sciencequest.view.scientifiques
 
-import android.util.Log
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.viewmodel.compose.viewModel
 import fr.iut.sciencequest.R
-import fr.iut.sciencequest.ViewModels.ScientifiquesDecouvertsVM
-import fr.iut.sciencequest.model.dto.extensions.ToModel
-import fr.iut.sciencequest.model.metier.Scientifique
-import fr.iut.sciencequest.stub.getScientifiqueListeStub
+import fr.iut.sciencequest.viewModels.ScientifiquesDecouvertsVM
 import fr.iut.sciencequest.view.TopBar
 
 @Composable
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/KahootViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt
similarity index 96%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/KahootViewModel.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt
index 2c3d0e8..28a00e5 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/KahootViewModel.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/KahootViewModel.kt
@@ -1,4 +1,4 @@
-package fr.iut.sciencequest.ViewModels
+package fr.iut.sciencequest.viewModels
 
 import android.os.Handler
 import android.os.Looper
@@ -6,7 +6,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import fr.iut.sciencequest.ViewModels.UiStates.KahootUIState
+import fr.iut.sciencequest.viewModels.uiStates.KahootUIState
 import fr.iut.sciencequest.model.repositories.question.IQuestionRepository
 import fr.iut.sciencequest.model.repositories.question.QuestionAPIRepository
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/LoginViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/LoginViewModel.kt
similarity index 79%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/LoginViewModel.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/LoginViewModel.kt
index 2f99c5a..1b4d704 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/LoginViewModel.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/LoginViewModel.kt
@@ -1,7 +1,7 @@
-package fr.iut.sciencequest.ViewModels
+package fr.iut.sciencequest.viewModels
 
 import androidx.lifecycle.ViewModel
-import fr.iut.sciencequest.ViewModels.UiStates.LoginUIState
+import fr.iut.sciencequest.viewModels.uiStates.LoginUIState
 import kotlinx.coroutines.flow.MutableStateFlow
 
 class LoginViewModel: ViewModel() {
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt
similarity index 96%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt
index 5e3ae76..079e6b8 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/PenduViewModel.kt
@@ -1,11 +1,10 @@
-package fr.iut.sciencequest.ViewModels
+package fr.iut.sciencequest.viewModels
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import fr.iut.sciencequest.ViewModels.UiStates.PenduUIState
-import fr.iut.sciencequest.model.dto.extensions.ToModel
+import fr.iut.sciencequest.viewModels.uiStates.PenduUIState
 import fr.iut.sciencequest.model.repositories.scientifique.IScientifiqueRepository
 import fr.iut.sciencequest.model.repositories.scientifique.ScientifiqueAPIRepository
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/ScientifiquesDecouvertsVM.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt
similarity index 93%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/ScientifiquesDecouvertsVM.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt
index f40e5a8..2a45f3c 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/ScientifiquesDecouvertsVM.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/ScientifiquesDecouvertsVM.kt
@@ -1,10 +1,10 @@
-package fr.iut.sciencequest.ViewModels
+package fr.iut.sciencequest.viewModels
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import fr.iut.sciencequest.ViewModels.UiStates.ScientifiqueDecouvertsUIState
+import fr.iut.sciencequest.viewModels.uiStates.ScientifiqueDecouvertsUIState
 import fr.iut.sciencequest.model.repositories.scientifique.IScientifiqueRepository
 import fr.iut.sciencequest.model.repositories.scientifique.ScientifiqueAPIRepository
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/KahootUIState.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/KahootUIState.kt
similarity index 70%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/KahootUIState.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/KahootUIState.kt
index caec3d4..738a48b 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/KahootUIState.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/KahootUIState.kt
@@ -1,8 +1,6 @@
-package fr.iut.sciencequest.ViewModels.UiStates
+package fr.iut.sciencequest.viewModels.uiStates
 
 import fr.iut.sciencequest.model.dto.extensions.ToModel
-import fr.iut.sciencequest.model.dto.question.QuestionWithSimpleResponseDTO
-import fr.iut.sciencequest.model.dto.reponse.ReponseSimpleDTO
 import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse
 import fr.iut.sciencequest.stub.StubQuestionWithReponses
 
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/LoginUIState.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/LoginUIState.kt
similarity index 66%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/LoginUIState.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/LoginUIState.kt
index bf2161f..febb072 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/LoginUIState.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/LoginUIState.kt
@@ -1,4 +1,4 @@
-package fr.iut.sciencequest.ViewModels.UiStates
+package fr.iut.sciencequest.viewModels.uiStates
 
 data class LoginUIState (
     val pseudo: String = "Pseudo",
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/PenduUIState.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/PenduUIState.kt
similarity index 83%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/PenduUIState.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/PenduUIState.kt
index 369fbed..2ec2219 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/PenduUIState.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/PenduUIState.kt
@@ -1,4 +1,4 @@
-package fr.iut.sciencequest.ViewModels.UiStates
+package fr.iut.sciencequest.viewModels.uiStates
 
 data class PenduUIState(
     val isWon: Boolean = false,
diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/ScientifiqueDecouvertsUIState.kt b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/ScientifiqueDecouvertsUIState.kt
similarity index 87%
rename from android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/ScientifiqueDecouvertsUIState.kt
rename to android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/ScientifiqueDecouvertsUIState.kt
index 68eec9e..11b066a 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/UiStates/ScientifiqueDecouvertsUIState.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/viewModels/uiStates/ScientifiqueDecouvertsUIState.kt
@@ -1,4 +1,4 @@
-package fr.iut.sciencequest.ViewModels.UiStates
+package fr.iut.sciencequest.viewModels.uiStates
 
 import fr.iut.sciencequest.model.metier.Scientifique