diff --git a/nbproject/project.properties b/nbproject/project.properties
index ea3da74f589cc074c6ec348833eca6564d97b2aa..20b5033ff6eb1d4fa6e1fd821012ea6b3171184b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,139 +1,139 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=SIR
-application.vendor=valen
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.modulepath=\
-    ${run.modulepath}
-debug.test.classpath=\
-    ${run.test.classpath}
-debug.test.modulepath=\
-    ${run.test.modulepath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/SIR.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.jlink.dir=${dist.dir}/jlink
-dist.jlink.output=${dist.jlink.dir}/SIR
-endorsed.classpath=
-excludes=
-file.reference.javafx-swt.jar=javafx-sdk-21.0.6/lib/javafx-swt.jar
-file.reference.javafx.base.jar=javafx-sdk-21.0.6/lib/javafx.base.jar
-file.reference.javafx.controls.jar=javafx-sdk-21.0.6/lib/javafx.controls.jar
-file.reference.javafx.fxml.jar=javafx-sdk-21.0.6/lib/javafx.fxml.jar
-file.reference.javafx.graphics.jar=javafx-sdk-21.0.6/lib/javafx.graphics.jar
-file.reference.javafx.media.jar=javafx-sdk-21.0.6/lib/javafx.media.jar
-file.reference.javafx.swing.jar=javafx-sdk-21.0.6/lib/javafx.swing.jar
-file.reference.javafx.web.jar=javafx-sdk-21.0.6/lib/javafx.web.jar
-file.reference.ojdbc17.jar=libs/ojdbc17.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.ojdbc17.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=\ --enable-preview
-javac.deprecation=false
-javac.external.vm=true
-javac.modulepath=\
-    ${file.reference.javafx-swt.jar}:\
-    ${file.reference.javafx.base.jar}:\
-    ${file.reference.javafx.controls.jar}:\
-    ${file.reference.javafx.fxml.jar}:\
-    ${file.reference.javafx.graphics.jar}:\
-    ${file.reference.javafx.media.jar}:\
-    ${file.reference.javafx.swing.jar}:\
-    ${file.reference.javafx.web.jar}
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-
-javac.source=22
-javac.target=22
-
-javac.test.classpath=\
-    ${javac.classpath}
-javac.test.modulepath=\
-    ${javac.modulepath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-# The jlink additional root modules to resolve
-jlink.additionalmodules=
-# The jlink additional command line parameters
-jlink.additionalparam=
-jlink.launcher=true
-jlink.launcher.name=SIR
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=ui.ConnexionPage
-# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
-manifest.custom.application.library.allowable.codebase=
-# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
-manifest.custom.caller.allowable.codebase=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=\ --enable-preview
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${javac.test.classpath}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
-javac.classpath=\
-    ${file.reference.ojdbc17.jar}
-
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=SIR
+application.vendor=valen
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/SIR.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+dist.jlink.output=${dist.jlink.dir}/SIR
+endorsed.classpath=
+excludes=
+file.reference.javafx-swt.jar=javafx-sdk-21.0.6/lib/javafx-swt.jar
+file.reference.javafx.base.jar=javafx-sdk-21.0.6/lib/javafx.base.jar
+file.reference.javafx.controls.jar=javafx-sdk-21.0.6/lib/javafx.controls.jar
+file.reference.javafx.fxml.jar=javafx-sdk-21.0.6/lib/javafx.fxml.jar
+file.reference.javafx.graphics.jar=javafx-sdk-21.0.6/lib/javafx.graphics.jar
+file.reference.javafx.media.jar=javafx-sdk-21.0.6/lib/javafx.media.jar
+file.reference.javafx.swing.jar=javafx-sdk-21.0.6/lib/javafx.swing.jar
+file.reference.javafx.web.jar=javafx-sdk-21.0.6/lib/javafx.web.jar
+file.reference.ojdbc17.jar=libs/ojdbc17.jar
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=false
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${file.reference.ojdbc17.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=\ --enable-preview
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=\
+    ${file.reference.javafx-swt.jar}:\
+    ${file.reference.javafx.base.jar}:\
+    ${file.reference.javafx.controls.jar}:\
+    ${file.reference.javafx.fxml.jar}:\
+    ${file.reference.javafx.graphics.jar}:\
+    ${file.reference.javafx.media.jar}:\
+    ${file.reference.javafx.swing.jar}:\
+    ${file.reference.javafx.web.jar}
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+
+javac.source=23
+javac.target=23
+
+javac.test.classpath=\
+    ${javac.classpath}
+javac.test.modulepath=\
+    ${javac.modulepath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=SIR
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=ui.loader.ConnexionPage
+# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
+manifest.custom.application.library.allowable.codebase=
+# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
+manifest.custom.caller.allowable.codebase=
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
+manifest.custom.codebase=
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
+manifest.custom.permissions=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=\ --enable-preview
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
+javac.classpath=\
+    ${file.reference.ojdbc17.jar}
+
diff --git a/src/fc/Connexion.java b/src/fc/Connexion.java
index f0e1d21ff949b840890963d310d15994c8c3767d..82649da17d2d2d8246fe8c0c2ab45ecda57af08b 100644
--- a/src/fc/Connexion.java
+++ b/src/fc/Connexion.java
@@ -1,63 +1,68 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-import java.sql.Connection;
-import java.io.*;
-import java.sql.*;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Scanner;
-
-/**
- *
- * @author valen
- */
-public class Connexion {
-
-    private String id;
-    private String password;
-    private static Utilisateur utilisateurConnecte = null;
-
-    public Connexion(String id, String password) {
-        this.id = id;
-        this.password = password;
-
-    }
-
-    public Utilisateur acces() {
-        String requete;
-        requete = "SELECT metier "
-                + "FROM utilisateur "
-                + "WHERE numero_id=" + id
-                + "  AND Mot_de_passe='" + password + "'";
-
-        System.out.println("la   : " + ConnexionDataBase.sqlRequete(requete));
-
-        if (ConnexionDataBase.sqlRequete(requete).equals("Administration")) {
-            utilisateurConnecte = new Administration(id, password);
-
-        }
-        if (ConnexionDataBase.sqlRequete(requete).equals("Radiologue")) {
-            utilisateurConnecte = new Radiologue(id, password);
-
-        }
-        if (ConnexionDataBase.sqlRequete(requete).equals("Manipulateur")) {
-            utilisateurConnecte = new Manipulateur(id, password);
-
-        }
-
-        return utilisateurConnecte;
-    }
-
-    /* public Utilisateur connexion(){
-        
-    }*/
-
-    public static void deconnecter() {
-        utilisateurConnecte = null;
-    }
-
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc;
+
+import fc.model.Utilisateur;
+import fc.model.Radiologue;
+import fc.model.Manipulateur;
+import fc.Sql.ConnexionDataBase;
+import fc.model.Administration;
+import java.sql.Connection;
+import java.io.*;
+import java.sql.*;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Scanner;
+
+/**
+ *
+ * @author valen
+ */
+public class Connexion {
+
+    private String id;
+    private String password;
+    private static Utilisateur utilisateurConnecte = null;
+
+    public Connexion(String id, String password) {
+        this.id = id;
+        this.password = password;
+
+    }
+
+    public Utilisateur acces() {
+        String requete;
+        requete = "SELECT metier "
+                + "FROM utilisateur "
+                + "WHERE numero_id=" + id
+                + "  AND Mot_de_passe='" + password + "'";
+
+        System.out.println("la   : " + ConnexionDataBase.sqlRequete(requete));
+
+        if (ConnexionDataBase.sqlRequete(requete).equals("Administration")) {
+            utilisateurConnecte = new Administration(id, password);
+
+        }
+        if (ConnexionDataBase.sqlRequete(requete).equals("Radiologue")) {
+            utilisateurConnecte = new Radiologue(id, password);
+
+        }
+        if (ConnexionDataBase.sqlRequete(requete).equals("Manipulateur")) {
+            utilisateurConnecte = new Manipulateur(id, password);
+
+        }
+
+        return utilisateurConnecte;
+    }
+
+    /* public Utilisateur connexion(){
+        
+    }*/
+
+    public static void deconnecter() {
+        utilisateurConnecte = null;
+    }
+
+}
diff --git a/src/fc/ConnexionTest.java b/src/fc/ConnexionTest.java
deleted file mode 100644
index 1a4f3f3688afd228ae9cd23436457211e4d30e2d..0000000000000000000000000000000000000000
--- a/src/fc/ConnexionTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Main.java to edit this template
- */
-package fc;
-
-import static fc.ConnexionDataBase.sqlRequete2;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Scanner;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author valen
- */
-public class ConnexionTest {
-
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        // TODO code application logic here
-
-        
-        
-
-}}
diff --git a/src/fc/MessageDErreur.java b/src/fc/MessageDErreur.java
index cfd73be15ff123b578448049926bb021a0475873..ac8b13c1d0e73cafdc49aa23b73e9954426e5fca 100644
--- a/src/fc/MessageDErreur.java
+++ b/src/fc/MessageDErreur.java
@@ -1,186 +1,186 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import javafx.util.Pair;
-
-/**
- *
- * @author lucas
- */
-public class MessageDErreur {
-    
-        public static String validerIdMdp(String identifiant, String mdp) {
-    //  existance de l'identifiant 
-    String requeteId = "SELECT COUNT(*) FROM utilisateur WHERE numero_id=" + identifiant;
-    String resultId = ConnexionDataBase.sqlRequete(requeteId);
-    
-    if (resultId.equals("0")) { // Si aucun utilisateur avec cet ID
-        return "identifiant incorrect";
-    }
-    
-    // existance du mdp (si identifiant existe)
-    String requeteMdp = "SELECT COUNT(*) FROM utilisateur WHERE numero_id=" + identifiant + 
-                       " AND Mot_de_passe='" + mdp + "'";
-    String resultMdp = ConnexionDataBase.sqlRequete(requeteMdp);
-    
-    if (resultMdp.equals("0")) { // Si le mot de passe ne correspond pas
-        return "mot de passe incorrect";
-    }
-    
-    return ""; 
-}
-    
-        
-        
-    
-    
-    
-    public static String validerTermeRecherche(String terme) {
-        if (terme == null || terme.isBlank()) {
-            return "";
-        }
-        
-        // Vérification des caractères autorisés
-        if (!terme.matches("^[a-zA-Z0-9\\s\\-']+$")) {
-            return "Le terme de recherche contient des caractères non autorisés";
-        }
-        
-        return ""; // Pas d'erreur
-    }
-    
-    
-    public static String normaliserMot(String nom) {
-    if (nom == null || nom.isBlank()) {
-        return "";
-    }
-    
-    nom = nom.toLowerCase(); // Met tout en minuscules
-    StringBuilder resultat = new StringBuilder();
-    
-    boolean mettreMajuscule = true; // Pour la première lettre et après un espace ou apostrophe
-    
-    for (char c : nom.toCharArray()) {
-        if (mettreMajuscule && Character.isLetter(c)) {
-            resultat.append(Character.toUpperCase(c)); // Majuscule
-            mettreMajuscule = false;
-        } else {
-            resultat.append(c); // Minuscule
-        }
-
-        // Activer la mise en majuscule après un espace ou un apostrophe
-        if (c == ' ' || c == '\'') {
-            mettreMajuscule = true;
-        }
-    }
-    
-    return resultat.toString();
-}
-
-    
-        public static String validerNomPrenom(String texte) {
-        if (texte == null || texte.isBlank()) {
-            return "Le nom ou le prénom ne peut pas être vide.";
-        }
-        if (!texte.matches("^[a-zA-Z-' ]+$")) {
-            return "Le nom ou le prénom ne doit pas être composé de caractères spéciaux.";
-        }
-        if (texte.length() > 40) {
-            return "Le nom ou le prénom ne doit pas dépasser 40 caractères.";
-        } else {
-            return "";
-        }
-    }
-
-    public static String validerNom(String nom) {
-        if (nom == null || nom.isBlank()) {
-            return "Le nom ne peut pas être vide.";
-        }
-        if (!nom.matches("^[a-zA-Z-' ]+$")) {
-            return "Le nom ne doit pas être composé de caractères spéciaux.";
-        }
-        if (nom.length() > 40) {
-            return "Le nom ne doit pas dépasser 40 caractères.";
-        } else {
-            return "";
-        }
-    }
-
-    public static String validerPrenom(String prenom) {
-        if (prenom == null || prenom.isBlank()) {
-            return "Le prénom ne peut pas être vide";
-        }
-        if (!prenom.matches("^[a-zA-Z-' ]+$"
-)) {
-            return "Le prénom ne doit pas être composé de caractères spéciaux.";
-        }
-        if (prenom.length() > 40) {
-            return "Le prénom ne doit pas dépasser 40 caractères.";
-        } else {
-            return "";
-        }
-
-    }
-//
-//    public static Pair<Genre, String> validerGenre(String genre) {
-//        if (genre == null || genre.isBlank()) {
-//            return new Pair<>(null,"Le genre ne peut pas être vide.");
-//        }
-//        if (!genre.equalsIgnoreCase("H") || !genre.equalsIgnoreCase("F")) {
-//            return new Pair<>(null,"Le genre doit être 'H' (homme) ou 'F' (femme).");
-//        } else {
-//            if (genre.equalsIgnoreCase("H")){
-//                return new Pair<>(Genre.H,null);
-//            }
-//            else return new Pair<>(Genre.F,null);
-//        }
-//    }
-
-    public static String validerDate(String date) {
-        if (date == null || date.isBlank()) {
-            return "La date ne peut pas être vide.";
-        }
-        if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
-            return "La date doit être au format YYYY-MM-DD.";
-        }
-        try {
-            LocalDate date2 = LocalDate.parse(date);
-            LocalDate aujourdHui = LocalDate.now();
-
-            if (date2.isAfter(aujourdHui)) {
-                return "La date ne peut pas être ultérieure à aujourd'hui.";
-            }
-        } catch (DateTimeParseException e) {
-            return "La date est invalide.";
-        }
-        return "";
-    }
-
-    public static String validerNumeroSecu(String numSecu) {
-        if (numSecu == null || numSecu.isEmpty() || numSecu.length() != 15) {
-            return "Le numéro de sécurité sociale ne peut pas être vide et doit contenir exactement 15 chiffres.";
-        }
-
-        // Vérifier que le numéro de sécurité sociale ne contient que des chiffres
-        if (!numSecu.matches("\\d{15}")) {
-            return "Format du numéro de Sécurité sociale incorrect.";
-        }
-
-        // Extraire le genre (premier chiffre) et le mois de naissance (chiffres 4 et 5)
-        int genre = Integer.parseInt(numSecu.substring(0, 1));
-        int mois = Integer.parseInt(numSecu.substring(3, 5));
-
-        // Vérifier le genre et le mois de naissance
-        if (genre != 1 && genre != 2 || mois < 1 || mois > 12) {
-            return "Format du numéro de Sécurité sociale incorrect.";
-        }
-
-        // Si tout est valide, retourner une chaîne vide
-        return "";
-    }
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc;
+
+import fc.Sql.ConnexionDataBase;
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+
+
+/**
+ *
+ * @author lucas
+ */
+public class MessageDErreur {
+    
+        public static String validerIdMdp(String identifiant, String mdp) {
+    //  existance de l'identifiant 
+    String requeteId = "SELECT COUNT(*) FROM utilisateur WHERE numero_id=" + identifiant;
+    String resultId = ConnexionDataBase.sqlRequete(requeteId);
+    
+    if (resultId.equals("0")) { // Si aucun utilisateur avec cet ID
+        return "identifiant incorrect";
+    }
+    
+    // existance du mdp (si identifiant existe)
+    String requeteMdp = "SELECT COUNT(*) FROM utilisateur WHERE numero_id=" + identifiant + 
+                       " AND Mot_de_passe='" + mdp + "'";
+    String resultMdp = ConnexionDataBase.sqlRequete(requeteMdp);
+    
+    if (resultMdp.equals("0")) { // Si le mot de passe ne correspond pas
+        return "mot de passe incorrect";
+    }
+    
+    return ""; 
+}
+    
+        
+        
+    
+    
+    
+    public static String validerTermeRecherche(String terme) {
+        if (terme == null || terme.isBlank()) {
+            return "";
+        }
+        
+        // Vérification des caractères autorisés
+        if (!terme.matches("^[a-zA-Z0-9\\s\\-']+$")) {
+            return "Le terme de recherche contient des caractères non autorisés";
+        }
+        
+        return ""; // Pas d'erreur
+    }
+    
+    
+    public static String normaliserMot(String nom) {
+    if (nom == null || nom.isBlank()) {
+        return "";
+    }
+    
+    nom = nom.toLowerCase(); // Met tout en minuscules
+    StringBuilder resultat = new StringBuilder();
+    
+    boolean mettreMajuscule = true; // Pour la première lettre et après un espace ou apostrophe
+    
+    for (char c : nom.toCharArray()) {
+        if (mettreMajuscule && Character.isLetter(c)) {
+            resultat.append(Character.toUpperCase(c)); // Majuscule
+            mettreMajuscule = false;
+        } else {
+            resultat.append(c); // Minuscule
+        }
+
+        // Activer la mise en majuscule après un espace ou un apostrophe
+        if (c == ' ' || c == '\'') {
+            mettreMajuscule = true;
+        }
+    }
+    
+    return resultat.toString();
+}
+
+    
+        public static String validerNomPrenom(String texte) {
+        if (texte == null || texte.isBlank()) {
+            return "Le nom ou le prénom ne peut pas être vide.";
+        }
+        if (!texte.matches("^[a-zA-Z-' ]+$")) {
+            return "Le nom ou le prénom ne doit pas être composé de caractères spéciaux.";
+        }
+        if (texte.length() > 40) {
+            return "Le nom ou le prénom ne doit pas dépasser 40 caractères.";
+        } else {
+            return "";
+        }
+    }
+
+    public static String validerNom(String nom) {
+        if (nom == null || nom.isBlank()) {
+            return "Le nom ne peut pas être vide.";
+        }
+        if (!nom.matches("^[a-zA-Z-' ]+$")) {
+            return "Le nom ne doit pas être composé de caractères spéciaux.";
+        }
+        if (nom.length() > 40) {
+            return "Le nom ne doit pas dépasser 40 caractères.";
+        } else {
+            return "";
+        }
+    }
+
+    public static String validerPrenom(String prenom) {
+        if (prenom == null || prenom.isBlank()) {
+            return "Le prénom ne peut pas être vide";
+        }
+        if (!prenom.matches("^[a-zA-Z-' ]+$"
+)) {
+            return "Le prénom ne doit pas être composé de caractères spéciaux.";
+        }
+        if (prenom.length() > 40) {
+            return "Le prénom ne doit pas dépasser 40 caractères.";
+        } else {
+            return "";
+        }
+
+    }
+//
+//    public static Pair<Genre, String> validerGenre(String genre) {
+//        if (genre == null || genre.isBlank()) {
+//            return new Pair<>(null,"Le genre ne peut pas être vide.");
+//        }
+//        if (!genre.equalsIgnoreCase("H") || !genre.equalsIgnoreCase("F")) {
+//            return new Pair<>(null,"Le genre doit être 'H' (homme) ou 'F' (femme).");
+//        } else {
+//            if (genre.equalsIgnoreCase("H")){
+//                return new Pair<>(Genre.H,null);
+//            }
+//            else return new Pair<>(Genre.F,null);
+//        }
+//    }
+
+    public static String validerDate(String date) {
+        if (date == null || date.isBlank()) {
+            return "La date ne peut pas être vide.";
+        }
+        if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            return "La date doit être au format YYYY-MM-DD.";
+        }
+        try {
+            LocalDate date2 = LocalDate.parse(date);
+            LocalDate aujourdHui = LocalDate.now();
+
+            if (date2.isAfter(aujourdHui)) {
+                return "La date ne peut pas être ultérieure à aujourd'hui.";
+            }
+        } catch (DateTimeParseException e) {
+            return "La date est invalide.";
+        }
+        return "";
+    }
+
+    public static String validerNumeroSecu(String numSecu) {
+        if (numSecu == null || numSecu.isEmpty() || numSecu.length() != 15) {
+            return "Le numéro de sécurité sociale ne peut pas être vide et doit contenir exactement 15 chiffres.";
+        }
+
+        // Vérifier que le numéro de sécurité sociale ne contient que des chiffres
+        if (!numSecu.matches("\\d{15}")) {
+            return "Format du numéro de Sécurité sociale incorrect.";
+        }
+
+        // Extraire le genre (premier chiffre) et le mois de naissance (chiffres 4 et 5)
+        int genre = Integer.parseInt(numSecu.substring(0, 1));
+        int mois = Integer.parseInt(numSecu.substring(3, 5));
+
+        // Vérifier le genre et le mois de naissance
+        if (genre != 1 && genre != 2 || mois < 1 || mois > 12) {
+            return "Format du numéro de Sécurité sociale incorrect.";
+        }
+
+        // Si tout est valide, retourner une chaîne vide
+        return "";
+    }
+}
diff --git a/src/fc/OracleDBTest.java b/src/fc/OracleDBTest.java
deleted file mode 100644
index 8ba144b77a32945ea9da5262522a29ff00aa5210..0000000000000000000000000000000000000000
--- a/src/fc/OracleDBTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Main.java to edit this template
- */
-package fc;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Scanner;
-import java.io.*;
-import java.sql.*;
-
-public class OracleDBTest {
-
-    public static void main(String[] args) {
-        //String url = "jdbc:oracle:thin:@oracle.im2ag.fr:1521/XE"; // Changez l'URL selon votre configuration
-        String user = "zarliv";
-        String password = "02fa1007a9";
-
-        String jdbcDriver = "oracle.jdbc.driver.OracleDriver";
-        String dbUrl = "jdbc:oracle:thin:@im2ag-oracle.univ-grenoble-alpes.fr:1521:im2ag";  // Utilisation du port local
-
-        Connection conn;
-        Statement stmt;
-        ResultSet rset;
-        Scanner sc = new Scanner(System.in);
-
-        try {
-            Class.forName(jdbcDriver);
-            conn = DriverManager.getConnection(dbUrl, user, password);
-            stmt = conn.createStatement();
-
-            System.out.println("Veuillez saisir un identifiant :");
-            String id = sc.nextLine();
-            System.out.println("Veuillez saisir un mot de passe :");
-            String password2 = sc.nextLine();
-   
-            rset = stmt.executeQuery("SELECT Nom "
-                    + "FROM Administration "
-                    + "WHERE numero_id="+id
-                    + "  AND Mot_de_passe='"+password2+"'");
-
-            while (rset.next()) {
-                System.out.println(rset.getString(1));
-            }
-
-            rset.close();
-            stmt.close();
-            conn.close();
-
-        } catch (SQLException | ClassNotFoundException e) {
-            System.out.println("Erreur SQL : \n" + e.getMessage());
-        }
-    }
-}
diff --git a/src/fc/ConnexionDataBase.java b/src/fc/Sql/ConnexionDataBase.java
similarity index 92%
rename from src/fc/ConnexionDataBase.java
rename to src/fc/Sql/ConnexionDataBase.java
index 359e5f214593ef15bcc0fae6b954c41e1cb68bc2..ec54cacdcb9d75e2071ba719a32c051248c3f0c3 100644
--- a/src/fc/ConnexionDataBase.java
+++ b/src/fc/Sql/ConnexionDataBase.java
@@ -2,16 +2,14 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.Sql;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Scanner;
-import java.io.*;
 import java.sql.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 
 /**
  *
@@ -23,13 +21,11 @@ public class ConnexionDataBase {
     // Utilisation du port local
     private static final String user = "zarliv";
     private static final String password = "02fa1007a9";
-
-    private static final String jdbcDriver = "oracle.jdbc.driver.OracleDriver";
     private static final String dbUrl = "jdbc:oracle:thin:@im2ag-oracle.univ-grenoble-alpes.fr:1521:im2ag";
     private static Connection conn;
     private static Statement stmt;
     private static ResultSet rset;
-    private static Scanner sc = new Scanner(System.in);
+;
 
     public static Connection getConnection() {
         Connection conn = null;
diff --git a/src/fc/TestPatient.java b/src/fc/TestPatient.java
deleted file mode 100644
index d393638b0c94e7312b3618b10ed1e286c9880eed..0000000000000000000000000000000000000000
--- a/src/fc/TestPatient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-
-package fc;
-
-import java.util.List;
-
-public class TestPatient {
-
-    public static void main(String[] args) {
-        
-        // Créer une instance de Patient
-        Patient patient = new Patient();
-  
-
-        
-        // Test de la méthode recupererDMR avec un IPP valide
-        /*System.out.println("\nTest 3 : Récupération du DMR avec un IPP valide.");
-        patient.setIPP("123458");// Remplacer par un IPP valide existant en base
-        List<Dmr> dmrs = patient.recupererDMR();
-        if (dmrs != null && !dmrs.isEmpty()) {
-            System.out.println("DMR récupéré avec succès.");
-            for (Dmr dmr : dmrs) {
-                System.out.println("DMR ID : " + dmr.getId_dmr() + " - Date d'ouverture : ");
-            }
-        } else {
-            System.out.println("Aucun DMR trouvé pour cet IPP.");
-        }
-        
-              
-        // Test de la méthode creerDMR avec des informations valides
-        System.out.println("Test 1 : Création du DMR avec des données valides.");
-        boolean resultatCreerDMR = patient.creerDMR();
-        System.out.println("Résultat de la création du DMR : " + resultatCreerDMR);
-        
-        // Test de la méthode recupererDMR sans IPP
-        System.out.println("\nTest 4 : Récupération du DMR sans IPP.");
-        patient.setIPP(null);  // Remettre l'IPP à null
-        dmrs = patient.recupererDMR();
-        if (dmrs.isEmpty()) {
-            System.out.println("Aucun critère de recherche fourni. Aucun DMR récupéré.");
-        }*/
-        
-        // Test de la méthode patientExiste avec différents critères
-        /*System.out.println("\nTest 5 : Recherche de patient avec l'IPP.");
-        List<Patient> patientsParIPP = patient.patientExiste("12345", null, null, null, null);
-        patient.afficherPatients(patientsParIPP);
-        
-        System.out.println("\nTest 6 : Recherche de patient avec le nom et prénom.");
-        List<Patient> patientsParNomPrenom = patient.patientExiste(null, "Martin", "Pierre", null, null);
-        patient.afficherPatients(patientsParNomPrenom);
-        
-        System.out.println("\nTest 7 : Recherche de patient avec le numéro de sécurité sociale.");
-        List<Patient> patientsParNumSecu = patient.patientExiste(null, null, null, null, "123456789012345");
-        patient.afficherPatients(patientsParNumSecu);
-        
-        System.out.println("\nTest 8 : Recherche de patient avec la date de naissance.");
-        List<Patient> patientsParDateNaissance = patient.patientExiste(null, null, null, "1980-12-01", null);
-        patient.afficherPatients(patientsParDateNaissance);*/
-    }
-}
diff --git a/src/fc/Administration.java b/src/fc/model/Administration.java
similarity index 55%
rename from src/fc/Administration.java
rename to src/fc/model/Administration.java
index 1577e133a181afdf281565a50803b192f3fb93f1..76f9ed97da33c92b008e47d84e77d870b0d33fd7 100644
--- a/src/fc/Administration.java
+++ b/src/fc/model/Administration.java
@@ -2,19 +2,8 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.model;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.sql.Connection;
-import java.io.*;
-import java.sql.*;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Scanner;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
 
 /**
  *
diff --git a/src/fc/Dmr.java b/src/fc/model/Dmr.java
similarity index 97%
rename from src/fc/Dmr.java
rename to src/fc/model/Dmr.java
index be32bc97a0ca06a3e158c7752b95d3cb4327c723..243630e875ffbe732b87e8d18ffd10fb77fb7b2e 100644
--- a/src/fc/Dmr.java
+++ b/src/fc/model/Dmr.java
@@ -2,16 +2,14 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.model;
 
+import fc.Sql.ConnexionDataBase;
 import java.util.ArrayList;
 import java.util.List;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/fc/DmrPatient.java b/src/fc/model/DmrPatient.java
similarity index 97%
rename from src/fc/DmrPatient.java
rename to src/fc/model/DmrPatient.java
index 6d6446cfb7969f3dca404bb82f3d3fc1a2a7bbca..4962ebcd303a1a0c6b7a57135ab1737aaff115e7 100644
--- a/src/fc/DmrPatient.java
+++ b/src/fc/model/DmrPatient.java
@@ -2,7 +2,9 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.model;
+
+
 
 /**
  *
diff --git a/src/fc/Examen.java b/src/fc/model/Examen.java
similarity index 97%
rename from src/fc/Examen.java
rename to src/fc/model/Examen.java
index a3377fb10dcfe7f2bac40ce7483c503d50b71bd0..2750cc3247b168185c58b4fb621b993ca40c92b3 100644
--- a/src/fc/Examen.java
+++ b/src/fc/model/Examen.java
@@ -2,16 +2,14 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.model;
 
+import fc.Sql.ConnexionDataBase;
 import java.util.ArrayList;
 import java.util.List;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
+
 
 /**
  *
diff --git a/src/fc/Genre.java b/src/fc/model/Genre.java
similarity index 89%
rename from src/fc/Genre.java
rename to src/fc/model/Genre.java
index 1f167aaa289d1966a504771ab7a2008880357fe2..1ccccdff3b04ea546b6fbbe37920311664992a65 100644
--- a/src/fc/Genre.java
+++ b/src/fc/model/Genre.java
@@ -2,12 +2,12 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fc;
+package fc.model;
 
 /**
  *
  * @author valen
  */
 public enum Genre {
-    H , F
+    M , F
 }
diff --git a/src/fc/Manipulateur.java b/src/fc/model/Manipulateur.java
similarity index 92%
rename from src/fc/Manipulateur.java
rename to src/fc/model/Manipulateur.java
index 4c2a94017e160b066b123b7fbbc42398b087c981..a1aed68faef7f5e5617886cbba92a0ab69de834d 100644
--- a/src/fc/Manipulateur.java
+++ b/src/fc/model/Manipulateur.java
@@ -1,20 +1,20 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-/**
- *
- * @author valen
- */
-public class Manipulateur extends Utilisateur{
-    
-    public Manipulateur(String id, String Mot_de_passe) {
-        super(id, Mot_de_passe, 3);
-    }
-    
-    
-    
-    
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc.model;
+
+/**
+ *
+ * @author valen
+ */
+public class Manipulateur extends Utilisateur{
+    
+    public Manipulateur(String id, String Mot_de_passe) {
+        super(id, Mot_de_passe, 3);
+    }
+    
+    
+    
+    
+}
diff --git a/src/fc/Pacs.java b/src/fc/model/Pacs.java
similarity index 73%
rename from src/fc/Pacs.java
rename to src/fc/model/Pacs.java
index 1cef0923a4879289c46ea30a0af7a3efce5bb555..6f6bc1a6a564114d71f19c4a1dbde08aae535d0e 100644
--- a/src/fc/Pacs.java
+++ b/src/fc/model/Pacs.java
@@ -1,62 +1,56 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-import static fc.ConnexionDataBase.sqlRequete;
-import static fc.ConnexionDataBase.sqlRequete2;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-/**
- *
- * @author valen
- */
-public class Pacs {
-
-    private String nom;
-    private String path;
-
-    public Pacs() {
-
-    }
-
-    public Pacs(String nom, String path) {
-        this.nom = nom;
-        this.path = path;
-
-    }
-
-    public String pathWithNom(String nom) {
-
-        String path = sqlRequete("Select IMAGE_PATH from pacs where NOM_IMAGE ='" + nom + "'");
-        return path;
-
-    }
-
-    public ObservableList<String> ListImage() {
-
-        ResultSet res = sqlRequete2("Select NOM_IMAGE from pacs");
-        ObservableList<String> items = FXCollections.observableArrayList();
-        try {
-            while (res.next()) {
-
-                
-                items.add(res.getString("NOM_IMAGE"));
-            }
-            return items;
-
-        } catch (SQLException ex) {
-            Logger.getLogger(ConnexionTest.class.getName()).log(Level.SEVERE, null, ex);
-            return null;
-        }
-    }
-    //res.toString()
-
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc.model;
+
+import static fc.Sql.ConnexionDataBase.sqlRequete;
+import static fc.Sql.ConnexionDataBase.sqlRequete2;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ *
+ * @author valen
+ */
+public class Pacs {
+
+
+
+    public Pacs() {
+
+    }
+
+
+
+    public String pathWithNom(String nom) {
+
+        String path = sqlRequete("Select IMAGE_PATH from pacs where NOM_IMAGE ='" + nom + "'");
+        return path;
+
+    }
+
+    public ObservableList<String> ListImage() {
+
+        ResultSet res = sqlRequete2("Select NOM_IMAGE from pacs");
+        ObservableList<String> items = FXCollections.observableArrayList();
+        try {
+            while (res.next()) {
+
+                
+                items.add(res.getString("NOM_IMAGE"));
+            }
+            return items;
+
+        } catch (SQLException ex) {
+            return null;
+        }
+    }
+    //res.toString()
+
+}
diff --git a/src/fc/Patient.java b/src/fc/model/Patient.java
similarity index 98%
rename from src/fc/Patient.java
rename to src/fc/model/Patient.java
index adac21e170ec55ff74a4b5a94881c8d5ff210d25..dd691997b0734a8f623193b0c27e2971503b69d4 100644
--- a/src/fc/Patient.java
+++ b/src/fc/model/Patient.java
@@ -1,12 +1,10 @@
-package fc;
-
+package fc.model;
+import fc.Sql.ConnexionDataBase;
 import static fc.MessageDErreur.normaliserMot;
 import java.sql.Connection;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -68,7 +66,7 @@ public class Patient {
                     String genre = rs.getString("genre");
 
                     if (genre.equals("H")) {
-                        this.genre = Genre.H;
+                        this.genre = Genre.M;
                     } else {
                         this.genre = Genre.F;
                     }
@@ -130,7 +128,7 @@ public class Patient {
                             rs.getString("nom"),
                             rs.getString("prenom"),
                             rs.getString("date_naissance"),
-                            "H".equals(rs.getString("genre")) ? Genre.H : Genre.F,
+                            "H".equals(rs.getString("genre")) ? Genre.M : Genre.F,
                             rs.getString("n_secu")
                     ));
                 }
@@ -174,7 +172,7 @@ public class Patient {
             requete.append(" AND date_naissance = '").append(dateNaissance).append("'");
         }
         if (genre != null) {
-            requete.append(" AND genre = '").append(genre == Genre.H ? "H" : "F").append("'");
+            requete.append(" AND genre = '").append(genre == Genre.M ? "H" : "F").append("'");
         }
         if (n_secu != null && !n_secu.isBlank()) {
             requete.append(" AND n_secu = '").append(n_secu).append("'");
@@ -190,7 +188,7 @@ public class Patient {
                         rs.getString("nom"),
                         rs.getString("prenom"),
                         rs.getString("date_naissance"),
-                        rs.getString("genre").equals("H") ? Genre.H : Genre.F,
+                        rs.getString("genre").equals("H") ? Genre.M : Genre.F,
                         rs.getString("n_secu")
                 ));
             }
@@ -230,7 +228,7 @@ public class Patient {
                     String genre = rs.getString("genre");
                     Genre genre1;
                     if (genre.equals("H")) {
-                        genre1 = Genre.H;
+                        genre1 = Genre.M;
                     } else {
                         genre1 = Genre.F;
                     }
@@ -258,7 +256,7 @@ public class Patient {
                     String genre = rs.getString("genre");
                     Genre genre1;
                     if (genre.equals("H")) {
-                        genre1 = Genre.H;
+                        genre1 = Genre.M;
                     } else {
                         genre1 = Genre.F;
                     }
@@ -288,7 +286,7 @@ public class Patient {
                     String genre = rs.getString("genre");
                     Genre genre1;
                     if (genre.equals("H")) {
-                        genre1 = Genre.H;
+                        genre1 = Genre.M;
                     } else {
                         genre1 = Genre.F;
                     }
diff --git a/src/fc/Radiologue.java b/src/fc/model/Radiologue.java
similarity index 92%
rename from src/fc/Radiologue.java
rename to src/fc/model/Radiologue.java
index 07cc8b7760998660b31510eb81c73021e6ffb924..9e965c83a3b75dce3805a1087dbf762287bd81c1 100644
--- a/src/fc/Radiologue.java
+++ b/src/fc/model/Radiologue.java
@@ -1,20 +1,20 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-/**
- *
- * @author valen
- */
-public class Radiologue extends Utilisateur {
-    
-    public Radiologue(String id, String Mot_de_passe) {
-        super(id, Mot_de_passe, 1);
-    }
-    
-    
-    
-    
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc.model;
+
+/**
+ *
+ * @author valen
+ */
+public class Radiologue extends Utilisateur {
+    
+    public Radiologue(String id, String Mot_de_passe) {
+        super(id, Mot_de_passe, 1);
+    }
+    
+    
+    
+    
+}
diff --git a/src/fc/Utilisateur.java b/src/fc/model/Utilisateur.java
similarity index 94%
rename from src/fc/Utilisateur.java
rename to src/fc/model/Utilisateur.java
index 54a4e1798281e3217c9c88e72ff694ca92ca02d8..8cf5f53954cef26dc9470712e814e7371479d4fe 100644
--- a/src/fc/Utilisateur.java
+++ b/src/fc/model/Utilisateur.java
@@ -1,38 +1,40 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package fc;
-
-/**
- *
- * @author valen
- */
-public abstract class Utilisateur {
-    private String id ;
-    private String Mot_de_passe;
-    private int acces ;
-    
-    public Utilisateur(String id, String Mot_de_passe, int acces) {
-        this.id = id;
-        this.Mot_de_passe = Mot_de_passe;
-        this.acces = acces;
-    }
-    
-    public String getId() {
-        return id;
-    }
-
-    public int getAcces() {
-        return acces;
-    }
-    
-    public String getNom(){
-        String requete = "SELECT nom "
-                    + "FROM utilisateur "
-                    + "WHERE numero_id="+id
-                    + "  AND Mot_de_passe='"+Mot_de_passe+"'";
-        return ConnexionDataBase.sqlRequete(requete);
-    }
-    
-}
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package fc.model;
+
+import fc.Sql.ConnexionDataBase;
+
+/**
+ *
+ * @author valen
+ */
+public abstract class Utilisateur {
+    private String id ;
+    private String Mot_de_passe;
+    private int acces ;
+    
+    public Utilisateur(String id, String Mot_de_passe, int acces) {
+        this.id = id;
+        this.Mot_de_passe = Mot_de_passe;
+        this.acces = acces;
+    }
+    
+    public String getId() {
+        return id;
+    }
+
+    public int getAcces() {
+        return acces;
+    }
+    
+    public String getNom(){
+        String requete = "SELECT nom "
+                    + "FROM utilisateur "
+                    + "WHERE numero_id="+id
+                    + "  AND Mot_de_passe='"+Mot_de_passe+"'";
+        return ConnexionDataBase.sqlRequete(requete);
+    }
+    
+}
diff --git a/src/jpg/README.txt b/src/jpg/README.txt
deleted file mode 100644
index d20fdccd0c8dd3887a319933574f936733094343..0000000000000000000000000000000000000000
--- a/src/jpg/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Images à ne pas diffuser (information patient)
-Copyright: Université Grenoble Alpes
-
-
diff --git a/src/module-info.java b/src/module-info.java
index 53416a8cff82d532f5f4d741a8725648ef5cd468..aa5594603fd09a980b507a67f0cafa975962694a 100644
--- a/src/module-info.java
+++ b/src/module-info.java
@@ -15,10 +15,12 @@ module SIS1 {
     requires java.sql;
     requires java.base;
 
-    opens ui to javafx.graphics , javafx.fxml;
+    opens ui.loader to javafx.graphics , javafx.fxml;
+    opens ui.Controller to javafx.graphics , javafx.fxml;
     
 
-    opens fc to javafx.base; // Ouvre le package fc à javafx.base
-    exports ui;  // Si ton code UI est dans ce package
+    opens fc.model to javafx.base; // Ouvre le package fc à javafx.base
+    exports ui.loader;  // Si ton code UI est dans ce package
+    exports ui.Controller;
     
 }
diff --git a/src/ui/AdministrationPageController.java b/src/ui/Controller/AdministrationPageController.java
similarity index 88%
rename from src/ui/AdministrationPageController.java
rename to src/ui/Controller/AdministrationPageController.java
index d742debb910139bb09c693d4d196b3891ea1c01d..a2fceaff3bb5f601656c72d15e7e6b2a88fc7527 100644
--- a/src/ui/AdministrationPageController.java
+++ b/src/ui/Controller/AdministrationPageController.java
@@ -1,20 +1,16 @@
-package ui;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.fxml.Initializable;
+package ui.Controller;
 
 /**
  * FXML Controller class
  *
  * @author lucas
  */
-import fc.Administration;
-import fc.ConnexionDataBase;
-import fc.Dmr;
-import fc.Genre;
-import fc.MessageDErreur;
-import fc.Patient;
+import fc.model.Administration;
+import fc.Sql.ConnexionDataBase;
+import fc.model.Dmr;
+import fc.model.Patient;
+import java.io.IOException;
+import java.util.List;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -24,22 +20,6 @@ import javafx.scene.control.TableView;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
-
-import static fc.MessageDErreur.validerDate;
-import static fc.MessageDErreur.validerNom;
-import static fc.MessageDErreur.validerNumeroSecu;
-import static fc.MessageDErreur.validerPrenom;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -47,7 +27,6 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
@@ -133,7 +112,7 @@ public class AdministrationPageController {
     @FXML
     private void actionDeconnexion(ActionEvent event) {
         try {
-            Parent root = FXMLLoader.load(getClass().getResource("ConnexionPage.fxml"));
+            Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/ConnexionPage.fxml"));
             Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
             Scene scene = new Scene(root);
             stage.setScene(scene);
diff --git a/src/ui/ConnexionPageController.java b/src/ui/Controller/ConnexionPageController.java
similarity index 92%
rename from src/ui/ConnexionPageController.java
rename to src/ui/Controller/ConnexionPageController.java
index 659593656b403cec24add0dd8adbc5b0765af0ba..f743f82930529667e18c230cc9854c199ee010d7 100644
--- a/src/ui/ConnexionPageController.java
+++ b/src/ui/Controller/ConnexionPageController.java
@@ -2,13 +2,16 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/javafx/FXMLController.java to edit this template
  */
-package ui;
+package ui.Controller;
 
+import ui.loader.AdministrationPage;
+import ui.loader.ManipPage;
+import ui.loader.RadiologuePage;
 import fc.Connexion;
-import fc.Utilisateur;
-import fc.Radiologue;
-import fc.Administration;
-import fc.Manipulateur;
+import fc.model.Utilisateur;
+import fc.model.Radiologue;
+import fc.model.Administration;
+import fc.model.Manipulateur;
 import fc.MessageDErreur;
 import java.awt.event.KeyEvent;
 import java.io.FileInputStream;
@@ -19,12 +22,7 @@ import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.Button;
@@ -126,7 +124,7 @@ public class ConnexionPageController implements Initializable {
         //Image image2 = new Image("file:" + "src/jpg/abdomen/cor494-i436.jpg");
         Image image2;
         try {
-            image2 = new Image(new FileInputStream("src/jpg/logo/LVBH.png"));
+            image2 = new Image(new FileInputStream("src/ui/jpg/logo/LVBH.png"));
             this.image.setImage(image2);
             this.image.setPreserveRatio(true);
         } catch (FileNotFoundException ex) {
diff --git a/src/ui/Controller/ManipController.java b/src/ui/Controller/ManipController.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e08183a249372b3b502b559677101d80ef44567
--- /dev/null
+++ b/src/ui/Controller/ManipController.java
@@ -0,0 +1,313 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/javafx/FXMLController.java to edit this template
+ */
+package ui.Controller;
+
+import fc.model.Dmr;
+import fc.model.DmrPatient;
+import fc.model.Examen;
+import fc.model.Pacs;
+import fc.model.Patient;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ResourceBundle;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.fxml.Initializable;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.stage.Stage;
+import javafx.util.Pair;
+
+/**
+ * FXML Controller class
+ *
+ * @author valen
+ */
+public class ManipController implements Initializable {
+
+    /**
+     * Initializes the controller class.
+     */
+    @FXML
+    private ListView liste_image = new ListView();
+
+    @FXML
+    private ListView liste_dmr = new ListView();
+
+    @FXML
+    private CheckBox pasDImage;
+
+    @FXML
+    private ImageView image = new ImageView();
+
+    @FXML
+    private TextField fieldDMR = new TextField();
+
+    @FXML
+    private TableView<DmrPatient> tableViewDmrPatient;
+    @FXML
+    private TableView<Patient> tableViewPatient;
+
+    @FXML
+    private TableColumn<Patient, String> columnIpp;
+    @FXML
+    private TableColumn<Patient, String> columnNom;
+    @FXML
+    private TableColumn<Patient, String> columnPrenom;
+    @FXML
+    private TableColumn<DmrPatient, String> columnMotif;
+    @FXML
+    private TableColumn<DmrPatient, String> columnDateOuverture;
+
+    @FXML
+    private TableColumn<DmrPatient, String> columnNomDmr;
+    @FXML
+    private TableColumn<DmrPatient, String> columnPrenomDmr;
+
+    @FXML
+    private TextField fieldRecherhe = new TextField();
+
+    @FXML
+    private Label messageLabel;
+
+    @FXML
+    private DatePicker fieldDateNaissance = new DatePicker();
+
+    @FXML
+    private DatePicker fieldExamen = new DatePicker();
+
+    @FXML
+    private ComboBox<Integer> comboBoxH;
+
+    @FXML
+    private ComboBox<Integer> comboBoxMin;
+
+    @FXML
+    private ComboBox<String> comboImagerie;
+
+    @FXML
+    private ComboBox<String> comboAnat;
+
+    @Override
+    public void initialize(URL url, ResourceBundle rb) {
+        // TODO
+        columnIpp.setCellValueFactory(new PropertyValueFactory<>("IPP"));
+        columnNom.setCellValueFactory(new PropertyValueFactory<>("nom"));
+        columnPrenom.setCellValueFactory(new PropertyValueFactory<>("prenom"));
+
+        columnDateOuverture.setCellValueFactory(new PropertyValueFactory<>("dateOuverture"));
+        columnMotif.setCellValueFactory(new PropertyValueFactory<>("motif"));
+        columnNomDmr.setCellValueFactory(new PropertyValueFactory<>("nom"));
+        columnPrenomDmr.setCellValueFactory(new PropertyValueFactory<>("prenom"));
+
+        Pacs p = new Pacs();
+        liste_image.setItems(p.ListImage());
+
+        Dmr dmr = new Dmr();
+        List<Dmr> dmr_actif = dmr.dmrActiver();
+        List<DmrPatient> DmrPatient = new ArrayList<>();
+        for (Dmr d : dmr_actif) {
+            Patient pat = new Patient();
+            DmrPatient.add(new DmrPatient(d, pat.rechercherPatients(d.getIPP(), null, null, null, null, null).get(0)));
+        }
+        ObservableList<DmrPatient> patient_actif = FXCollections.observableArrayList(DmrPatient);
+        tableViewDmrPatient.setItems(patient_actif);
+        comboImagerie.getItems().add("Radio");
+        comboImagerie.getItems().add("IRM");
+        comboImagerie.getItems().add("Scanner");
+        comboAnat.getItems().add("abdomen");
+        comboAnat.getItems().add("sinus");
+        comboAnat.getItems().add("brain");
+
+        for (int i = 0; i <= 24; i++) {
+            comboBoxH.getItems().add(i);
+        }
+
+        for (int i = 0; i <= 60; i++) {
+            comboBoxMin.getItems().add(i);
+        }
+
+        LocalTime currentTime = LocalTime.now();
+
+        int heure = currentTime.getHour();  // Récupère l'heure
+        int minute = currentTime.getMinute();
+
+        // Optionnel : définir une valeur par défaut
+        comboBoxH.setValue(heure);
+        comboBoxMin.setValue(minute);
+
+        liste_image.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null) { // Vérifie qu'un élément est sélectionné
+
+                System.out.println("Image sélectionnée : " + newValue);
+                actionSurSelection(p.pathWithNom(newValue.toString()));
+
+            }
+        });
+        tableViewPatient.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null) { // Vérifie qu'un élément est sélectionné
+
+                actionSurSelectionPatient(newValue);
+
+            }
+        });
+
+    }
+
+    private void actionSurSelection(String path) {
+        try {
+            //Image image2 = new Image("file:" + "src/jpg/abdomen/cor494-i436.jpg");
+            Image image2 = new Image(new FileInputStream(path));// Assurez-vous que le chemin est correct
+            this.image.setImage(image2);
+            this.image.setPreserveRatio(true);
+            this.image.setFitWidth(250);
+            this.image.setFitHeight(250);
+
+            System.out.println("Image chargée : ");
+        } catch (Exception e) {
+            System.out.println("Erreur de chargement de l'image : " + e.getMessage());
+        }
+
+    }
+
+    private void actionSurSelectionPatient(Patient patient) {
+        List<Dmr> dmrs = patient.recupererDMR();
+        List<DmrPatient> DmrPatient = new ArrayList<>();
+        for (Dmr d : dmrs) {
+            Patient pat = new Patient();
+            DmrPatient.add(new DmrPatient(d, pat.rechercherPatients(d.getIPP(), null, null, null, null, null).get(0)));
+        }
+        ObservableList<DmrPatient> patient_actif = FXCollections.observableArrayList(DmrPatient);
+        tableViewDmrPatient.setItems(patient_actif);
+
+    }
+
+    @FXML
+
+    private void actionRechercher() {
+        String rechercheUnifiee = fieldRecherhe.getText().trim();
+        messageLabel.setText("");
+
+        // Validation simplifiée
+        if (rechercheUnifiee.isEmpty()) {
+            messageLabel.setText("Veuillez entrer un critère de recherche");
+            return;
+        }
+
+        // Utilisation de la nouvelle méthode de recherche
+        Patient patient = new Patient();
+        Pair<List<Patient>, String> result = patient.rechercherPatients2(rechercheUnifiee);
+
+        // Gestion des erreurs
+        if (!result.getValue().isEmpty()) {
+            messageLabel.setText(result.getValue());
+        }
+
+        // Affichage des résultats
+        ObservableList<Patient> items = FXCollections.observableArrayList(result.getKey());
+        tableViewPatient.setItems(items);
+    }
+
+    @FXML
+    private void actionDeconnexion(ActionEvent event) {
+        try {
+            // Charger la page de connexion
+
+            Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/ConnexionPage.fxml"));
+
+            // Obtenir la scène actuelle et la fenêtre
+            Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+
+            Scene scene = new Scene(root);
+
+            // Changer la scène pour la page de connexion
+            stage.setScene(scene);
+            stage.setTitle("Page de Connexion");
+            stage.setFullScreen(true);
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+            // Afficher un message d'erreur à l'utilisateur si nécessaire
+        }
+    }
+
+    @FXML
+    private void actionValider() {
+        // Vérification des sélections obligatoires
+        if (tableViewDmrPatient.getSelectionModel().getSelectedItems().isEmpty()) {
+            System.out.println("Aucun DMR sélectionné");
+            return;
+        }
+
+        DmrPatient dmrselect = tableViewDmrPatient.getSelectionModel().getSelectedItems().get(0);
+        LocalDate selectedDate = fieldExamen.getValue();
+        Integer selectedItemH = comboBoxH.getValue();
+        Integer selectedItemM = comboBoxMin.getValue();
+        String imagerie = comboImagerie.getValue();
+        String anatomie = comboAnat.getValue();
+
+        // Validation des champs obligatoires
+        if (dmrselect == null || selectedDate == null || selectedItemH == null
+                || selectedItemM == null || imagerie == null || anatomie == null) {
+            System.out.println("Tous les champs obligatoires ne sont pas remplis");
+            return;
+        }
+
+        // Formatage de la date
+        String date = selectedDate.toString() + " " + selectedItemH + ":" + selectedItemM;
+        System.out.println("date : " + date);
+
+        // Gestion de l'image
+        String chemin = null;
+        boolean sansImage = pasDImage.isSelected();
+
+        if (!sansImage) {
+            if (liste_image.getSelectionModel().getSelectedItems().isEmpty()) {
+                System.out.println("Aucune image sélectionnée et la case 'Pas d'image' n'est pas cochée");
+                return;
+            }
+            String imageselect = (String) liste_image.getSelectionModel().getSelectedItems().get(0);
+            Pacs p = new Pacs();
+            chemin = p.pathWithNom(imageselect);
+            System.out.println("Image sélectionnée: " + chemin);
+        }
+
+        // Création de l'examen
+        Examen ex = new Examen();
+        String acte = imagerie + " " + anatomie;
+        System.out.println("Création d'examen - Motif: " + dmrselect.getMotif() + ", Acte: " + acte);
+
+        boolean succes = ex.creerExamen(dmrselect.getId_dmr(), date, chemin, acte);
+
+        if (succes) {
+            System.out.println("Examen créé avec succès");
+            // Rafraîchir l'interface
+            this.initialize(null, null);
+        } else {
+            System.out.println("Échec de la création de l'examen");
+        }
+    }
+
+}
diff --git a/src/ui/PageExamenController.java b/src/ui/Controller/PageExamenController.java
similarity index 97%
rename from src/ui/PageExamenController.java
rename to src/ui/Controller/PageExamenController.java
index f1c36e025374c2e96e68360c5d9a0e5c0114dcad..0cb627428b0db6a05b0af8663f4a9da6584e3c52 100644
--- a/src/ui/PageExamenController.java
+++ b/src/ui/Controller/PageExamenController.java
@@ -2,11 +2,11 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/javafx/FXMLController.java to edit this template
  */
-package ui;
+package ui.Controller;
 
-import fc.ConnexionDataBase;
-import fc.Examen;
-import fc.Radiologue;
+
+import fc.model.Examen;
+import fc.model.Radiologue;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
@@ -146,7 +146,7 @@ public void setExamen(Examen examen) {
             try {
             // Charger la page de connexion
 
-            Parent root = FXMLLoader.load(getClass().getResource("RadiologuePage.fxml"));
+            Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/RadiologuePage.fxml"));
 
             // Obtenir la scène actuelle et la fenêtre
             Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
@@ -168,7 +168,7 @@ public void setExamen(Examen examen) {
         
         try {
             
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("RadiologuePage.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/RadiologuePage.fxml"));
             Parent root = loader.load();
 
           
diff --git a/src/ui/Radio_ManipController.java b/src/ui/Controller/Radio_ManipController.java
similarity index 96%
rename from src/ui/Radio_ManipController.java
rename to src/ui/Controller/Radio_ManipController.java
index 15fa4c4c67b0aee1c58116932e5526452c69e73f..22781d09a6bdd65b3f59af874ecefcc2ff5e550f 100644
--- a/src/ui/Radio_ManipController.java
+++ b/src/ui/Controller/Radio_ManipController.java
@@ -2,23 +2,17 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/javafx/FXMLController.java to edit this template
  */
-package ui;
-
-import fc.Dmr;
-import fc.DmrPatient;
-import fc.Examen;
-import fc.Genre;
-import static fc.MessageDErreur.validerDate;
-import static fc.MessageDErreur.validerNom;
-import static fc.MessageDErreur.validerNumeroSecu;
-import static fc.MessageDErreur.validerPrenom;
-import fc.Pacs;
-import fc.Patient;
-import fc.Radiologue;
+package ui.Controller;
+
+import fc.model.Dmr;
+import fc.model.DmrPatient;
+import fc.model.Examen;
+import fc.model.Pacs;
+import fc.model.Patient;
+import fc.model.Radiologue;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
-import java.sql.Date;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
@@ -226,7 +220,7 @@ public class Radio_ManipController implements Initializable {
     private void retourPageRadiologue(ActionEvent event) {
         try {
 
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("RadiologuePage.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/RadiologuePage.fxml"));
             Parent root = loader.load();
 
             RadiologuePageController controller = loader.getController();
@@ -276,7 +270,7 @@ public class Radio_ManipController implements Initializable {
         try {
             // Charger la page de connexion
 
-            Parent root = FXMLLoader.load(getClass().getResource("ConnexionPage.fxml"));
+            Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/ConnexionPage.fxml"));
 
             // Obtenir la scène actuelle et la fenêtre
             Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
diff --git a/src/ui/RadiologuePageController.java b/src/ui/Controller/RadiologuePageController.java
similarity index 95%
rename from src/ui/RadiologuePageController.java
rename to src/ui/Controller/RadiologuePageController.java
index ec53aac35cc06e78982c174d17aa16332b41cbe5..2f51125095a23796034b228c8aaff8a4871622b3 100644
--- a/src/ui/RadiologuePageController.java
+++ b/src/ui/Controller/RadiologuePageController.java
@@ -1,21 +1,16 @@
-package ui;
-
-import fc.Examen;
-import fc.Radiologue;
-import fc.Dmr;
-import static fc.MessageDErreur.validerNom;
-import static fc.MessageDErreur.validerNumeroSecu;
-import static fc.MessageDErreur.validerPrenom;
-import fc.Patient;
-import java.io.FileInputStream;
+package ui.Controller;
+
+import ui.loader.pageExamen;
+import fc.model.Examen;
+import fc.model.Radiologue;
+import fc.model.Dmr;
+import fc.model.Patient;
 import java.io.IOException;
-import java.util.ArrayList;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.paint.Color;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +19,6 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import javafx.util.Pair;
 
@@ -136,7 +130,7 @@ public class RadiologuePageController {
         try {
             // Charger la page de connexion
 
-            Parent root = FXMLLoader.load(getClass().getResource("ConnexionPage.fxml"));
+            Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/ConnexionPage.fxml"));
 
             // Obtenir la scène actuelle et la fenêtre
             Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
@@ -247,7 +241,7 @@ public class RadiologuePageController {
     private void ouvertureManip(ActionEvent event) {
         try {
             // Charger la page Radio_Manip
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("Radio_Manip.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/Radio_Manip.fxml"));
             Parent root = loader.load();
 
             // Obtenir le contrôleur de la nouvelle page
diff --git a/src/ui/fxml.css b/src/ui/fxml.css
deleted file mode 100644
index a10957e37bddf9e1dec302342ee21dc052c537c2..0000000000000000000000000000000000000000
--- a/src/ui/fxml.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Empty Stylesheet file.
- */
-
-.mainFxmlClass {
-
-}
diff --git a/src/ui/AdministrationPage.fxml b/src/ui/fxml/AdministrationPage.fxml
similarity index 96%
rename from src/ui/AdministrationPage.fxml
rename to src/ui/fxml/AdministrationPage.fxml
index c04930abde37a3c138255c1f68b12f33ae3e4411..f3ee2dc0549117a118ed80880208be092f50dda6 100644
--- a/src/ui/AdministrationPage.fxml
+++ b/src/ui/fxml/AdministrationPage.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox alignment="CENTER" prefHeight="592.0" prefWidth="800.0" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.AdministrationPageController">
+<VBox alignment="CENTER" prefHeight="592.0" prefWidth="800.0" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.AdministrationPageController">
    <Button contentDisplay="TOP" mnemonicParsing="false" onAction="#actionDeconnexion" text="Déconnexion" translateX="320.0" translateY="10.0" />
     <Label fx:id="welcomeLabel" alignment="TOP_CENTER" contentDisplay="CENTER" prefHeight="30.0" prefWidth="115.0" style="-fx-font-size: 20px; -fx-font-weight: bold;" text="Bienvenue " wrapText="true">
       <font>
diff --git a/src/ui/Manip.fxml b/src/ui/fxml/Manip.fxml
similarity index 98%
rename from src/ui/Manip.fxml
rename to src/ui/fxml/Manip.fxml
index 5df27194326e45cbdff7edcb4ec112bea3712ebf..674eff3f79eefe87b0f484e0b277cc5adabfde57 100644
--- a/src/ui/Manip.fxml
+++ b/src/ui/fxml/Manip.fxml
@@ -15,7 +15,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane id="AnchorPane" prefHeight="821.0" prefWidth="989.0" styleClass="mainFxmlClass" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.ManipController">
+<AnchorPane id="AnchorPane" prefHeight="821.0" prefWidth="989.0" styleClass="mainFxmlClass" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.ManipController">
     <stylesheets>
         <URL value="@fxml.css" />
     </stylesheets>
diff --git a/src/ui/PageExamen.fxml b/src/ui/fxml/PageExamen.fxml
similarity index 96%
rename from src/ui/PageExamen.fxml
rename to src/ui/fxml/PageExamen.fxml
index 10bbfbff659d3ab8a8912d66a67159fdb0b431db..fb96b157d5df5eed0ca3d6518c15a0fa8bec9269 100644
--- a/src/ui/PageExamen.fxml
+++ b/src/ui/fxml/PageExamen.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane id="AnchorPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.PageExamenController">
+<AnchorPane id="AnchorPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.PageExamenController">
    <children>
       <VBox layoutX="27.0" layoutY="14.0" prefHeight="91.0" prefWidth="600.0">
          <children>
diff --git a/src/ui/Radio_Manip.fxml b/src/ui/fxml/Radio_Manip.fxml
similarity index 98%
rename from src/ui/Radio_Manip.fxml
rename to src/ui/fxml/Radio_Manip.fxml
index 14a0fdbb37e408f18715653ac124f726d9ce7e70..705ef7d85d4c56d50b2feae9554fda0dc12307fe 100644
--- a/src/ui/Radio_Manip.fxml
+++ b/src/ui/fxml/Radio_Manip.fxml
@@ -15,7 +15,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane id="AnchorPane" prefHeight="777.0" prefWidth="975.0" styleClass="mainFxmlClass" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Radio_ManipController">
+<AnchorPane id="AnchorPane" prefHeight="777.0" prefWidth="975.0" styleClass="mainFxmlClass" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.Radio_ManipController">
     <stylesheets>
         <URL value="@fxml.css" />
     </stylesheets>
diff --git a/src/ui/RadiologuePage.fxml b/src/ui/fxml/RadiologuePage.fxml
similarity index 97%
rename from src/ui/RadiologuePage.fxml
rename to src/ui/fxml/RadiologuePage.fxml
index f7f282f728ad71bed129146b32e6b56101e5f122..89e7aa7b294e427a52545e09c715dfbaf10513a8 100644
--- a/src/ui/RadiologuePage.fxml
+++ b/src/ui/fxml/RadiologuePage.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" prefHeight="821.0" prefWidth="989.0" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.RadiologuePageController">
+<VBox alignment="CENTER" prefHeight="821.0" prefWidth="989.0" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.RadiologuePageController">
     <VBox prefHeight="314.0" prefWidth="653.0">
         <children>
          <Button mnemonicParsing="false" onAction="#actionDeconnexion" text="Déconnexion" translateX="719.0" />
diff --git a/src/ui/connexionPage.fxml b/src/ui/fxml/connexionPage.fxml
similarity index 94%
rename from src/ui/connexionPage.fxml
rename to src/ui/fxml/connexionPage.fxml
index fb6a2134192f864aec03a39f7f8e7638c047942e..f9fd550c7d0862d5616b95c419dc2e564ead1e98 100644
--- a/src/ui/connexionPage.fxml
+++ b/src/ui/fxml/connexionPage.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox fx:id="vbox" alignment="CENTER" centerShape="false" onKeyPressed="#handleButtonValider" prefHeight="300" prefWidth="400" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.ConnexionPageController">
+<VBox fx:id="vbox" alignment="CENTER" centerShape="false" onKeyPressed="#handleButtonValider" prefHeight="300" prefWidth="400" spacing="10" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.ConnexionPageController">
    <ImageView fx:id="image" disable="true" fitHeight="55.0" fitWidth="393.0" nodeOrientation="INHERIT" pickOnBounds="true" smooth="false">
      
    </ImageView>
diff --git a/src/jpg/abdomen/cor494-i127.jpg b/src/ui/jpg/abdomen/cor494-i127.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i127.jpg
rename to src/ui/jpg/abdomen/cor494-i127.jpg
diff --git a/src/jpg/abdomen/cor494-i162.jpg b/src/ui/jpg/abdomen/cor494-i162.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i162.jpg
rename to src/ui/jpg/abdomen/cor494-i162.jpg
diff --git a/src/jpg/abdomen/cor494-i211.jpg b/src/ui/jpg/abdomen/cor494-i211.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i211.jpg
rename to src/ui/jpg/abdomen/cor494-i211.jpg
diff --git a/src/jpg/abdomen/cor494-i260.jpg b/src/ui/jpg/abdomen/cor494-i260.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i260.jpg
rename to src/ui/jpg/abdomen/cor494-i260.jpg
diff --git a/src/jpg/abdomen/cor494-i309.jpg b/src/ui/jpg/abdomen/cor494-i309.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i309.jpg
rename to src/ui/jpg/abdomen/cor494-i309.jpg
diff --git a/src/jpg/abdomen/cor494-i387.jpg b/src/ui/jpg/abdomen/cor494-i387.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i387.jpg
rename to src/ui/jpg/abdomen/cor494-i387.jpg
diff --git a/src/jpg/abdomen/cor494-i43.jpg b/src/ui/jpg/abdomen/cor494-i43.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i43.jpg
rename to src/ui/jpg/abdomen/cor494-i43.jpg
diff --git a/src/jpg/abdomen/cor494-i436.jpg b/src/ui/jpg/abdomen/cor494-i436.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i436.jpg
rename to src/ui/jpg/abdomen/cor494-i436.jpg
diff --git a/src/jpg/abdomen/cor494-i485.jpg b/src/ui/jpg/abdomen/cor494-i485.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i485.jpg
rename to src/ui/jpg/abdomen/cor494-i485.jpg
diff --git a/src/jpg/abdomen/cor494-i534.jpg b/src/ui/jpg/abdomen/cor494-i534.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i534.jpg
rename to src/ui/jpg/abdomen/cor494-i534.jpg
diff --git a/src/jpg/abdomen/cor494-i569.jpg b/src/ui/jpg/abdomen/cor494-i569.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i569.jpg
rename to src/ui/jpg/abdomen/cor494-i569.jpg
diff --git a/src/jpg/abdomen/cor494-i618.jpg b/src/ui/jpg/abdomen/cor494-i618.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i618.jpg
rename to src/ui/jpg/abdomen/cor494-i618.jpg
diff --git a/src/jpg/abdomen/cor494-i653.jpg b/src/ui/jpg/abdomen/cor494-i653.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i653.jpg
rename to src/ui/jpg/abdomen/cor494-i653.jpg
diff --git a/src/jpg/abdomen/cor494-i702.jpg b/src/ui/jpg/abdomen/cor494-i702.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i702.jpg
rename to src/ui/jpg/abdomen/cor494-i702.jpg
diff --git a/src/jpg/abdomen/cor494-i78.jpg b/src/ui/jpg/abdomen/cor494-i78.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i78.jpg
rename to src/ui/jpg/abdomen/cor494-i78.jpg
diff --git a/src/jpg/abdomen/cor494-i794.jpg b/src/ui/jpg/abdomen/cor494-i794.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i794.jpg
rename to src/ui/jpg/abdomen/cor494-i794.jpg
diff --git a/src/jpg/abdomen/cor494-i843.jpg b/src/ui/jpg/abdomen/cor494-i843.jpg
similarity index 100%
rename from src/jpg/abdomen/cor494-i843.jpg
rename to src/ui/jpg/abdomen/cor494-i843.jpg
diff --git a/src/jpg/brain/brain1_0000.jpg b/src/ui/jpg/brain/brain1_0000.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0000.jpg
rename to src/ui/jpg/brain/brain1_0000.jpg
diff --git a/src/jpg/brain/brain1_0001.jpg b/src/ui/jpg/brain/brain1_0001.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0001.jpg
rename to src/ui/jpg/brain/brain1_0001.jpg
diff --git a/src/jpg/brain/brain1_0002.jpg b/src/ui/jpg/brain/brain1_0002.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0002.jpg
rename to src/ui/jpg/brain/brain1_0002.jpg
diff --git a/src/jpg/brain/brain1_0003.jpg b/src/ui/jpg/brain/brain1_0003.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0003.jpg
rename to src/ui/jpg/brain/brain1_0003.jpg
diff --git a/src/jpg/brain/brain1_0004.jpg b/src/ui/jpg/brain/brain1_0004.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0004.jpg
rename to src/ui/jpg/brain/brain1_0004.jpg
diff --git a/src/jpg/brain/brain1_0005.jpg b/src/ui/jpg/brain/brain1_0005.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0005.jpg
rename to src/ui/jpg/brain/brain1_0005.jpg
diff --git a/src/jpg/brain/brain1_0006.jpg b/src/ui/jpg/brain/brain1_0006.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0006.jpg
rename to src/ui/jpg/brain/brain1_0006.jpg
diff --git a/src/jpg/brain/brain1_0007.jpg b/src/ui/jpg/brain/brain1_0007.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0007.jpg
rename to src/ui/jpg/brain/brain1_0007.jpg
diff --git a/src/jpg/brain/brain1_0008.jpg b/src/ui/jpg/brain/brain1_0008.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0008.jpg
rename to src/ui/jpg/brain/brain1_0008.jpg
diff --git a/src/jpg/brain/brain1_0009.jpg b/src/ui/jpg/brain/brain1_0009.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0009.jpg
rename to src/ui/jpg/brain/brain1_0009.jpg
diff --git a/src/jpg/brain/brain1_0010.jpg b/src/ui/jpg/brain/brain1_0010.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0010.jpg
rename to src/ui/jpg/brain/brain1_0010.jpg
diff --git a/src/jpg/brain/brain1_0011.jpg b/src/ui/jpg/brain/brain1_0011.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0011.jpg
rename to src/ui/jpg/brain/brain1_0011.jpg
diff --git a/src/jpg/brain/brain1_0012.jpg b/src/ui/jpg/brain/brain1_0012.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0012.jpg
rename to src/ui/jpg/brain/brain1_0012.jpg
diff --git a/src/jpg/brain/brain1_0013.jpg b/src/ui/jpg/brain/brain1_0013.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0013.jpg
rename to src/ui/jpg/brain/brain1_0013.jpg
diff --git a/src/jpg/brain/brain1_0014.jpg b/src/ui/jpg/brain/brain1_0014.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0014.jpg
rename to src/ui/jpg/brain/brain1_0014.jpg
diff --git a/src/jpg/brain/brain1_0015.jpg b/src/ui/jpg/brain/brain1_0015.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0015.jpg
rename to src/ui/jpg/brain/brain1_0015.jpg
diff --git a/src/jpg/brain/brain1_0016.jpg b/src/ui/jpg/brain/brain1_0016.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0016.jpg
rename to src/ui/jpg/brain/brain1_0016.jpg
diff --git a/src/jpg/brain/brain1_0017.jpg b/src/ui/jpg/brain/brain1_0017.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0017.jpg
rename to src/ui/jpg/brain/brain1_0017.jpg
diff --git a/src/jpg/brain/brain1_0018.jpg b/src/ui/jpg/brain/brain1_0018.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0018.jpg
rename to src/ui/jpg/brain/brain1_0018.jpg
diff --git a/src/jpg/brain/brain1_0019.jpg b/src/ui/jpg/brain/brain1_0019.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0019.jpg
rename to src/ui/jpg/brain/brain1_0019.jpg
diff --git a/src/jpg/brain/brain1_0020.jpg b/src/ui/jpg/brain/brain1_0020.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0020.jpg
rename to src/ui/jpg/brain/brain1_0020.jpg
diff --git a/src/jpg/brain/brain1_0021.jpg b/src/ui/jpg/brain/brain1_0021.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0021.jpg
rename to src/ui/jpg/brain/brain1_0021.jpg
diff --git a/src/jpg/brain/brain1_0022.jpg b/src/ui/jpg/brain/brain1_0022.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0022.jpg
rename to src/ui/jpg/brain/brain1_0022.jpg
diff --git a/src/jpg/brain/brain1_0023.jpg b/src/ui/jpg/brain/brain1_0023.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0023.jpg
rename to src/ui/jpg/brain/brain1_0023.jpg
diff --git a/src/jpg/brain/brain1_0024.jpg b/src/ui/jpg/brain/brain1_0024.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0024.jpg
rename to src/ui/jpg/brain/brain1_0024.jpg
diff --git a/src/jpg/brain/brain1_0025.jpg b/src/ui/jpg/brain/brain1_0025.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0025.jpg
rename to src/ui/jpg/brain/brain1_0025.jpg
diff --git a/src/jpg/brain/brain1_0026.jpg b/src/ui/jpg/brain/brain1_0026.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0026.jpg
rename to src/ui/jpg/brain/brain1_0026.jpg
diff --git a/src/jpg/brain/brain1_0027.jpg b/src/ui/jpg/brain/brain1_0027.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0027.jpg
rename to src/ui/jpg/brain/brain1_0027.jpg
diff --git a/src/jpg/brain/brain1_0028.jpg b/src/ui/jpg/brain/brain1_0028.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0028.jpg
rename to src/ui/jpg/brain/brain1_0028.jpg
diff --git a/src/jpg/brain/brain1_0029.jpg b/src/ui/jpg/brain/brain1_0029.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0029.jpg
rename to src/ui/jpg/brain/brain1_0029.jpg
diff --git a/src/jpg/brain/brain1_0030.jpg b/src/ui/jpg/brain/brain1_0030.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0030.jpg
rename to src/ui/jpg/brain/brain1_0030.jpg
diff --git a/src/jpg/brain/brain1_0031.jpg b/src/ui/jpg/brain/brain1_0031.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0031.jpg
rename to src/ui/jpg/brain/brain1_0031.jpg
diff --git a/src/jpg/brain/brain1_0032.jpg b/src/ui/jpg/brain/brain1_0032.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0032.jpg
rename to src/ui/jpg/brain/brain1_0032.jpg
diff --git a/src/jpg/brain/brain1_0033.jpg b/src/ui/jpg/brain/brain1_0033.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0033.jpg
rename to src/ui/jpg/brain/brain1_0033.jpg
diff --git a/src/jpg/brain/brain1_0034.jpg b/src/ui/jpg/brain/brain1_0034.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0034.jpg
rename to src/ui/jpg/brain/brain1_0034.jpg
diff --git a/src/jpg/brain/brain1_0035.jpg b/src/ui/jpg/brain/brain1_0035.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0035.jpg
rename to src/ui/jpg/brain/brain1_0035.jpg
diff --git a/src/jpg/brain/brain1_0036.jpg b/src/ui/jpg/brain/brain1_0036.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0036.jpg
rename to src/ui/jpg/brain/brain1_0036.jpg
diff --git a/src/jpg/brain/brain1_0037.jpg b/src/ui/jpg/brain/brain1_0037.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0037.jpg
rename to src/ui/jpg/brain/brain1_0037.jpg
diff --git a/src/jpg/brain/brain1_0038.jpg b/src/ui/jpg/brain/brain1_0038.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0038.jpg
rename to src/ui/jpg/brain/brain1_0038.jpg
diff --git a/src/jpg/brain/brain1_0039.jpg b/src/ui/jpg/brain/brain1_0039.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0039.jpg
rename to src/ui/jpg/brain/brain1_0039.jpg
diff --git a/src/jpg/brain/brain1_0040.jpg b/src/ui/jpg/brain/brain1_0040.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0040.jpg
rename to src/ui/jpg/brain/brain1_0040.jpg
diff --git a/src/jpg/brain/brain1_0041.jpg b/src/ui/jpg/brain/brain1_0041.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0041.jpg
rename to src/ui/jpg/brain/brain1_0041.jpg
diff --git a/src/jpg/brain/brain1_0042.jpg b/src/ui/jpg/brain/brain1_0042.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0042.jpg
rename to src/ui/jpg/brain/brain1_0042.jpg
diff --git a/src/jpg/brain/brain1_0043.jpg b/src/ui/jpg/brain/brain1_0043.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0043.jpg
rename to src/ui/jpg/brain/brain1_0043.jpg
diff --git a/src/jpg/brain/brain1_0044.jpg b/src/ui/jpg/brain/brain1_0044.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0044.jpg
rename to src/ui/jpg/brain/brain1_0044.jpg
diff --git a/src/jpg/brain/brain1_0045.jpg b/src/ui/jpg/brain/brain1_0045.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0045.jpg
rename to src/ui/jpg/brain/brain1_0045.jpg
diff --git a/src/jpg/brain/brain1_0046.jpg b/src/ui/jpg/brain/brain1_0046.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0046.jpg
rename to src/ui/jpg/brain/brain1_0046.jpg
diff --git a/src/jpg/brain/brain1_0047.jpg b/src/ui/jpg/brain/brain1_0047.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0047.jpg
rename to src/ui/jpg/brain/brain1_0047.jpg
diff --git a/src/jpg/brain/brain1_0048.jpg b/src/ui/jpg/brain/brain1_0048.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0048.jpg
rename to src/ui/jpg/brain/brain1_0048.jpg
diff --git a/src/jpg/brain/brain1_0049.jpg b/src/ui/jpg/brain/brain1_0049.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0049.jpg
rename to src/ui/jpg/brain/brain1_0049.jpg
diff --git a/src/jpg/brain/brain1_0050.jpg b/src/ui/jpg/brain/brain1_0050.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0050.jpg
rename to src/ui/jpg/brain/brain1_0050.jpg
diff --git a/src/jpg/brain/brain1_0051.jpg b/src/ui/jpg/brain/brain1_0051.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0051.jpg
rename to src/ui/jpg/brain/brain1_0051.jpg
diff --git a/src/jpg/brain/brain1_0052.jpg b/src/ui/jpg/brain/brain1_0052.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0052.jpg
rename to src/ui/jpg/brain/brain1_0052.jpg
diff --git a/src/jpg/brain/brain1_0053.jpg b/src/ui/jpg/brain/brain1_0053.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0053.jpg
rename to src/ui/jpg/brain/brain1_0053.jpg
diff --git a/src/jpg/brain/brain1_0054.jpg b/src/ui/jpg/brain/brain1_0054.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0054.jpg
rename to src/ui/jpg/brain/brain1_0054.jpg
diff --git a/src/jpg/brain/brain1_0055.jpg b/src/ui/jpg/brain/brain1_0055.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0055.jpg
rename to src/ui/jpg/brain/brain1_0055.jpg
diff --git a/src/jpg/brain/brain1_0056.jpg b/src/ui/jpg/brain/brain1_0056.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0056.jpg
rename to src/ui/jpg/brain/brain1_0056.jpg
diff --git a/src/jpg/brain/brain1_0057.jpg b/src/ui/jpg/brain/brain1_0057.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0057.jpg
rename to src/ui/jpg/brain/brain1_0057.jpg
diff --git a/src/jpg/brain/brain1_0058.jpg b/src/ui/jpg/brain/brain1_0058.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0058.jpg
rename to src/ui/jpg/brain/brain1_0058.jpg
diff --git a/src/jpg/brain/brain1_0059.jpg b/src/ui/jpg/brain/brain1_0059.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0059.jpg
rename to src/ui/jpg/brain/brain1_0059.jpg
diff --git a/src/jpg/brain/brain1_0060.jpg b/src/ui/jpg/brain/brain1_0060.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0060.jpg
rename to src/ui/jpg/brain/brain1_0060.jpg
diff --git a/src/jpg/brain/brain1_0061.jpg b/src/ui/jpg/brain/brain1_0061.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0061.jpg
rename to src/ui/jpg/brain/brain1_0061.jpg
diff --git a/src/jpg/brain/brain1_0062.jpg b/src/ui/jpg/brain/brain1_0062.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0062.jpg
rename to src/ui/jpg/brain/brain1_0062.jpg
diff --git a/src/jpg/brain/brain1_0063.jpg b/src/ui/jpg/brain/brain1_0063.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0063.jpg
rename to src/ui/jpg/brain/brain1_0063.jpg
diff --git a/src/jpg/brain/brain1_0064.jpg b/src/ui/jpg/brain/brain1_0064.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0064.jpg
rename to src/ui/jpg/brain/brain1_0064.jpg
diff --git a/src/jpg/brain/brain1_0065.jpg b/src/ui/jpg/brain/brain1_0065.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0065.jpg
rename to src/ui/jpg/brain/brain1_0065.jpg
diff --git a/src/jpg/brain/brain1_0066.jpg b/src/ui/jpg/brain/brain1_0066.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0066.jpg
rename to src/ui/jpg/brain/brain1_0066.jpg
diff --git a/src/jpg/brain/brain1_0067.jpg b/src/ui/jpg/brain/brain1_0067.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0067.jpg
rename to src/ui/jpg/brain/brain1_0067.jpg
diff --git a/src/jpg/brain/brain1_0068.jpg b/src/ui/jpg/brain/brain1_0068.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0068.jpg
rename to src/ui/jpg/brain/brain1_0068.jpg
diff --git a/src/jpg/brain/brain1_0069.jpg b/src/ui/jpg/brain/brain1_0069.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0069.jpg
rename to src/ui/jpg/brain/brain1_0069.jpg
diff --git a/src/jpg/brain/brain1_0070.jpg b/src/ui/jpg/brain/brain1_0070.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0070.jpg
rename to src/ui/jpg/brain/brain1_0070.jpg
diff --git a/src/jpg/brain/brain1_0071.jpg b/src/ui/jpg/brain/brain1_0071.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0071.jpg
rename to src/ui/jpg/brain/brain1_0071.jpg
diff --git a/src/jpg/brain/brain1_0072.jpg b/src/ui/jpg/brain/brain1_0072.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0072.jpg
rename to src/ui/jpg/brain/brain1_0072.jpg
diff --git a/src/jpg/brain/brain1_0073.jpg b/src/ui/jpg/brain/brain1_0073.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0073.jpg
rename to src/ui/jpg/brain/brain1_0073.jpg
diff --git a/src/jpg/brain/brain1_0074.jpg b/src/ui/jpg/brain/brain1_0074.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0074.jpg
rename to src/ui/jpg/brain/brain1_0074.jpg
diff --git a/src/jpg/brain/brain1_0075.jpg b/src/ui/jpg/brain/brain1_0075.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0075.jpg
rename to src/ui/jpg/brain/brain1_0075.jpg
diff --git a/src/jpg/brain/brain1_0076.jpg b/src/ui/jpg/brain/brain1_0076.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0076.jpg
rename to src/ui/jpg/brain/brain1_0076.jpg
diff --git a/src/jpg/brain/brain1_0077.jpg b/src/ui/jpg/brain/brain1_0077.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0077.jpg
rename to src/ui/jpg/brain/brain1_0077.jpg
diff --git a/src/jpg/brain/brain1_0078.jpg b/src/ui/jpg/brain/brain1_0078.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0078.jpg
rename to src/ui/jpg/brain/brain1_0078.jpg
diff --git a/src/jpg/brain/brain1_0079.jpg b/src/ui/jpg/brain/brain1_0079.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0079.jpg
rename to src/ui/jpg/brain/brain1_0079.jpg
diff --git a/src/jpg/brain/brain1_0080.jpg b/src/ui/jpg/brain/brain1_0080.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0080.jpg
rename to src/ui/jpg/brain/brain1_0080.jpg
diff --git a/src/jpg/brain/brain1_0081.jpg b/src/ui/jpg/brain/brain1_0081.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0081.jpg
rename to src/ui/jpg/brain/brain1_0081.jpg
diff --git a/src/jpg/brain/brain1_0082.jpg b/src/ui/jpg/brain/brain1_0082.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0082.jpg
rename to src/ui/jpg/brain/brain1_0082.jpg
diff --git a/src/jpg/brain/brain1_0083.jpg b/src/ui/jpg/brain/brain1_0083.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0083.jpg
rename to src/ui/jpg/brain/brain1_0083.jpg
diff --git a/src/jpg/brain/brain1_0084.jpg b/src/ui/jpg/brain/brain1_0084.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0084.jpg
rename to src/ui/jpg/brain/brain1_0084.jpg
diff --git a/src/jpg/brain/brain1_0085.jpg b/src/ui/jpg/brain/brain1_0085.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0085.jpg
rename to src/ui/jpg/brain/brain1_0085.jpg
diff --git a/src/jpg/brain/brain1_0086.jpg b/src/ui/jpg/brain/brain1_0086.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0086.jpg
rename to src/ui/jpg/brain/brain1_0086.jpg
diff --git a/src/jpg/brain/brain1_0087.jpg b/src/ui/jpg/brain/brain1_0087.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0087.jpg
rename to src/ui/jpg/brain/brain1_0087.jpg
diff --git a/src/jpg/brain/brain1_0088.jpg b/src/ui/jpg/brain/brain1_0088.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0088.jpg
rename to src/ui/jpg/brain/brain1_0088.jpg
diff --git a/src/jpg/brain/brain1_0089.jpg b/src/ui/jpg/brain/brain1_0089.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0089.jpg
rename to src/ui/jpg/brain/brain1_0089.jpg
diff --git a/src/jpg/brain/brain1_0090.jpg b/src/ui/jpg/brain/brain1_0090.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0090.jpg
rename to src/ui/jpg/brain/brain1_0090.jpg
diff --git a/src/jpg/brain/brain1_0091.jpg b/src/ui/jpg/brain/brain1_0091.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0091.jpg
rename to src/ui/jpg/brain/brain1_0091.jpg
diff --git a/src/jpg/brain/brain1_0092.jpg b/src/ui/jpg/brain/brain1_0092.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0092.jpg
rename to src/ui/jpg/brain/brain1_0092.jpg
diff --git a/src/jpg/brain/brain1_0093.jpg b/src/ui/jpg/brain/brain1_0093.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0093.jpg
rename to src/ui/jpg/brain/brain1_0093.jpg
diff --git a/src/jpg/brain/brain1_0094.jpg b/src/ui/jpg/brain/brain1_0094.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0094.jpg
rename to src/ui/jpg/brain/brain1_0094.jpg
diff --git a/src/jpg/brain/brain1_0095.jpg b/src/ui/jpg/brain/brain1_0095.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0095.jpg
rename to src/ui/jpg/brain/brain1_0095.jpg
diff --git a/src/jpg/brain/brain1_0096.jpg b/src/ui/jpg/brain/brain1_0096.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0096.jpg
rename to src/ui/jpg/brain/brain1_0096.jpg
diff --git a/src/jpg/brain/brain1_0097.jpg b/src/ui/jpg/brain/brain1_0097.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0097.jpg
rename to src/ui/jpg/brain/brain1_0097.jpg
diff --git a/src/jpg/brain/brain1_0098.jpg b/src/ui/jpg/brain/brain1_0098.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0098.jpg
rename to src/ui/jpg/brain/brain1_0098.jpg
diff --git a/src/jpg/brain/brain1_0099.jpg b/src/ui/jpg/brain/brain1_0099.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0099.jpg
rename to src/ui/jpg/brain/brain1_0099.jpg
diff --git a/src/jpg/brain/brain1_0100.jpg b/src/ui/jpg/brain/brain1_0100.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0100.jpg
rename to src/ui/jpg/brain/brain1_0100.jpg
diff --git a/src/jpg/brain/brain1_0101.jpg b/src/ui/jpg/brain/brain1_0101.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0101.jpg
rename to src/ui/jpg/brain/brain1_0101.jpg
diff --git a/src/jpg/brain/brain1_0102.jpg b/src/ui/jpg/brain/brain1_0102.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0102.jpg
rename to src/ui/jpg/brain/brain1_0102.jpg
diff --git a/src/jpg/brain/brain1_0103.jpg b/src/ui/jpg/brain/brain1_0103.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0103.jpg
rename to src/ui/jpg/brain/brain1_0103.jpg
diff --git a/src/jpg/brain/brain1_0104.jpg b/src/ui/jpg/brain/brain1_0104.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0104.jpg
rename to src/ui/jpg/brain/brain1_0104.jpg
diff --git a/src/jpg/brain/brain1_0105.jpg b/src/ui/jpg/brain/brain1_0105.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0105.jpg
rename to src/ui/jpg/brain/brain1_0105.jpg
diff --git a/src/jpg/brain/brain1_0106.jpg b/src/ui/jpg/brain/brain1_0106.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0106.jpg
rename to src/ui/jpg/brain/brain1_0106.jpg
diff --git a/src/jpg/brain/brain1_0107.jpg b/src/ui/jpg/brain/brain1_0107.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0107.jpg
rename to src/ui/jpg/brain/brain1_0107.jpg
diff --git a/src/jpg/brain/brain1_0108.jpg b/src/ui/jpg/brain/brain1_0108.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0108.jpg
rename to src/ui/jpg/brain/brain1_0108.jpg
diff --git a/src/jpg/brain/brain1_0109.jpg b/src/ui/jpg/brain/brain1_0109.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0109.jpg
rename to src/ui/jpg/brain/brain1_0109.jpg
diff --git a/src/jpg/brain/brain1_0110.jpg b/src/ui/jpg/brain/brain1_0110.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0110.jpg
rename to src/ui/jpg/brain/brain1_0110.jpg
diff --git a/src/jpg/brain/brain1_0111.jpg b/src/ui/jpg/brain/brain1_0111.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0111.jpg
rename to src/ui/jpg/brain/brain1_0111.jpg
diff --git a/src/jpg/brain/brain1_0112.jpg b/src/ui/jpg/brain/brain1_0112.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0112.jpg
rename to src/ui/jpg/brain/brain1_0112.jpg
diff --git a/src/jpg/brain/brain1_0113.jpg b/src/ui/jpg/brain/brain1_0113.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0113.jpg
rename to src/ui/jpg/brain/brain1_0113.jpg
diff --git a/src/jpg/brain/brain1_0114.jpg b/src/ui/jpg/brain/brain1_0114.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0114.jpg
rename to src/ui/jpg/brain/brain1_0114.jpg
diff --git a/src/jpg/brain/brain1_0115.jpg b/src/ui/jpg/brain/brain1_0115.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0115.jpg
rename to src/ui/jpg/brain/brain1_0115.jpg
diff --git a/src/jpg/brain/brain1_0116.jpg b/src/ui/jpg/brain/brain1_0116.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0116.jpg
rename to src/ui/jpg/brain/brain1_0116.jpg
diff --git a/src/jpg/brain/brain1_0117.jpg b/src/ui/jpg/brain/brain1_0117.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0117.jpg
rename to src/ui/jpg/brain/brain1_0117.jpg
diff --git a/src/jpg/brain/brain1_0118.jpg b/src/ui/jpg/brain/brain1_0118.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0118.jpg
rename to src/ui/jpg/brain/brain1_0118.jpg
diff --git a/src/jpg/brain/brain1_0119.jpg b/src/ui/jpg/brain/brain1_0119.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0119.jpg
rename to src/ui/jpg/brain/brain1_0119.jpg
diff --git a/src/jpg/brain/brain1_0120.jpg b/src/ui/jpg/brain/brain1_0120.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0120.jpg
rename to src/ui/jpg/brain/brain1_0120.jpg
diff --git a/src/jpg/brain/brain1_0121.jpg b/src/ui/jpg/brain/brain1_0121.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0121.jpg
rename to src/ui/jpg/brain/brain1_0121.jpg
diff --git a/src/jpg/brain/brain1_0122.jpg b/src/ui/jpg/brain/brain1_0122.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0122.jpg
rename to src/ui/jpg/brain/brain1_0122.jpg
diff --git a/src/jpg/brain/brain1_0123.jpg b/src/ui/jpg/brain/brain1_0123.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0123.jpg
rename to src/ui/jpg/brain/brain1_0123.jpg
diff --git a/src/jpg/brain/brain1_0124.jpg b/src/ui/jpg/brain/brain1_0124.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0124.jpg
rename to src/ui/jpg/brain/brain1_0124.jpg
diff --git a/src/jpg/brain/brain1_0125.jpg b/src/ui/jpg/brain/brain1_0125.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0125.jpg
rename to src/ui/jpg/brain/brain1_0125.jpg
diff --git a/src/jpg/brain/brain1_0126.jpg b/src/ui/jpg/brain/brain1_0126.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0126.jpg
rename to src/ui/jpg/brain/brain1_0126.jpg
diff --git a/src/jpg/brain/brain1_0127.jpg b/src/ui/jpg/brain/brain1_0127.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0127.jpg
rename to src/ui/jpg/brain/brain1_0127.jpg
diff --git a/src/jpg/brain/brain1_0128.jpg b/src/ui/jpg/brain/brain1_0128.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0128.jpg
rename to src/ui/jpg/brain/brain1_0128.jpg
diff --git a/src/jpg/brain/brain1_0129.jpg b/src/ui/jpg/brain/brain1_0129.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0129.jpg
rename to src/ui/jpg/brain/brain1_0129.jpg
diff --git a/src/jpg/brain/brain1_0130.jpg b/src/ui/jpg/brain/brain1_0130.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0130.jpg
rename to src/ui/jpg/brain/brain1_0130.jpg
diff --git a/src/jpg/brain/brain1_0131.jpg b/src/ui/jpg/brain/brain1_0131.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0131.jpg
rename to src/ui/jpg/brain/brain1_0131.jpg
diff --git a/src/jpg/brain/brain1_0132.jpg b/src/ui/jpg/brain/brain1_0132.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0132.jpg
rename to src/ui/jpg/brain/brain1_0132.jpg
diff --git a/src/jpg/brain/brain1_0133.jpg b/src/ui/jpg/brain/brain1_0133.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0133.jpg
rename to src/ui/jpg/brain/brain1_0133.jpg
diff --git a/src/jpg/brain/brain1_0134.jpg b/src/ui/jpg/brain/brain1_0134.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0134.jpg
rename to src/ui/jpg/brain/brain1_0134.jpg
diff --git a/src/jpg/brain/brain1_0135.jpg b/src/ui/jpg/brain/brain1_0135.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0135.jpg
rename to src/ui/jpg/brain/brain1_0135.jpg
diff --git a/src/jpg/brain/brain1_0136.jpg b/src/ui/jpg/brain/brain1_0136.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0136.jpg
rename to src/ui/jpg/brain/brain1_0136.jpg
diff --git a/src/jpg/brain/brain1_0137.jpg b/src/ui/jpg/brain/brain1_0137.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0137.jpg
rename to src/ui/jpg/brain/brain1_0137.jpg
diff --git a/src/jpg/brain/brain1_0138.jpg b/src/ui/jpg/brain/brain1_0138.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0138.jpg
rename to src/ui/jpg/brain/brain1_0138.jpg
diff --git a/src/jpg/brain/brain1_0139.jpg b/src/ui/jpg/brain/brain1_0139.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0139.jpg
rename to src/ui/jpg/brain/brain1_0139.jpg
diff --git a/src/jpg/brain/brain1_0140.jpg b/src/ui/jpg/brain/brain1_0140.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0140.jpg
rename to src/ui/jpg/brain/brain1_0140.jpg
diff --git a/src/jpg/brain/brain1_0141.jpg b/src/ui/jpg/brain/brain1_0141.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0141.jpg
rename to src/ui/jpg/brain/brain1_0141.jpg
diff --git a/src/jpg/brain/brain1_0142.jpg b/src/ui/jpg/brain/brain1_0142.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0142.jpg
rename to src/ui/jpg/brain/brain1_0142.jpg
diff --git a/src/jpg/brain/brain1_0143.jpg b/src/ui/jpg/brain/brain1_0143.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0143.jpg
rename to src/ui/jpg/brain/brain1_0143.jpg
diff --git a/src/jpg/brain/brain1_0144.jpg b/src/ui/jpg/brain/brain1_0144.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0144.jpg
rename to src/ui/jpg/brain/brain1_0144.jpg
diff --git a/src/jpg/brain/brain1_0145.jpg b/src/ui/jpg/brain/brain1_0145.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0145.jpg
rename to src/ui/jpg/brain/brain1_0145.jpg
diff --git a/src/jpg/brain/brain1_0146.jpg b/src/ui/jpg/brain/brain1_0146.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0146.jpg
rename to src/ui/jpg/brain/brain1_0146.jpg
diff --git a/src/jpg/brain/brain1_0147.jpg b/src/ui/jpg/brain/brain1_0147.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0147.jpg
rename to src/ui/jpg/brain/brain1_0147.jpg
diff --git a/src/jpg/brain/brain1_0148.jpg b/src/ui/jpg/brain/brain1_0148.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0148.jpg
rename to src/ui/jpg/brain/brain1_0148.jpg
diff --git a/src/jpg/brain/brain1_0149.jpg b/src/ui/jpg/brain/brain1_0149.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0149.jpg
rename to src/ui/jpg/brain/brain1_0149.jpg
diff --git a/src/jpg/brain/brain1_0150.jpg b/src/ui/jpg/brain/brain1_0150.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0150.jpg
rename to src/ui/jpg/brain/brain1_0150.jpg
diff --git a/src/jpg/brain/brain1_0151.jpg b/src/ui/jpg/brain/brain1_0151.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0151.jpg
rename to src/ui/jpg/brain/brain1_0151.jpg
diff --git a/src/jpg/brain/brain1_0152.jpg b/src/ui/jpg/brain/brain1_0152.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0152.jpg
rename to src/ui/jpg/brain/brain1_0152.jpg
diff --git a/src/jpg/brain/brain1_0153.jpg b/src/ui/jpg/brain/brain1_0153.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0153.jpg
rename to src/ui/jpg/brain/brain1_0153.jpg
diff --git a/src/jpg/brain/brain1_0154.jpg b/src/ui/jpg/brain/brain1_0154.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0154.jpg
rename to src/ui/jpg/brain/brain1_0154.jpg
diff --git a/src/jpg/brain/brain1_0155.jpg b/src/ui/jpg/brain/brain1_0155.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0155.jpg
rename to src/ui/jpg/brain/brain1_0155.jpg
diff --git a/src/jpg/brain/brain1_0156.jpg b/src/ui/jpg/brain/brain1_0156.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0156.jpg
rename to src/ui/jpg/brain/brain1_0156.jpg
diff --git a/src/jpg/brain/brain1_0157.jpg b/src/ui/jpg/brain/brain1_0157.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0157.jpg
rename to src/ui/jpg/brain/brain1_0157.jpg
diff --git a/src/jpg/brain/brain1_0158.jpg b/src/ui/jpg/brain/brain1_0158.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0158.jpg
rename to src/ui/jpg/brain/brain1_0158.jpg
diff --git a/src/jpg/brain/brain1_0159.jpg b/src/ui/jpg/brain/brain1_0159.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0159.jpg
rename to src/ui/jpg/brain/brain1_0159.jpg
diff --git a/src/jpg/brain/brain1_0160.jpg b/src/ui/jpg/brain/brain1_0160.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0160.jpg
rename to src/ui/jpg/brain/brain1_0160.jpg
diff --git a/src/jpg/brain/brain1_0161.jpg b/src/ui/jpg/brain/brain1_0161.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0161.jpg
rename to src/ui/jpg/brain/brain1_0161.jpg
diff --git a/src/jpg/brain/brain1_0162.jpg b/src/ui/jpg/brain/brain1_0162.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0162.jpg
rename to src/ui/jpg/brain/brain1_0162.jpg
diff --git a/src/jpg/brain/brain1_0163.jpg b/src/ui/jpg/brain/brain1_0163.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0163.jpg
rename to src/ui/jpg/brain/brain1_0163.jpg
diff --git a/src/jpg/brain/brain1_0164.jpg b/src/ui/jpg/brain/brain1_0164.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0164.jpg
rename to src/ui/jpg/brain/brain1_0164.jpg
diff --git a/src/jpg/brain/brain1_0165.jpg b/src/ui/jpg/brain/brain1_0165.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0165.jpg
rename to src/ui/jpg/brain/brain1_0165.jpg
diff --git a/src/jpg/brain/brain1_0166.jpg b/src/ui/jpg/brain/brain1_0166.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0166.jpg
rename to src/ui/jpg/brain/brain1_0166.jpg
diff --git a/src/jpg/brain/brain1_0167.jpg b/src/ui/jpg/brain/brain1_0167.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0167.jpg
rename to src/ui/jpg/brain/brain1_0167.jpg
diff --git a/src/jpg/brain/brain1_0168.jpg b/src/ui/jpg/brain/brain1_0168.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0168.jpg
rename to src/ui/jpg/brain/brain1_0168.jpg
diff --git a/src/jpg/brain/brain1_0169.jpg b/src/ui/jpg/brain/brain1_0169.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0169.jpg
rename to src/ui/jpg/brain/brain1_0169.jpg
diff --git a/src/jpg/brain/brain1_0170.jpg b/src/ui/jpg/brain/brain1_0170.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0170.jpg
rename to src/ui/jpg/brain/brain1_0170.jpg
diff --git a/src/jpg/brain/brain1_0171.jpg b/src/ui/jpg/brain/brain1_0171.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0171.jpg
rename to src/ui/jpg/brain/brain1_0171.jpg
diff --git a/src/jpg/brain/brain1_0172.jpg b/src/ui/jpg/brain/brain1_0172.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0172.jpg
rename to src/ui/jpg/brain/brain1_0172.jpg
diff --git a/src/jpg/brain/brain1_0173.jpg b/src/ui/jpg/brain/brain1_0173.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0173.jpg
rename to src/ui/jpg/brain/brain1_0173.jpg
diff --git a/src/jpg/brain/brain1_0174.jpg b/src/ui/jpg/brain/brain1_0174.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0174.jpg
rename to src/ui/jpg/brain/brain1_0174.jpg
diff --git a/src/jpg/brain/brain1_0175.jpg b/src/ui/jpg/brain/brain1_0175.jpg
similarity index 100%
rename from src/jpg/brain/brain1_0175.jpg
rename to src/ui/jpg/brain/brain1_0175.jpg
diff --git "a/src/jpg/logo/Examen_sans_image_associ\303\251e.jpg" "b/src/ui/jpg/logo/Examen_sans_image_associ\303\251e.jpg"
similarity index 100%
rename from "src/jpg/logo/Examen_sans_image_associ\303\251e.jpg"
rename to "src/ui/jpg/logo/Examen_sans_image_associ\303\251e.jpg"
diff --git a/src/jpg/logo/LVBH.png b/src/ui/jpg/logo/LVBH.png
similarity index 100%
rename from src/jpg/logo/LVBH.png
rename to src/ui/jpg/logo/LVBH.png
diff --git a/src/jpg/logo/administration.png b/src/ui/jpg/logo/administration.png
similarity index 100%
rename from src/jpg/logo/administration.png
rename to src/ui/jpg/logo/administration.png
diff --git a/src/jpg/logo/background.png b/src/ui/jpg/logo/background.png
similarity index 100%
rename from src/jpg/logo/background.png
rename to src/ui/jpg/logo/background.png
diff --git a/src/jpg/logo/pp2__1_-removebg-preview.png b/src/ui/jpg/logo/pp2__1_-removebg-preview.png
similarity index 100%
rename from src/jpg/logo/pp2__1_-removebg-preview.png
rename to src/ui/jpg/logo/pp2__1_-removebg-preview.png
diff --git a/src/jpg/sinus/sinus1_0000.jpg b/src/ui/jpg/sinus/sinus1_0000.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0000.jpg
rename to src/ui/jpg/sinus/sinus1_0000.jpg
diff --git a/src/jpg/sinus/sinus1_0001.jpg b/src/ui/jpg/sinus/sinus1_0001.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0001.jpg
rename to src/ui/jpg/sinus/sinus1_0001.jpg
diff --git a/src/jpg/sinus/sinus1_0002.jpg b/src/ui/jpg/sinus/sinus1_0002.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0002.jpg
rename to src/ui/jpg/sinus/sinus1_0002.jpg
diff --git a/src/jpg/sinus/sinus1_0003.jpg b/src/ui/jpg/sinus/sinus1_0003.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0003.jpg
rename to src/ui/jpg/sinus/sinus1_0003.jpg
diff --git a/src/jpg/sinus/sinus1_0004.jpg b/src/ui/jpg/sinus/sinus1_0004.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0004.jpg
rename to src/ui/jpg/sinus/sinus1_0004.jpg
diff --git a/src/jpg/sinus/sinus1_0005.jpg b/src/ui/jpg/sinus/sinus1_0005.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0005.jpg
rename to src/ui/jpg/sinus/sinus1_0005.jpg
diff --git a/src/jpg/sinus/sinus1_0006.jpg b/src/ui/jpg/sinus/sinus1_0006.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0006.jpg
rename to src/ui/jpg/sinus/sinus1_0006.jpg
diff --git a/src/jpg/sinus/sinus1_0007.jpg b/src/ui/jpg/sinus/sinus1_0007.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0007.jpg
rename to src/ui/jpg/sinus/sinus1_0007.jpg
diff --git a/src/jpg/sinus/sinus1_0008.jpg b/src/ui/jpg/sinus/sinus1_0008.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0008.jpg
rename to src/ui/jpg/sinus/sinus1_0008.jpg
diff --git a/src/jpg/sinus/sinus1_0009.jpg b/src/ui/jpg/sinus/sinus1_0009.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0009.jpg
rename to src/ui/jpg/sinus/sinus1_0009.jpg
diff --git a/src/jpg/sinus/sinus1_0010.jpg b/src/ui/jpg/sinus/sinus1_0010.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0010.jpg
rename to src/ui/jpg/sinus/sinus1_0010.jpg
diff --git a/src/jpg/sinus/sinus1_0011.jpg b/src/ui/jpg/sinus/sinus1_0011.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0011.jpg
rename to src/ui/jpg/sinus/sinus1_0011.jpg
diff --git a/src/jpg/sinus/sinus1_0012.jpg b/src/ui/jpg/sinus/sinus1_0012.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0012.jpg
rename to src/ui/jpg/sinus/sinus1_0012.jpg
diff --git a/src/jpg/sinus/sinus1_0013.jpg b/src/ui/jpg/sinus/sinus1_0013.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0013.jpg
rename to src/ui/jpg/sinus/sinus1_0013.jpg
diff --git a/src/jpg/sinus/sinus1_0014.jpg b/src/ui/jpg/sinus/sinus1_0014.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0014.jpg
rename to src/ui/jpg/sinus/sinus1_0014.jpg
diff --git a/src/jpg/sinus/sinus1_0015.jpg b/src/ui/jpg/sinus/sinus1_0015.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0015.jpg
rename to src/ui/jpg/sinus/sinus1_0015.jpg
diff --git a/src/jpg/sinus/sinus1_0016.jpg b/src/ui/jpg/sinus/sinus1_0016.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0016.jpg
rename to src/ui/jpg/sinus/sinus1_0016.jpg
diff --git a/src/jpg/sinus/sinus1_0017.jpg b/src/ui/jpg/sinus/sinus1_0017.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0017.jpg
rename to src/ui/jpg/sinus/sinus1_0017.jpg
diff --git a/src/jpg/sinus/sinus1_0018.jpg b/src/ui/jpg/sinus/sinus1_0018.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0018.jpg
rename to src/ui/jpg/sinus/sinus1_0018.jpg
diff --git a/src/jpg/sinus/sinus1_0019.jpg b/src/ui/jpg/sinus/sinus1_0019.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0019.jpg
rename to src/ui/jpg/sinus/sinus1_0019.jpg
diff --git a/src/jpg/sinus/sinus1_0020.jpg b/src/ui/jpg/sinus/sinus1_0020.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0020.jpg
rename to src/ui/jpg/sinus/sinus1_0020.jpg
diff --git a/src/jpg/sinus/sinus1_0021.jpg b/src/ui/jpg/sinus/sinus1_0021.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0021.jpg
rename to src/ui/jpg/sinus/sinus1_0021.jpg
diff --git a/src/jpg/sinus/sinus1_0022.jpg b/src/ui/jpg/sinus/sinus1_0022.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0022.jpg
rename to src/ui/jpg/sinus/sinus1_0022.jpg
diff --git a/src/jpg/sinus/sinus1_0023.jpg b/src/ui/jpg/sinus/sinus1_0023.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0023.jpg
rename to src/ui/jpg/sinus/sinus1_0023.jpg
diff --git a/src/jpg/sinus/sinus1_0024.jpg b/src/ui/jpg/sinus/sinus1_0024.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0024.jpg
rename to src/ui/jpg/sinus/sinus1_0024.jpg
diff --git a/src/jpg/sinus/sinus1_0025.jpg b/src/ui/jpg/sinus/sinus1_0025.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0025.jpg
rename to src/ui/jpg/sinus/sinus1_0025.jpg
diff --git a/src/jpg/sinus/sinus1_0026.jpg b/src/ui/jpg/sinus/sinus1_0026.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0026.jpg
rename to src/ui/jpg/sinus/sinus1_0026.jpg
diff --git a/src/jpg/sinus/sinus1_0027.jpg b/src/ui/jpg/sinus/sinus1_0027.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0027.jpg
rename to src/ui/jpg/sinus/sinus1_0027.jpg
diff --git a/src/jpg/sinus/sinus1_0028.jpg b/src/ui/jpg/sinus/sinus1_0028.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0028.jpg
rename to src/ui/jpg/sinus/sinus1_0028.jpg
diff --git a/src/jpg/sinus/sinus1_0029.jpg b/src/ui/jpg/sinus/sinus1_0029.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0029.jpg
rename to src/ui/jpg/sinus/sinus1_0029.jpg
diff --git a/src/jpg/sinus/sinus1_0030.jpg b/src/ui/jpg/sinus/sinus1_0030.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0030.jpg
rename to src/ui/jpg/sinus/sinus1_0030.jpg
diff --git a/src/jpg/sinus/sinus1_0031.jpg b/src/ui/jpg/sinus/sinus1_0031.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0031.jpg
rename to src/ui/jpg/sinus/sinus1_0031.jpg
diff --git a/src/jpg/sinus/sinus1_0032.jpg b/src/ui/jpg/sinus/sinus1_0032.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0032.jpg
rename to src/ui/jpg/sinus/sinus1_0032.jpg
diff --git a/src/jpg/sinus/sinus1_0033.jpg b/src/ui/jpg/sinus/sinus1_0033.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0033.jpg
rename to src/ui/jpg/sinus/sinus1_0033.jpg
diff --git a/src/jpg/sinus/sinus1_0034.jpg b/src/ui/jpg/sinus/sinus1_0034.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0034.jpg
rename to src/ui/jpg/sinus/sinus1_0034.jpg
diff --git a/src/jpg/sinus/sinus1_0035.jpg b/src/ui/jpg/sinus/sinus1_0035.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0035.jpg
rename to src/ui/jpg/sinus/sinus1_0035.jpg
diff --git a/src/jpg/sinus/sinus1_0036.jpg b/src/ui/jpg/sinus/sinus1_0036.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0036.jpg
rename to src/ui/jpg/sinus/sinus1_0036.jpg
diff --git a/src/jpg/sinus/sinus1_0037.jpg b/src/ui/jpg/sinus/sinus1_0037.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0037.jpg
rename to src/ui/jpg/sinus/sinus1_0037.jpg
diff --git a/src/jpg/sinus/sinus1_0038.jpg b/src/ui/jpg/sinus/sinus1_0038.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0038.jpg
rename to src/ui/jpg/sinus/sinus1_0038.jpg
diff --git a/src/jpg/sinus/sinus1_0039.jpg b/src/ui/jpg/sinus/sinus1_0039.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0039.jpg
rename to src/ui/jpg/sinus/sinus1_0039.jpg
diff --git a/src/jpg/sinus/sinus1_0040.jpg b/src/ui/jpg/sinus/sinus1_0040.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0040.jpg
rename to src/ui/jpg/sinus/sinus1_0040.jpg
diff --git a/src/jpg/sinus/sinus1_0041.jpg b/src/ui/jpg/sinus/sinus1_0041.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0041.jpg
rename to src/ui/jpg/sinus/sinus1_0041.jpg
diff --git a/src/jpg/sinus/sinus1_0042.jpg b/src/ui/jpg/sinus/sinus1_0042.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0042.jpg
rename to src/ui/jpg/sinus/sinus1_0042.jpg
diff --git a/src/jpg/sinus/sinus1_0043.jpg b/src/ui/jpg/sinus/sinus1_0043.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0043.jpg
rename to src/ui/jpg/sinus/sinus1_0043.jpg
diff --git a/src/jpg/sinus/sinus1_0044.jpg b/src/ui/jpg/sinus/sinus1_0044.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0044.jpg
rename to src/ui/jpg/sinus/sinus1_0044.jpg
diff --git a/src/jpg/sinus/sinus1_0045.jpg b/src/ui/jpg/sinus/sinus1_0045.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0045.jpg
rename to src/ui/jpg/sinus/sinus1_0045.jpg
diff --git a/src/jpg/sinus/sinus1_0046.jpg b/src/ui/jpg/sinus/sinus1_0046.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0046.jpg
rename to src/ui/jpg/sinus/sinus1_0046.jpg
diff --git a/src/jpg/sinus/sinus1_0047.jpg b/src/ui/jpg/sinus/sinus1_0047.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0047.jpg
rename to src/ui/jpg/sinus/sinus1_0047.jpg
diff --git a/src/jpg/sinus/sinus1_0048.jpg b/src/ui/jpg/sinus/sinus1_0048.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0048.jpg
rename to src/ui/jpg/sinus/sinus1_0048.jpg
diff --git a/src/jpg/sinus/sinus1_0049.jpg b/src/ui/jpg/sinus/sinus1_0049.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0049.jpg
rename to src/ui/jpg/sinus/sinus1_0049.jpg
diff --git a/src/jpg/sinus/sinus1_0050.jpg b/src/ui/jpg/sinus/sinus1_0050.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0050.jpg
rename to src/ui/jpg/sinus/sinus1_0050.jpg
diff --git a/src/jpg/sinus/sinus1_0051.jpg b/src/ui/jpg/sinus/sinus1_0051.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0051.jpg
rename to src/ui/jpg/sinus/sinus1_0051.jpg
diff --git a/src/jpg/sinus/sinus1_0052.jpg b/src/ui/jpg/sinus/sinus1_0052.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0052.jpg
rename to src/ui/jpg/sinus/sinus1_0052.jpg
diff --git a/src/jpg/sinus/sinus1_0053.jpg b/src/ui/jpg/sinus/sinus1_0053.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0053.jpg
rename to src/ui/jpg/sinus/sinus1_0053.jpg
diff --git a/src/jpg/sinus/sinus1_0054.jpg b/src/ui/jpg/sinus/sinus1_0054.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0054.jpg
rename to src/ui/jpg/sinus/sinus1_0054.jpg
diff --git a/src/jpg/sinus/sinus1_0055.jpg b/src/ui/jpg/sinus/sinus1_0055.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0055.jpg
rename to src/ui/jpg/sinus/sinus1_0055.jpg
diff --git a/src/jpg/sinus/sinus1_0056.jpg b/src/ui/jpg/sinus/sinus1_0056.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0056.jpg
rename to src/ui/jpg/sinus/sinus1_0056.jpg
diff --git a/src/jpg/sinus/sinus1_0057.jpg b/src/ui/jpg/sinus/sinus1_0057.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0057.jpg
rename to src/ui/jpg/sinus/sinus1_0057.jpg
diff --git a/src/jpg/sinus/sinus1_0058.jpg b/src/ui/jpg/sinus/sinus1_0058.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0058.jpg
rename to src/ui/jpg/sinus/sinus1_0058.jpg
diff --git a/src/jpg/sinus/sinus1_0059.jpg b/src/ui/jpg/sinus/sinus1_0059.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0059.jpg
rename to src/ui/jpg/sinus/sinus1_0059.jpg
diff --git a/src/jpg/sinus/sinus1_0060.jpg b/src/ui/jpg/sinus/sinus1_0060.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0060.jpg
rename to src/ui/jpg/sinus/sinus1_0060.jpg
diff --git a/src/jpg/sinus/sinus1_0061.jpg b/src/ui/jpg/sinus/sinus1_0061.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0061.jpg
rename to src/ui/jpg/sinus/sinus1_0061.jpg
diff --git a/src/jpg/sinus/sinus1_0062.jpg b/src/ui/jpg/sinus/sinus1_0062.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0062.jpg
rename to src/ui/jpg/sinus/sinus1_0062.jpg
diff --git a/src/jpg/sinus/sinus1_0063.jpg b/src/ui/jpg/sinus/sinus1_0063.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0063.jpg
rename to src/ui/jpg/sinus/sinus1_0063.jpg
diff --git a/src/jpg/sinus/sinus1_0064.jpg b/src/ui/jpg/sinus/sinus1_0064.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0064.jpg
rename to src/ui/jpg/sinus/sinus1_0064.jpg
diff --git a/src/jpg/sinus/sinus1_0065.jpg b/src/ui/jpg/sinus/sinus1_0065.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0065.jpg
rename to src/ui/jpg/sinus/sinus1_0065.jpg
diff --git a/src/jpg/sinus/sinus1_0066.jpg b/src/ui/jpg/sinus/sinus1_0066.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0066.jpg
rename to src/ui/jpg/sinus/sinus1_0066.jpg
diff --git a/src/jpg/sinus/sinus1_0067.jpg b/src/ui/jpg/sinus/sinus1_0067.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0067.jpg
rename to src/ui/jpg/sinus/sinus1_0067.jpg
diff --git a/src/jpg/sinus/sinus1_0068.jpg b/src/ui/jpg/sinus/sinus1_0068.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0068.jpg
rename to src/ui/jpg/sinus/sinus1_0068.jpg
diff --git a/src/jpg/sinus/sinus1_0069.jpg b/src/ui/jpg/sinus/sinus1_0069.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0069.jpg
rename to src/ui/jpg/sinus/sinus1_0069.jpg
diff --git a/src/jpg/sinus/sinus1_0070.jpg b/src/ui/jpg/sinus/sinus1_0070.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0070.jpg
rename to src/ui/jpg/sinus/sinus1_0070.jpg
diff --git a/src/jpg/sinus/sinus1_0071.jpg b/src/ui/jpg/sinus/sinus1_0071.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0071.jpg
rename to src/ui/jpg/sinus/sinus1_0071.jpg
diff --git a/src/jpg/sinus/sinus1_0072.jpg b/src/ui/jpg/sinus/sinus1_0072.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0072.jpg
rename to src/ui/jpg/sinus/sinus1_0072.jpg
diff --git a/src/jpg/sinus/sinus1_0073.jpg b/src/ui/jpg/sinus/sinus1_0073.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0073.jpg
rename to src/ui/jpg/sinus/sinus1_0073.jpg
diff --git a/src/jpg/sinus/sinus1_0074.jpg b/src/ui/jpg/sinus/sinus1_0074.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0074.jpg
rename to src/ui/jpg/sinus/sinus1_0074.jpg
diff --git a/src/jpg/sinus/sinus1_0075.jpg b/src/ui/jpg/sinus/sinus1_0075.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0075.jpg
rename to src/ui/jpg/sinus/sinus1_0075.jpg
diff --git a/src/jpg/sinus/sinus1_0076.jpg b/src/ui/jpg/sinus/sinus1_0076.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0076.jpg
rename to src/ui/jpg/sinus/sinus1_0076.jpg
diff --git a/src/jpg/sinus/sinus1_0077.jpg b/src/ui/jpg/sinus/sinus1_0077.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0077.jpg
rename to src/ui/jpg/sinus/sinus1_0077.jpg
diff --git a/src/jpg/sinus/sinus1_0078.jpg b/src/ui/jpg/sinus/sinus1_0078.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0078.jpg
rename to src/ui/jpg/sinus/sinus1_0078.jpg
diff --git a/src/jpg/sinus/sinus1_0079.jpg b/src/ui/jpg/sinus/sinus1_0079.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0079.jpg
rename to src/ui/jpg/sinus/sinus1_0079.jpg
diff --git a/src/jpg/sinus/sinus1_0080.jpg b/src/ui/jpg/sinus/sinus1_0080.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0080.jpg
rename to src/ui/jpg/sinus/sinus1_0080.jpg
diff --git a/src/jpg/sinus/sinus1_0081.jpg b/src/ui/jpg/sinus/sinus1_0081.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0081.jpg
rename to src/ui/jpg/sinus/sinus1_0081.jpg
diff --git a/src/jpg/sinus/sinus1_0082.jpg b/src/ui/jpg/sinus/sinus1_0082.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0082.jpg
rename to src/ui/jpg/sinus/sinus1_0082.jpg
diff --git a/src/jpg/sinus/sinus1_0083.jpg b/src/ui/jpg/sinus/sinus1_0083.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0083.jpg
rename to src/ui/jpg/sinus/sinus1_0083.jpg
diff --git a/src/jpg/sinus/sinus1_0084.jpg b/src/ui/jpg/sinus/sinus1_0084.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0084.jpg
rename to src/ui/jpg/sinus/sinus1_0084.jpg
diff --git a/src/jpg/sinus/sinus1_0085.jpg b/src/ui/jpg/sinus/sinus1_0085.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0085.jpg
rename to src/ui/jpg/sinus/sinus1_0085.jpg
diff --git a/src/jpg/sinus/sinus1_0086.jpg b/src/ui/jpg/sinus/sinus1_0086.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0086.jpg
rename to src/ui/jpg/sinus/sinus1_0086.jpg
diff --git a/src/jpg/sinus/sinus1_0087.jpg b/src/ui/jpg/sinus/sinus1_0087.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0087.jpg
rename to src/ui/jpg/sinus/sinus1_0087.jpg
diff --git a/src/jpg/sinus/sinus1_0088.jpg b/src/ui/jpg/sinus/sinus1_0088.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0088.jpg
rename to src/ui/jpg/sinus/sinus1_0088.jpg
diff --git a/src/jpg/sinus/sinus1_0089.jpg b/src/ui/jpg/sinus/sinus1_0089.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0089.jpg
rename to src/ui/jpg/sinus/sinus1_0089.jpg
diff --git a/src/jpg/sinus/sinus1_0090.jpg b/src/ui/jpg/sinus/sinus1_0090.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0090.jpg
rename to src/ui/jpg/sinus/sinus1_0090.jpg
diff --git a/src/jpg/sinus/sinus1_0091.jpg b/src/ui/jpg/sinus/sinus1_0091.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0091.jpg
rename to src/ui/jpg/sinus/sinus1_0091.jpg
diff --git a/src/jpg/sinus/sinus1_0092.jpg b/src/ui/jpg/sinus/sinus1_0092.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0092.jpg
rename to src/ui/jpg/sinus/sinus1_0092.jpg
diff --git a/src/jpg/sinus/sinus1_0093.jpg b/src/ui/jpg/sinus/sinus1_0093.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0093.jpg
rename to src/ui/jpg/sinus/sinus1_0093.jpg
diff --git a/src/jpg/sinus/sinus1_0094.jpg b/src/ui/jpg/sinus/sinus1_0094.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0094.jpg
rename to src/ui/jpg/sinus/sinus1_0094.jpg
diff --git a/src/jpg/sinus/sinus1_0095.jpg b/src/ui/jpg/sinus/sinus1_0095.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0095.jpg
rename to src/ui/jpg/sinus/sinus1_0095.jpg
diff --git a/src/jpg/sinus/sinus1_0096.jpg b/src/ui/jpg/sinus/sinus1_0096.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0096.jpg
rename to src/ui/jpg/sinus/sinus1_0096.jpg
diff --git a/src/jpg/sinus/sinus1_0097.jpg b/src/ui/jpg/sinus/sinus1_0097.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0097.jpg
rename to src/ui/jpg/sinus/sinus1_0097.jpg
diff --git a/src/jpg/sinus/sinus1_0098.jpg b/src/ui/jpg/sinus/sinus1_0098.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0098.jpg
rename to src/ui/jpg/sinus/sinus1_0098.jpg
diff --git a/src/jpg/sinus/sinus1_0099.jpg b/src/ui/jpg/sinus/sinus1_0099.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0099.jpg
rename to src/ui/jpg/sinus/sinus1_0099.jpg
diff --git a/src/jpg/sinus/sinus1_0100.jpg b/src/ui/jpg/sinus/sinus1_0100.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0100.jpg
rename to src/ui/jpg/sinus/sinus1_0100.jpg
diff --git a/src/jpg/sinus/sinus1_0101.jpg b/src/ui/jpg/sinus/sinus1_0101.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0101.jpg
rename to src/ui/jpg/sinus/sinus1_0101.jpg
diff --git a/src/jpg/sinus/sinus1_0102.jpg b/src/ui/jpg/sinus/sinus1_0102.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0102.jpg
rename to src/ui/jpg/sinus/sinus1_0102.jpg
diff --git a/src/jpg/sinus/sinus1_0103.jpg b/src/ui/jpg/sinus/sinus1_0103.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0103.jpg
rename to src/ui/jpg/sinus/sinus1_0103.jpg
diff --git a/src/jpg/sinus/sinus1_0104.jpg b/src/ui/jpg/sinus/sinus1_0104.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0104.jpg
rename to src/ui/jpg/sinus/sinus1_0104.jpg
diff --git a/src/jpg/sinus/sinus1_0105.jpg b/src/ui/jpg/sinus/sinus1_0105.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0105.jpg
rename to src/ui/jpg/sinus/sinus1_0105.jpg
diff --git a/src/jpg/sinus/sinus1_0106.jpg b/src/ui/jpg/sinus/sinus1_0106.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0106.jpg
rename to src/ui/jpg/sinus/sinus1_0106.jpg
diff --git a/src/jpg/sinus/sinus1_0107.jpg b/src/ui/jpg/sinus/sinus1_0107.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0107.jpg
rename to src/ui/jpg/sinus/sinus1_0107.jpg
diff --git a/src/jpg/sinus/sinus1_0108.jpg b/src/ui/jpg/sinus/sinus1_0108.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0108.jpg
rename to src/ui/jpg/sinus/sinus1_0108.jpg
diff --git a/src/jpg/sinus/sinus1_0109.jpg b/src/ui/jpg/sinus/sinus1_0109.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0109.jpg
rename to src/ui/jpg/sinus/sinus1_0109.jpg
diff --git a/src/jpg/sinus/sinus1_0110.jpg b/src/ui/jpg/sinus/sinus1_0110.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0110.jpg
rename to src/ui/jpg/sinus/sinus1_0110.jpg
diff --git a/src/jpg/sinus/sinus1_0111.jpg b/src/ui/jpg/sinus/sinus1_0111.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0111.jpg
rename to src/ui/jpg/sinus/sinus1_0111.jpg
diff --git a/src/jpg/sinus/sinus1_0112.jpg b/src/ui/jpg/sinus/sinus1_0112.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0112.jpg
rename to src/ui/jpg/sinus/sinus1_0112.jpg
diff --git a/src/jpg/sinus/sinus1_0113.jpg b/src/ui/jpg/sinus/sinus1_0113.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0113.jpg
rename to src/ui/jpg/sinus/sinus1_0113.jpg
diff --git a/src/jpg/sinus/sinus1_0114.jpg b/src/ui/jpg/sinus/sinus1_0114.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0114.jpg
rename to src/ui/jpg/sinus/sinus1_0114.jpg
diff --git a/src/jpg/sinus/sinus1_0115.jpg b/src/ui/jpg/sinus/sinus1_0115.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0115.jpg
rename to src/ui/jpg/sinus/sinus1_0115.jpg
diff --git a/src/jpg/sinus/sinus1_0116.jpg b/src/ui/jpg/sinus/sinus1_0116.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0116.jpg
rename to src/ui/jpg/sinus/sinus1_0116.jpg
diff --git a/src/jpg/sinus/sinus1_0117.jpg b/src/ui/jpg/sinus/sinus1_0117.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0117.jpg
rename to src/ui/jpg/sinus/sinus1_0117.jpg
diff --git a/src/jpg/sinus/sinus1_0118.jpg b/src/ui/jpg/sinus/sinus1_0118.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0118.jpg
rename to src/ui/jpg/sinus/sinus1_0118.jpg
diff --git a/src/jpg/sinus/sinus1_0119.jpg b/src/ui/jpg/sinus/sinus1_0119.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0119.jpg
rename to src/ui/jpg/sinus/sinus1_0119.jpg
diff --git a/src/jpg/sinus/sinus1_0120.jpg b/src/ui/jpg/sinus/sinus1_0120.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0120.jpg
rename to src/ui/jpg/sinus/sinus1_0120.jpg
diff --git a/src/jpg/sinus/sinus1_0121.jpg b/src/ui/jpg/sinus/sinus1_0121.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0121.jpg
rename to src/ui/jpg/sinus/sinus1_0121.jpg
diff --git a/src/jpg/sinus/sinus1_0122.jpg b/src/ui/jpg/sinus/sinus1_0122.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0122.jpg
rename to src/ui/jpg/sinus/sinus1_0122.jpg
diff --git a/src/jpg/sinus/sinus1_0123.jpg b/src/ui/jpg/sinus/sinus1_0123.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0123.jpg
rename to src/ui/jpg/sinus/sinus1_0123.jpg
diff --git a/src/jpg/sinus/sinus1_0124.jpg b/src/ui/jpg/sinus/sinus1_0124.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0124.jpg
rename to src/ui/jpg/sinus/sinus1_0124.jpg
diff --git a/src/jpg/sinus/sinus1_0125.jpg b/src/ui/jpg/sinus/sinus1_0125.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0125.jpg
rename to src/ui/jpg/sinus/sinus1_0125.jpg
diff --git a/src/jpg/sinus/sinus1_0126.jpg b/src/ui/jpg/sinus/sinus1_0126.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0126.jpg
rename to src/ui/jpg/sinus/sinus1_0126.jpg
diff --git a/src/jpg/sinus/sinus1_0127.jpg b/src/ui/jpg/sinus/sinus1_0127.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0127.jpg
rename to src/ui/jpg/sinus/sinus1_0127.jpg
diff --git a/src/jpg/sinus/sinus1_0128.jpg b/src/ui/jpg/sinus/sinus1_0128.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0128.jpg
rename to src/ui/jpg/sinus/sinus1_0128.jpg
diff --git a/src/jpg/sinus/sinus1_0129.jpg b/src/ui/jpg/sinus/sinus1_0129.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0129.jpg
rename to src/ui/jpg/sinus/sinus1_0129.jpg
diff --git a/src/jpg/sinus/sinus1_0130.jpg b/src/ui/jpg/sinus/sinus1_0130.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0130.jpg
rename to src/ui/jpg/sinus/sinus1_0130.jpg
diff --git a/src/jpg/sinus/sinus1_0131.jpg b/src/ui/jpg/sinus/sinus1_0131.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0131.jpg
rename to src/ui/jpg/sinus/sinus1_0131.jpg
diff --git a/src/jpg/sinus/sinus1_0132.jpg b/src/ui/jpg/sinus/sinus1_0132.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0132.jpg
rename to src/ui/jpg/sinus/sinus1_0132.jpg
diff --git a/src/jpg/sinus/sinus1_0133.jpg b/src/ui/jpg/sinus/sinus1_0133.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0133.jpg
rename to src/ui/jpg/sinus/sinus1_0133.jpg
diff --git a/src/jpg/sinus/sinus1_0134.jpg b/src/ui/jpg/sinus/sinus1_0134.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0134.jpg
rename to src/ui/jpg/sinus/sinus1_0134.jpg
diff --git a/src/jpg/sinus/sinus1_0135.jpg b/src/ui/jpg/sinus/sinus1_0135.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0135.jpg
rename to src/ui/jpg/sinus/sinus1_0135.jpg
diff --git a/src/jpg/sinus/sinus1_0136.jpg b/src/ui/jpg/sinus/sinus1_0136.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0136.jpg
rename to src/ui/jpg/sinus/sinus1_0136.jpg
diff --git a/src/jpg/sinus/sinus1_0137.jpg b/src/ui/jpg/sinus/sinus1_0137.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0137.jpg
rename to src/ui/jpg/sinus/sinus1_0137.jpg
diff --git a/src/jpg/sinus/sinus1_0138.jpg b/src/ui/jpg/sinus/sinus1_0138.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0138.jpg
rename to src/ui/jpg/sinus/sinus1_0138.jpg
diff --git a/src/jpg/sinus/sinus1_0139.jpg b/src/ui/jpg/sinus/sinus1_0139.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0139.jpg
rename to src/ui/jpg/sinus/sinus1_0139.jpg
diff --git a/src/jpg/sinus/sinus1_0140.jpg b/src/ui/jpg/sinus/sinus1_0140.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0140.jpg
rename to src/ui/jpg/sinus/sinus1_0140.jpg
diff --git a/src/jpg/sinus/sinus1_0141.jpg b/src/ui/jpg/sinus/sinus1_0141.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0141.jpg
rename to src/ui/jpg/sinus/sinus1_0141.jpg
diff --git a/src/jpg/sinus/sinus1_0142.jpg b/src/ui/jpg/sinus/sinus1_0142.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0142.jpg
rename to src/ui/jpg/sinus/sinus1_0142.jpg
diff --git a/src/jpg/sinus/sinus1_0143.jpg b/src/ui/jpg/sinus/sinus1_0143.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0143.jpg
rename to src/ui/jpg/sinus/sinus1_0143.jpg
diff --git a/src/jpg/sinus/sinus1_0144.jpg b/src/ui/jpg/sinus/sinus1_0144.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0144.jpg
rename to src/ui/jpg/sinus/sinus1_0144.jpg
diff --git a/src/jpg/sinus/sinus1_0145.jpg b/src/ui/jpg/sinus/sinus1_0145.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0145.jpg
rename to src/ui/jpg/sinus/sinus1_0145.jpg
diff --git a/src/jpg/sinus/sinus1_0146.jpg b/src/ui/jpg/sinus/sinus1_0146.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0146.jpg
rename to src/ui/jpg/sinus/sinus1_0146.jpg
diff --git a/src/jpg/sinus/sinus1_0147.jpg b/src/ui/jpg/sinus/sinus1_0147.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0147.jpg
rename to src/ui/jpg/sinus/sinus1_0147.jpg
diff --git a/src/jpg/sinus/sinus1_0148.jpg b/src/ui/jpg/sinus/sinus1_0148.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0148.jpg
rename to src/ui/jpg/sinus/sinus1_0148.jpg
diff --git a/src/jpg/sinus/sinus1_0149.jpg b/src/ui/jpg/sinus/sinus1_0149.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0149.jpg
rename to src/ui/jpg/sinus/sinus1_0149.jpg
diff --git a/src/jpg/sinus/sinus1_0150.jpg b/src/ui/jpg/sinus/sinus1_0150.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0150.jpg
rename to src/ui/jpg/sinus/sinus1_0150.jpg
diff --git a/src/jpg/sinus/sinus1_0151.jpg b/src/ui/jpg/sinus/sinus1_0151.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0151.jpg
rename to src/ui/jpg/sinus/sinus1_0151.jpg
diff --git a/src/jpg/sinus/sinus1_0152.jpg b/src/ui/jpg/sinus/sinus1_0152.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0152.jpg
rename to src/ui/jpg/sinus/sinus1_0152.jpg
diff --git a/src/jpg/sinus/sinus1_0153.jpg b/src/ui/jpg/sinus/sinus1_0153.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0153.jpg
rename to src/ui/jpg/sinus/sinus1_0153.jpg
diff --git a/src/jpg/sinus/sinus1_0154.jpg b/src/ui/jpg/sinus/sinus1_0154.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0154.jpg
rename to src/ui/jpg/sinus/sinus1_0154.jpg
diff --git a/src/jpg/sinus/sinus1_0155.jpg b/src/ui/jpg/sinus/sinus1_0155.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0155.jpg
rename to src/ui/jpg/sinus/sinus1_0155.jpg
diff --git a/src/jpg/sinus/sinus1_0156.jpg b/src/ui/jpg/sinus/sinus1_0156.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0156.jpg
rename to src/ui/jpg/sinus/sinus1_0156.jpg
diff --git a/src/jpg/sinus/sinus1_0157.jpg b/src/ui/jpg/sinus/sinus1_0157.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0157.jpg
rename to src/ui/jpg/sinus/sinus1_0157.jpg
diff --git a/src/jpg/sinus/sinus1_0158.jpg b/src/ui/jpg/sinus/sinus1_0158.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0158.jpg
rename to src/ui/jpg/sinus/sinus1_0158.jpg
diff --git a/src/jpg/sinus/sinus1_0159.jpg b/src/ui/jpg/sinus/sinus1_0159.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0159.jpg
rename to src/ui/jpg/sinus/sinus1_0159.jpg
diff --git a/src/jpg/sinus/sinus1_0160.jpg b/src/ui/jpg/sinus/sinus1_0160.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0160.jpg
rename to src/ui/jpg/sinus/sinus1_0160.jpg
diff --git a/src/jpg/sinus/sinus1_0161.jpg b/src/ui/jpg/sinus/sinus1_0161.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0161.jpg
rename to src/ui/jpg/sinus/sinus1_0161.jpg
diff --git a/src/jpg/sinus/sinus1_0162.jpg b/src/ui/jpg/sinus/sinus1_0162.jpg
similarity index 100%
rename from src/jpg/sinus/sinus1_0162.jpg
rename to src/ui/jpg/sinus/sinus1_0162.jpg
diff --git a/src/ui/AdministrationPage.java b/src/ui/loader/AdministrationPage.java
similarity index 85%
rename from src/ui/AdministrationPage.java
rename to src/ui/loader/AdministrationPage.java
index e30b00c1be254fe1c874324f96c59dd1e8c8a9d4..2892bbe970ade384ec6ad8a30a67dcc3e797276f 100644
--- a/src/ui/AdministrationPage.java
+++ b/src/ui/loader/AdministrationPage.java
@@ -1,7 +1,8 @@
-package ui;
+package ui.loader;
 
 
-import fc.Administration;
+import ui.Controller.AdministrationPageController;
+import fc.model.Administration;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -20,7 +21,7 @@ public class AdministrationPage extends Stage {
 
     private void loadFXML() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/AdministrationPage.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/AdministrationPage.fxml"));
             Parent root = loader.load();
             AdministrationPageController controller = loader.getController();
             controller.setAdmin(admin);
diff --git a/src/ui/ConnexionPage.java b/src/ui/loader/ConnexionPage.java
similarity index 84%
rename from src/ui/ConnexionPage.java
rename to src/ui/loader/ConnexionPage.java
index b03271550a0fb0f5b838fec12966acb973c4f8f6..8887692f1c54aeaa659eb26aef825b777054832a 100644
--- a/src/ui/ConnexionPage.java
+++ b/src/ui/loader/ConnexionPage.java
@@ -1,4 +1,4 @@
-package ui;
+package ui.loader;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -11,7 +11,7 @@ public class ConnexionPage extends Application {
     @Override
     public void start(Stage primaryStage) throws Exception {
         // Charger le fichier FXML
-        Parent root = FXMLLoader.load(getClass().getResource("ConnexionPage.fxml"));
+        Parent root = FXMLLoader.load(getClass().getResource("/ui/fxml/connexionPage.fxml"));
         
         // Configurer la scène
         Scene scene = new Scene(root);
diff --git a/src/ui/ManipPage.java b/src/ui/loader/ManipPage.java
similarity index 89%
rename from src/ui/ManipPage.java
rename to src/ui/loader/ManipPage.java
index 46b1ccc8464046abfbb440becb5391926375b8ed..75156c16c8bbb5ea2d1f6bcd50f75231d79ada7c 100644
--- a/src/ui/ManipPage.java
+++ b/src/ui/loader/ManipPage.java
@@ -2,10 +2,10 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package ui;
+package ui.loader;
 
-import fc.Administration;
-import fc.Manipulateur;
+import ui.Controller.ManipController;
+import fc.model.Manipulateur;
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -28,7 +28,7 @@ public class ManipPage extends Stage{
 
     private void loadFXML() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/Manip.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/Manip.fxml"));
             Parent root = loader.load();
             ManipController controller = loader.getController();
             
diff --git a/src/ui/Radio_manip.java b/src/ui/loader/Radio_manip.java
similarity index 89%
rename from src/ui/Radio_manip.java
rename to src/ui/loader/Radio_manip.java
index e846855b094c469b3b7478ffc9ff8fbe52dfb90d..d884477bd1c1bce32f1d57e12312637e37359dd1 100644
--- a/src/ui/Radio_manip.java
+++ b/src/ui/loader/Radio_manip.java
@@ -2,10 +2,10 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package ui;
+package ui.loader;
 
-import fc.Administration;
-import fc.Manipulateur;
+import ui.Controller.ManipController;
+import fc.model.Manipulateur;
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -28,7 +28,7 @@ public class Radio_manip extends Stage{
 
     private void loadFXML() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/Manip.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/Manip.fxml"));
             Parent root = loader.load();
             ManipController controller = loader.getController();
             
diff --git a/src/ui/RadiologuePage.java b/src/ui/loader/RadiologuePage.java
similarity index 89%
rename from src/ui/RadiologuePage.java
rename to src/ui/loader/RadiologuePage.java
index cdaf3cb928c6ee10200389aab2bef461eaba1523..0ce112e4a404c4d2818bf830983ef8aff8db4f3e 100644
--- a/src/ui/RadiologuePage.java
+++ b/src/ui/loader/RadiologuePage.java
@@ -2,9 +2,10 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package ui;
+package ui.loader;
 
-import fc.Radiologue;
+import ui.Controller.RadiologuePageController;
+import fc.model.Radiologue;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -18,7 +19,7 @@ public class RadiologuePage extends Stage {
     }
     private void loadFXML() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/RadiologuePage.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/RadiologuePage.fxml"));
             RadiologuePageController controller = new RadiologuePageController();
             Parent root = loader.load();
             controller.setRadiologue(radiologue); // Initialisation correcte
diff --git a/src/ui/pageExamen.java b/src/ui/loader/pageExamen.java
similarity index 70%
rename from src/ui/pageExamen.java
rename to src/ui/loader/pageExamen.java
index 22d87a879e4f04346b262e04c7fb017b4d2415c7..781e611e29b37f35ac5d370cca5f726024d6c376 100644
--- a/src/ui/pageExamen.java
+++ b/src/ui/loader/pageExamen.java
@@ -1,16 +1,7 @@
-package ui;
+package ui.loader;
 
-import fc.Examen;
-import fc.Utilisateur;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import ui.Controller.PageExamenController;
+import fc.model.Examen;
 import java.io.IOException;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -28,7 +19,7 @@ public class pageExamen extends Stage {
 
     private void loadFXML() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/PageExamen.fxml"));
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/fxml/PageExamen.fxml"));
 
             Parent root = loader.load();
             PageExamenController controller = loader.getController(); // Récupération correcte du contrôleur
diff --git a/src/ui/radiologuepage.css b/src/ui/radiologuepage.css
deleted file mode 100644
index a10957e37bddf9e1dec302342ee21dc052c537c2..0000000000000000000000000000000000000000
--- a/src/ui/radiologuepage.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Empty Stylesheet file.
- */
-
-.mainFxmlClass {
-
-}