diff --git a/.gitignore b/.gitignore
index cbcb14a..d6739fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-infocad.log*
+fiscad.log*
 .idea
 .DS_Store
 target/*
diff --git a/mvnw b/mvnw
index a16b543..4259978 100755
--- a/mvnw
+++ b/mvnw
@@ -51,8 +51,8 @@ cygwin=false;
 darwin=false;
 mingw=false
 case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
+  CYGWIN*) cygwin=true ;
+  MINGW*) mingw=true;
   Darwin*) darwin=true
     # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
     # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
@@ -63,7 +63,7 @@ case "`uname`" in
         export JAVA_HOME="/Library/Java/Home"
       fi
     fi
-    ;;
+    ;
 esac
 
 if [ -z "$JAVA_HOME" ] ; then
@@ -217,7 +217,7 @@ else
       jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;
       esac
     done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
     if [ "$MVNW_VERBOSE" = true ]; then
diff --git a/pom.xml b/pom.xml
index 89da03f..18cfba0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.4</version>
+		<version>3.4.2</version>
 		<relativePath/>
 	</parent>
 	<groupId>io.gmss</groupId>
@@ -40,16 +40,13 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-boot-starter</artifactId>
-			<version>3.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-oas</artifactId>
-			<version>3.0.0</version>
+			<groupId>org.modelmapper</groupId>
+			<artifactId>modelmapper</artifactId>
+			<version>3.1.1</version>
 		</dependency>
+
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt</artifactId>
@@ -88,6 +85,18 @@
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.6.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+
 		<!--Dépendance géométry
 <dependency>
     <groupId>org.locationtech.jts</groupId>
diff --git a/src/main/java/io/gmss/infocad/FiscadApplication.java b/src/main/java/io/gmss/fiscad/FiscadApplication.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/FiscadApplication.java
rename to src/main/java/io/gmss/fiscad/FiscadApplication.java
index 8596a20..1c793dd 100755
--- a/src/main/java/io/gmss/infocad/FiscadApplication.java
+++ b/src/main/java/io/gmss/fiscad/FiscadApplication.java
@@ -1,13 +1,11 @@
-package io.gmss.infocad;
+package io.gmss.fiscad;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import springfox.documentation.oas.annotations.EnableOpenApi;
 
 @SpringBootApplication
-@EnableOpenApi
 @ConfigurationPropertiesScan
 public class FiscadApplication implements CommandLineRunner {
 
diff --git a/src/main/java/io/gmss/infocad/component/DataLoadConfig.java b/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/component/DataLoadConfig.java
rename to src/main/java/io/gmss/fiscad/component/DataLoadConfig.java
index 8edf562..7c84be9 100755
--- a/src/main/java/io/gmss/infocad/component/DataLoadConfig.java
+++ b/src/main/java/io/gmss/fiscad/component/DataLoadConfig.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.component;
+package io.gmss.fiscad.component;
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.repositories.user.RoleRepository;
-import io.gmss.infocad.repositories.user.UserRepository;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.repositories.user.RoleRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java b/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java
new file mode 100644
index 0000000..16ead9c
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java
@@ -0,0 +1,49 @@
+package io.gmss.fiscad.configuration;
+
+import io.gmss.fiscad.security.CustomUserDetailsService;
+import io.gmss.fiscad.security.JwtAuthenticationFilter;
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@RequiredArgsConstructor
+@Configuration
+public class ApplicationConfig {
+
+    private final CustomUserDetailsService customUserDetailsService;
+
+    @Bean
+    public AuthenticationProvider authenticationProvider() {
+        DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+        authProvider.setUserDetailsService(customUserDetailsService);
+        authProvider.setPasswordEncoder(passwordEncoder());
+        return authProvider;
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public JwtAuthenticationFilter jwtAuthenticationFilter() {
+        return new JwtAuthenticationFilter();
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
+        return config.getAuthenticationManager();
+    }
+
+    @Bean
+    public ModelMapper modelMapper() {
+        return new ModelMapper();
+    }
+}
diff --git a/src/main/java/io/gmss/infocad/configuration/AuditConfig.java b/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/configuration/AuditConfig.java
rename to src/main/java/io/gmss/fiscad/configuration/AuditConfig.java
index 9eb1ff1..8fd24eb 100755
--- a/src/main/java/io/gmss/infocad/configuration/AuditConfig.java
+++ b/src/main/java/io/gmss/fiscad/configuration/AuditConfig.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.configuration;
+package io.gmss.fiscad.configuration;
 
 
-import io.gmss.infocad.repositories.user.UserRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.AuditorAware;
diff --git a/src/main/java/io/gmss/infocad/configuration/AuditorAwareImpl.java b/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/configuration/AuditorAwareImpl.java
rename to src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java
index e433d64..3afc8b9 100755
--- a/src/main/java/io/gmss/infocad/configuration/AuditorAwareImpl.java
+++ b/src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.configuration;
+package io.gmss.fiscad.configuration;
 
-import io.gmss.infocad.repositories.user.UserRepository;
-import io.gmss.infocad.security.UserPrincipal;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import io.gmss.fiscad.security.UserPrincipal;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/io/gmss/infocad/configuration/JdbcConfig.java b/src/main/java/io/gmss/fiscad/configuration/JdbcConfig.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/configuration/JdbcConfig.java
rename to src/main/java/io/gmss/fiscad/configuration/JdbcConfig.java
index 3967f37..479765d 100644
--- a/src/main/java/io/gmss/infocad/configuration/JdbcConfig.java
+++ b/src/main/java/io/gmss/fiscad/configuration/JdbcConfig.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.configuration;
+package io.gmss.fiscad.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java b/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java
new file mode 100644
index 0000000..bfbbaf5
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java
@@ -0,0 +1,58 @@
+package io.gmss.fiscad.configuration;
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
+import io.swagger.v3.oas.annotations.info.Contact;
+import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.info.License;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.security.SecurityScheme;
+import io.swagger.v3.oas.annotations.servers.Server;
+
+@OpenAPIDefinition(
+        info = @Info(
+                contact = @Contact(
+                        name = "Novatic",
+                        email = "contact@novatic.org",
+                        url = "https://novatic.org"
+                ),
+                description = "Cette page présente toutes les ressources API pour la gestion des données socio-foncières et fiscales",
+                title = "FISCAD",
+                version = "1.0",
+                license = @License(
+                        name = "Licence name",
+                        url = "https://novatic.org"
+                ),
+                termsOfService = "Terms of service"
+        ),
+        servers = {
+                @Server(
+                        description = "Local ENV",
+                        url = "http://localhost:8282"
+                ),
+                @Server(
+                        description = "PROD ENV (http)",
+                        url = "http://161.97.163.53:20002"
+                ),
+                @Server(
+                        description = "PROD ENV (https)",
+                        url = "https://fiscadbackend.novatic.org"
+                )
+        },
+        security = {
+                @SecurityRequirement(
+                        name = "bearer"
+                )
+        }
+)
+@SecurityScheme(
+        name = "bearer",
+        description = "Authentification Json Web Token",
+        scheme = "Bearer",
+        type = SecuritySchemeType.HTTP,
+        bearerFormat = "JWT",
+        in = SecuritySchemeIn.HEADER
+)
+public class OpenApiConfig {
+}
diff --git a/src/main/java/io/gmss/fiscad/configuration/SpringSecurityConfig.java b/src/main/java/io/gmss/fiscad/configuration/SpringSecurityConfig.java
new file mode 100755
index 0000000..de7d731
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/SpringSecurityConfig.java
@@ -0,0 +1,74 @@
+package io.gmss.fiscad.configuration;
+
+
+import io.gmss.fiscad.security.JwtAuthenticationEntryPoint;
+import io.gmss.fiscad.security.JwtAuthenticationFilter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.cors.CorsConfiguration;
+
+import java.util.Arrays;
+
+import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
+
+@EnableWebSecurity
+@Configuration
+@EnableGlobalMethodSecurity(securedEnabled = true, jsr250Enabled = true, prePostEnabled = true)
+@RequiredArgsConstructor
+public class SpringSecurityConfig {
+    private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
+    private final AuthenticationProvider authenticationProvider;
+    private final JwtAuthenticationFilter jwtAuthenticationFilter;
+
+
+    private static final String[] AUTH_WHITELIST = {
+            "/api/**",
+            "/api/auth/login",
+            "/api/open/**",
+            "/api/synchronisation/references",
+            "/v3/api-docs/**",
+            "/swagger-ui/**",
+            "/swagger-ui.html"
+
+    };
+
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .cors(cors -> cors.configurationSource(request -> {
+                    CorsConfiguration configuration = new CorsConfiguration();
+                    configuration.setAllowedOrigins(Arrays.asList("*"));
+                    configuration.setAllowedMethods(Arrays.asList("*"));
+                    configuration.setAllowedHeaders(Arrays.asList("*"));
+                    return configuration;
+                }))
+                .csrf(AbstractHttpConfigurer::disable)
+//                .csrf(csrf -> {
+//                    csrf.ignoringRequestMatchers("/api/**");
+//                })
+                .authorizeHttpRequests(req ->
+                        req
+                                //.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+                                .requestMatchers(AUTH_WHITELIST).permitAll()
+                                .anyRequest()
+                                .authenticated()
+                )
+                .authenticationProvider(authenticationProvider)
+                .sessionManagement(session -> session.sessionCreationPolicy(STATELESS))
+                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
+                .exceptionHandling(ex -> ex.authenticationEntryPoint(jwtAuthenticationEntryPoint))
+        ;
+
+        return http.build();
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/io/gmss/fiscad/configuration/SwaggerConfig.java b/src/main/java/io/gmss/fiscad/configuration/SwaggerConfig.java
new file mode 100755
index 0000000..1a43566
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/SwaggerConfig.java
@@ -0,0 +1,61 @@
+//package io.gmss.fiscad.configuration;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.service.Contact;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger.web.*;
+//
+//@Configuration
+////@Import(SpringDataRestConfiguration.class)
+//public class SwaggerConfig {
+//    @Bean
+//    public Docket api() {
+//        return new Docket(DocumentationType.OAS_30)
+//                .select()
+//                .apis(RequestHandlerSelectors.basePackage("io.gmss.fiscad.controllers.od"))
+//                .paths(PathSelectors.any()).build().apiInfo(this.getApiInfo());
+////                .securitySchemes(this.securitySchemes())
+////                .securityContexts(Arrays.asList(this.securityContext()));
+//    }
+//
+//
+//
+////    public SecurityContext securityContext() {
+////        AuthorizationScope[] scopes = { new AuthorizationScope("read", "for read operation"),
+////                new AuthorizationScope("write", "for write operation") };
+////        List<SecurityReference> securityReferences = Arrays.asList(new SecurityReference("basicAuth", scopes),
+////                new SecurityReference("Key", scopes), new SecurityReference("Authorization", scopes));
+////        return SecurityContext.builder().securityReferences(securityReferences)
+////                .forPaths(PathSelectors.any())
+////                .build();
+////    }
+//
+////    public List<SecurityScheme> securitySchemes() {
+////        // SecurityScheme basicAuth = new BasicAuth("basicAuth");
+////        SecurityScheme userAuthToken = new ApiKey("Authorization", "Authorization", "header");
+////        //  SecurityScheme keyAuth = new ApiKey("Key", "Key", "header");
+////        return Arrays.asList(
+////                // keyAuth,
+////                userAuthToken
+////                //, basicAuth
+////        );
+////    }
+//
+//    private ApiInfo getApiInfo() {
+//    Contact contact = new Contact("INFOCAD", "https://gmss.com/", "contact@gmss.com");
+//        return new ApiInfoBuilder()
+//                .title("LIST OF API")
+//                .description("This page show all ressources that you could handle to communicate with database via REST API.")
+//                .version("1.0")
+//                .license("INFOCAD v.1.0")
+//                .licenseUrl("https://www.apache.org/licenses/LICENSE-3.0")
+//                .contact(contact)
+//                .build();
+//    }
+//}
diff --git a/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java b/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java
new file mode 100644
index 0000000..e08cf27
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java
@@ -0,0 +1,165 @@
+package io.gmss.fiscad.configuration;
+
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class SwaggerOAS3Config {
+
+    private static final String[] RFU_METIER = {
+            "/api/batiment/**", "/api/caracteristique-caracteristiqueBatiment/**", "/api/caracteristique-parcelle/**",
+            "/api/caracteristique-unite-logement/**", "/api/enquete-batiment/**", "/api/enquete-unite-logement/**",
+            "/api/unite-logement/**"
+    };
+
+    private static final String[] RFU_PARAMETRE = {
+            "/api/campagne/**", "/api/caracteristique/**", "/api/equipe/**", "/api/type-caracteristique/**"
+
+    };
+
+    private static final String[] DECOUPAGE = {
+            "/api/arrondissement/**", "/api/commune/**", "/api/departement/**", "/api/nationalite/**", "/api/quartier/**"
+    };
+
+    private static final String[] INFOCAD_METIER = {
+            //metier
+            "/api/acteur-concerne/**","/api/commentaire/**","/api/enquete/**","/api/tpe/**","/api/upload/**",
+    };
+
+    private static final String[] INFOCAD_PARAMETERS = {
+            "/api/bloc/**","/api/mode-acquisition/**","/api/nature-domaine/**","/api/position-representation/**",
+            "/api/profession/**","/api/situation-geographique/**","/api/situation-matrimoniale/**","/api/source-droit/**",
+            "/api/structure/**","/api/type-contestation/**","/api/type-domaine/**","/api/type-personne/**","/api/type-piece/**",
+            "/api/type-representation/**"
+    };
+
+    private static final String[] NOTIFICATION = {
+            "/api/email/**"
+    };
+
+    private static final String[] RAPPORT = {
+            "/api/rapport/**"
+    };
+
+    private static final String[] STATISTIQUE = {
+            "/api/statistique/**"
+    };
+
+    private static final String[] SYNCHRONISATION = {
+            "/api/synchronisation/**", "/api/restauration/**"
+    };
+
+    private static final String[] USER = {
+            "/api/auth/**", "/api/demande-reinitialisation-mp/**", "/api/role/**", "/api/user/**"
+    };
+
+
+    @Bean
+    public GroupedOpenApi publicApi() {
+        return GroupedOpenApi.builder()
+                .group("ALL")
+                .pathsToMatch("/**")
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi rfuMetierApi() {
+        return GroupedOpenApi.builder()
+                .group("RFU_METIER")
+                .pathsToMatch(RFU_METIER)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi rfuParametreApi() {
+        return GroupedOpenApi.builder()
+                .group("RFU_PARAMETRE")
+                .pathsToMatch(RFU_PARAMETRE)
+                .build();
+    }
+
+
+
+    @Bean
+    public GroupedOpenApi infocadMetierApi() {
+        return GroupedOpenApi.builder()
+                .group("INFOCAD_METIER")
+                .pathsToMatch(INFOCAD_METIER)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi infocadParametreApi() {
+        return GroupedOpenApi.builder()
+                .group("INFOCAD_PARAMETRE")
+                .pathsToMatch(INFOCAD_PARAMETERS)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi decoupageApi() {
+        return GroupedOpenApi.builder()
+                .group("DECOUPAGE")
+                .pathsToMatch(DECOUPAGE)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi notificationApi() {
+        return GroupedOpenApi.builder()
+                .group("NOTIFICATION")
+                .pathsToMatch(NOTIFICATION)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi rapportApi() {
+        return GroupedOpenApi.builder()
+                .group("RAPPORT")
+                .pathsToMatch(RAPPORT)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi statistiqueApi() {
+        return GroupedOpenApi.builder()
+                .group("STATISTIQUE")
+                .pathsToMatch(STATISTIQUE)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi synchronisationApi() {
+        return GroupedOpenApi.builder()
+                .group("SYNCHRONISATION")
+                .pathsToMatch(SYNCHRONISATION)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi userApi() {
+        return GroupedOpenApi.builder()
+                .group("USER")
+                .pathsToMatch(USER)
+                .build();
+    }
+
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+
+        source.registerCorsConfiguration("/v3/api-docs", config);
+        return new CorsFilter(source);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/gmss/fiscad/configuration/WebConfig.java b/src/main/java/io/gmss/fiscad/configuration/WebConfig.java
new file mode 100644
index 0000000..0487e36
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/configuration/WebConfig.java
@@ -0,0 +1,21 @@
+//package io.gmss.fiscad.configuration;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.CorsRegistry;
+//import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//@EnableWebMvc
+//public class WebConfig implements WebMvcConfigurer {
+//
+//    private final long MAX_AGE_SECS = 3600;
+//
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        registry.addMapping("/**")
+//                .allowedOrigins("*")
+//                .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE")
+//                .maxAge(MAX_AGE_SECS);
+//    }
+//}
diff --git a/src/main/java/io/gmss/infocad/controllers/OpenController.java b/src/main/java/io/gmss/fiscad/controllers/OpenController.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/controllers/OpenController.java
rename to src/main/java/io/gmss/fiscad/controllers/OpenController.java
index f48db44..e1d3be1 100755
--- a/src/main/java/io/gmss/infocad/controllers/OpenController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/OpenController.java
@@ -1,15 +1,13 @@
-package io.gmss.infocad.controllers;
+package io.gmss.fiscad.controllers;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
 import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.util.JRSaver;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -18,6 +16,8 @@ import java.io.InputStream;
 
 @RestController
 @RequestMapping(value = "api/open", produces = MediaType.APPLICATION_JSON_VALUE)
+@Tag(name = "Open")
+@CrossOrigin(origins = "*")
 public class OpenController {
 
     @Value("${file.jasper-reports}")
diff --git a/src/main/java/io/gmss/infocad/controllers/decoupage/ArrondissementController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/controllers/decoupage/ArrondissementController.java
rename to src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java
index bcd3732..e392e5b 100644
--- a/src/main/java/io/gmss/infocad/controllers/decoupage/ArrondissementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java
@@ -1,10 +1,14 @@
-package io.gmss.infocad.controllers.decoupage;
+package io.gmss.fiscad.controllers.decoupage;
 
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -13,10 +17,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/arrondissement", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Arrondissement")
+@CrossOrigin(origins = "*")
 public class ArrondissementController {
 
     private final ArrondissementService arrondissementService;
@@ -25,6 +32,13 @@ public class ArrondissementController {
         this.arrondissementService = arrondissementService;
     }
 
+    @Operation(
+            description = "Cette ressource permet de créer un nouvel arrondissement",
+            summary = "Arrondissement",
+            responses = {
+                    @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Success", responseCode = "200"),
+                    @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
+    )
     @PostMapping("/create")
     public ResponseEntity<?> createArrondissement(@RequestBody @Valid @Validated Arrondissement arrondissement)   {
         try{
@@ -41,6 +55,13 @@ public class ArrondissementController {
         }
     }
 
+    @Operation(
+            description = "Cette ressource permet de modifier un arrondissement",
+            summary = "Arrondissement",
+            responses = {
+                    @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Success", responseCode = "200"),
+                    @io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
+    )
     @PutMapping("/update/{id}")
     public ResponseEntity<?> updateArrondissement(@PathVariable Long id, @RequestBody Arrondissement arrondissement) {
         try{
diff --git a/src/main/java/io/gmss/infocad/controllers/decoupage/CommuneController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/decoupage/CommuneController.java
rename to src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java
index 4d03f5e..2599c2c 100644
--- a/src/main/java/io/gmss/infocad/controllers/decoupage/CommuneController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java
@@ -1,10 +1,13 @@
-package io.gmss.infocad.controllers.decoupage;
+package io.gmss.fiscad.controllers.decoupage;
 
 
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.CommuneService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.CommuneService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -13,10 +16,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/commune", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Commune")
+@CrossOrigin(origins = "*")
 public class CommuneController {
 
     private final CommuneService communeService;
diff --git a/src/main/java/io/gmss/infocad/controllers/decoupage/DepartementController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/decoupage/DepartementController.java
rename to src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java
index f3cd1cf..cea7115 100644
--- a/src/main/java/io/gmss/infocad/controllers/decoupage/DepartementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.decoupage;
+package io.gmss.fiscad.controllers.decoupage;
 
 
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.interfaces.decoupage.DepartementService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.interfaces.decoupage.DepartementService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/departement", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Département")
+@CrossOrigin(origins = "*")
 public class DepartementController {
 
     private final DepartementService departementService;
diff --git a/src/main/java/io/gmss/infocad/controllers/decoupage/NationaliteController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/decoupage/NationaliteController.java
rename to src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java
index e247069..1cf55df 100644
--- a/src/main/java/io/gmss/infocad/controllers/decoupage/NationaliteController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.decoupage;
+package io.gmss.fiscad.controllers.decoupage;
 
 
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.interfaces.decoupage.NationaliteService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.interfaces.decoupage.NationaliteService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/nationalite", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Nationalité")
+@CrossOrigin(origins = "*")
 public class NationaliteController {
 
     private final NationaliteService nationaliteService;
diff --git a/src/main/java/io/gmss/infocad/controllers/decoupage/QuartierController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/decoupage/QuartierController.java
rename to src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java
index 7eaa379..4ec66b9 100644
--- a/src/main/java/io/gmss/infocad/controllers/decoupage/QuartierController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java
@@ -1,10 +1,13 @@
-package io.gmss.infocad.controllers.decoupage;
+package io.gmss.fiscad.controllers.decoupage;
 
 
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.QuartierService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.QuartierService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -13,10 +16,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/quartier", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Quartier")
+@CrossOrigin(origins = "*")
 public class QuartierController {
 
     private final QuartierService quartierService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/metier/ActeurConcerneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java
similarity index 65%
rename from src/main/java/io/gmss/infocad/controllers/infocad/metier/ActeurConcerneController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java
index 3213577..643b0cf 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/metier/ActeurConcerneController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java
@@ -1,17 +1,19 @@
-package io.gmss.infocad.controllers.infocad.metier;
+package io.gmss.fiscad.controllers.infocad.metier;
 
-import io.gmss.infocad.interfaces.infocad.metier.ActeurConcerneService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.interfaces.infocad.metier.ActeurConcerneService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "api/acteur-concerne", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Actuer concerné")
+@CrossOrigin(origins = "*")
 public class ActeurConcerneController {
 
     private final ActeurConcerneService acteurConcerneService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/metier/CommentaireController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/controllers/infocad/metier/CommentaireController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java
index f1de439..3fec1bc 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/metier/CommentaireController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java
@@ -1,24 +1,28 @@
-package io.gmss.infocad.controllers.infocad.metier;
+package io.gmss.fiscad.controllers.infocad.metier;
 
 
-import io.gmss.infocad.entities.infocad.metier.Commentaire;
-import io.gmss.infocad.interfaces.infocad.metier.CommentaireService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.request.CommentaireRequest;
-import io.gmss.infocad.paylaods.request.SyncCommentaireRequest;
-import io.swagger.annotations.ApiOperation;
+import io.gmss.fiscad.entities.infocad.metier.Commentaire;
+import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.request.CommentaireRequest;
+import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/commentaire", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Commentaire")
+@CrossOrigin(origins = "*")
 public class CommentaireController {
 
     private final CommentaireService commentaireService;
@@ -109,7 +113,7 @@ public class CommentaireController {
     }
 
     @PostMapping("/enquete-and-state")
-    @ApiOperation(value = "Cette ressource permet d'avoir la liste de tous les commentaires d'une enquête avec le statut (lu ou non lu). Les champs a renseigner pour le payload sont idEnquete et lu")
+    //@ApiOperation(value = "Cette ressource permet d'avoir la liste de tous les commentaires d'une enquête avec le statut (lu ou non lu). Les champs a renseigner pour le payload sont idEnquete et lu")
     public ResponseEntity<?> getcommentaireByEnqueteAndStatut(@RequestBody Commentaire commentaire) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, commentaireService.getCommentairesByEnqueteAndLu(commentaire.getIdEnquete(), commentaire.isLu()), "Liste des commentaires chargée avec succès."),
@@ -118,7 +122,7 @@ public class CommentaireController {
     }
 
     @PostMapping("/all-by-params")
-    @ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
+    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
     public ResponseEntity<?> getcommentaireByParams(@RequestBody CommentaireRequest commentaireRequest) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, commentaireService.getCommentairesByOrigineAndStateReadAndTerminalId(commentaireRequest.getOrigine(), commentaireRequest.isLu(), commentaireRequest.getTerminalId()), "Liste des commentaires chargée avec succès."),
@@ -127,7 +131,7 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/from-mobile")
-    @ApiOperation(value = "Cette ressource permet de synchroniser tous les commentaires effectués sur le mobile vers le backend.")
+    //@ApiOperation(value = "Cette ressource permet de synchroniser tous les commentaires effectués sur le mobile vers le backend.")
     public ResponseEntity<?> synchroniseCommentairesFromMobile(@RequestBody List<Commentaire> commentaires) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, commentaireService.saveAllCommentairesFromMobile(commentaires), "Liste des commentaires synchronisée avec succès."),
@@ -136,7 +140,7 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/from-web")
-    @ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
+    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
     public ResponseEntity<?> synchroniseCommentairesFromWeb(@RequestBody CommentaireRequest commentaireRequest) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, commentaireService.getCommentairesByOrigineAndStateSynchronizedAndTerminalId(commentaireRequest.getOrigine(), commentaireRequest.isSynchronise(), commentaireRequest.getTerminalId()), "Liste des commentaires chargée avec succès."),
@@ -145,7 +149,7 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/notify-done-from-mobile")
-    @ApiOperation(value = "Cette ressource permet matérialiser coté backend les commentaires du WEB déjà synchronisé avec le MOBILE pour que les prochaines extractions ne prennent pas en compte cela. ")
+    //@ApiOperation(value = "Cette ressource permet matérialiser coté backend les commentaires du WEB déjà synchronisé avec le MOBILE pour que les prochaines extractions ne prennent pas en compte cela. ")
     public ResponseEntity<?> notifyDoneSynchronizedFromMobile(@RequestBody List<SyncCommentaireRequest> syncCommentaireRequests) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, commentaireService.notifySynchronizedDoneFromMobile(syncCommentaireRequests), "Synchronisation terminée."),
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/controllers/infocad/metier/EnqueteController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java
index 60d627d..f75f178 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/metier/EnqueteController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java
@@ -1,10 +1,13 @@
-package io.gmss.infocad.controllers.infocad.metier;
+package io.gmss.fiscad.controllers.infocad.metier;
 
-import io.gmss.infocad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.request.EnquetePayLoad;
-import io.gmss.infocad.paylaods.request.EnqueteTraitementPayLoad;
-import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
+import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
+import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
+import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -13,11 +16,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/enquete", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Enquête")
+@CrossOrigin(origins = "*")
 public class EnqueteController {
 
     private final EnqueteService enqueteService ;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/metier/TpeController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/controllers/infocad/metier/TpeController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java
index 75a3694..1abfe29 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/metier/TpeController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.metier;
+package io.gmss.fiscad.controllers.infocad.metier;
 
 
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.interfaces.infocad.metier.TpeService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.interfaces.infocad.metier.TpeService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/tpe", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Tpe")
+@CrossOrigin(origins = "*")
 public class TpeController {
 
     private final TpeService tpeService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/metier/UploadController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/controllers/infocad/metier/UploadController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java
index 633f5ed..ea35e79 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/metier/UploadController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java
@@ -1,12 +1,13 @@
-package io.gmss.infocad.controllers.infocad.metier;
+package io.gmss.fiscad.controllers.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Upload;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.repositories.infocad.metier.UploadRepository;
-import io.gmss.infocad.service.FileStorageService;
-import io.gmss.infocad.service.StringManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
+import io.gmss.fiscad.service.FileStorageService;
+import io.gmss.fiscad.service.StringManager;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
@@ -30,9 +30,10 @@ import java.time.format.DateTimeFormatter;
  */
 @RestController
 @RequestMapping(value = "/api/upload", produces = MediaType.APPLICATION_JSON_VALUE)
-@Api(value = "Uploads controllers", description = "API for accessing to uploads files details.", tags = {"Uploads"})
-@CrossOrigin(origins = "*", maxAge = 3600)
 @Data
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Upload")
+@CrossOrigin(origins = "*")
 public class UploadController {
 
     boolean headIsValid=false;
@@ -73,7 +74,6 @@ public class UploadController {
 
 
     @GetMapping("/all")
-    @ApiOperation(value = "List of uploads files.")
     public ResponseEntity<?> all() {
         try {
             if (uploadRepository.findAll().isEmpty()) {
@@ -117,7 +117,6 @@ public class UploadController {
 
 
     @GetMapping("/id/{id}")
-    @ApiOperation(value = "Get one upload by his id.")
     public ResponseEntity<?> one(@PathVariable Long id) {
 
         try {
@@ -144,8 +143,7 @@ public class UploadController {
      * @param request
      * @return
      */
-    @ApiOperation(value = "This resource is used to download one file from server.")
-    @GetMapping("/downloadFile/{fileName:.+}")
+    @GetMapping("/downloadfile/{fileName:.+}")
     public ResponseEntity<Resource> downloadFile(@PathVariable String fileName, HttpServletRequest request) {
         // Load file as Resource
         Resource resource = fileStorageService.loadFileAsResource(fileName);
@@ -170,7 +168,6 @@ public class UploadController {
     }
 
     @PostMapping("/save")
-    @ApiOperation(value = "Add one upload.")
     public ResponseEntity<?> save(@RequestPart(required = true) MultipartFile file , @RequestParam String reference,@RequestParam String description /*, @RequestParam Long idTypeUpload*/) {
 
         try {
@@ -207,7 +204,6 @@ public class UploadController {
 
 
     @DeleteMapping("/delete/id/{id}")
-    @ApiOperation(value = "Delete one upload.")
     public ResponseEntity<?> delete(@PathVariable Long id) {
         try {
             if (id != null || uploadRepository.findById(id).isPresent()) {
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/BlocController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/BlocController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java
index 0f0147c..0bb75b7 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/BlocController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java
@@ -1,11 +1,14 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.interfaces.infocad.parametre.BlocService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.security.CurrentUser;
-import io.gmss.infocad.security.UserPrincipal;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.interfaces.infocad.parametre.BlocService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.security.CurrentUser;
+import io.gmss.fiscad.security.UserPrincipal;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -14,10 +17,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/bloc", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Bloc")
+@CrossOrigin(origins = "*")
 public class BlocController {
 
     private final BlocService blocService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/ModeAcquisitionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/ModeAcquisitionController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java
index f12eabd..f3fa4cb 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/ModeAcquisitionController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
-import io.gmss.infocad.interfaces.infocad.parametre.ModeAcquisitionService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
+import io.gmss.fiscad.interfaces.infocad.parametre.ModeAcquisitionService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/mode-acquisition", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Mode d'acquisition")
+@CrossOrigin(origins = "*")
 public class ModeAcquisitionController {
 
     private final ModeAcquisitionService modeAcquisitionService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/NatureDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/NatureDomaineController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java
index f14aea6..1a24791 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/NatureDomaineController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.interfaces.infocad.parametre.NatureDomaineService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.interfaces.infocad.parametre.NatureDomaineService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/nature-domaine", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Nature domaine")
+@CrossOrigin(origins = "*")
 public class NatureDomaineController {
 
     private final NatureDomaineService natureDomaineService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/PositionRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/PositionRepresentationController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java
index a2e05a0..380f2a9 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/PositionRepresentationController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.infocad.interfaces.infocad.parametre.PositionRepresentationService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.interfaces.infocad.parametre.PositionRepresentationService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/position-representation", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Position représentation")
+@CrossOrigin(origins = "*")
 public class PositionRepresentationController {
 
     private final PositionRepresentationService positionRepresentationService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/ProfessionController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/ProfessionController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java
index 4be5a10..0a3e8d2 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/ProfessionController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.Profession;
-import io.gmss.infocad.interfaces.infocad.parametre.ProfessionService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Profession;
+import io.gmss.fiscad.interfaces.infocad.parametre.ProfessionService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/profession", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Profession")
+@CrossOrigin(origins = "*")
 public class ProfessionController {
 
     private final ProfessionService professionService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationGeographiqueController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationGeographiqueController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java
index 3181056..a37734d 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationGeographiqueController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
-import io.gmss.infocad.interfaces.infocad.parametre.SituationGeographiqueService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
+import io.gmss.fiscad.interfaces.infocad.parametre.SituationGeographiqueService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/situation-geographique", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Situation géographique")
+@CrossOrigin(origins = "*")
 public class SituationGeographiqueController {
 
     private final SituationGeographiqueService situationGeographiqueService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationMatrimonialeController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationMatrimonialeController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java
index a493716..f73f49d 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationMatrimonialeController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.SituationMatrimoniale;
-import io.gmss.infocad.interfaces.infocad.parametre.SituationMatrimonialeService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale;
+import io.gmss.fiscad.interfaces.infocad.parametre.SituationMatrimonialeService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/situation-matrimoniale", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Situation matrimoniale")
+@CrossOrigin(origins = "*")
 public class SituationMatrimonialeController {
 
     private final SituationMatrimonialeService situationMatrimonialeService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SourceDroitController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/SourceDroitController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java
index a4ebf1f..bfd1437 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/SourceDroitController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
-import io.gmss.infocad.interfaces.infocad.parametre.SourceDroitService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
+import io.gmss.fiscad.interfaces.infocad.parametre.SourceDroitService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/source-droit", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Source de droit")
+@CrossOrigin(origins = "*")
 public class SourceDroitController {
 
     private final SourceDroitService sourceDroitService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/StructureController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/StructureController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java
index 60d90f8..c139589 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/StructureController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java
@@ -1,10 +1,13 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
-import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
+import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -13,10 +16,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/structure", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Structure")
+@CrossOrigin(origins = "*")
 public class StructureController {
 
     private final StructureService structureService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeContestationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeContestationController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java
index ab527bb..5c86085 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeContestationController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeContestationService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeContestationService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/type-contestation", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de contestation")
+@CrossOrigin(origins = "*")
 public class TypeContestationController {
 
     private final TypeContestationService typeContestationService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeDomaineController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeDomaineController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java
index 56b4c41..5cba3f3 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeDomaineController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.TypeDomaine;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeDomaineService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeDomaineService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/type-domaine", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de domaine")
+@CrossOrigin(origins = "*")
 public class TypeDomaineController {
 
     private final TypeDomaineService typeDomaineService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePersonneController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePersonneController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java
index 239d28a..fd0b82f 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePersonneController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.TypePersonne;
-import io.gmss.infocad.interfaces.infocad.parametre.TypePersonneService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.TypePersonne;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypePersonneService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/type-personne", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de personne")
+@CrossOrigin(origins = "*")
 public class TypePersonneController {
 
     private final TypePersonneService typePersonneService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePieceController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePieceController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java
index 3ff58b5..cc9310b 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePieceController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.TypePiece;
-import io.gmss.infocad.interfaces.infocad.parametre.TypePieceService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypePieceService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/type-piece", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de pièce")
+@CrossOrigin(origins = "*")
 public class TypePieceController {
 
     private final TypePieceService typePieceService;
diff --git a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeRepresentationController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeRepresentationController.java
rename to src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java
index 391a028..eff4fdd 100644
--- a/src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeRepresentationController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.infocad.parametre;
+package io.gmss.fiscad.controllers.infocad.parametre;
 
 
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeRepresentationService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeRepresentationService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/type-representation", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de représentation")
+@CrossOrigin(origins = "*")
 public class TypeRepresentationController {
 
     private final TypeRepresentationService typeRepresentationService;
diff --git a/src/main/java/io/gmss/infocad/controllers/notification/EmailController.java b/src/main/java/io/gmss/fiscad/controllers/notification/EmailController.java
similarity index 66%
rename from src/main/java/io/gmss/infocad/controllers/notification/EmailController.java
rename to src/main/java/io/gmss/fiscad/controllers/notification/EmailController.java
index 043db9d..0cbb01c 100644
--- a/src/main/java/io/gmss/infocad/controllers/notification/EmailController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/notification/EmailController.java
@@ -1,15 +1,17 @@
-package io.gmss.infocad.controllers.notification;
+package io.gmss.fiscad.controllers.notification;
 
-import io.gmss.infocad.interfaces.notification.EmailService;
-import io.gmss.infocad.paylaods.EmailDetails;
+import io.gmss.fiscad.interfaces.notification.EmailService;
+import io.gmss.fiscad.paylaods.EmailDetails;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "api/email", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Email")
+@CrossOrigin(origins = "*")
 public class EmailController {
 
     private final EmailService emailService;
diff --git a/src/main/java/io/gmss/infocad/controllers/report/ReportingController.java b/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/controllers/report/ReportingController.java
rename to src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java
index 76ae612..73368cb 100644
--- a/src/main/java/io/gmss/infocad/controllers/report/ReportingController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java
@@ -3,29 +3,30 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package io.gmss.infocad.controllers.report;
+package io.gmss.fiscad.controllers.report;
 
-import io.gmss.infocad.enums.FormatRapport;
-import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.infocad.repositories.infocad.parametre.BlocRepository;
-import io.gmss.infocad.repositories.infocad.parametre.StructureRepository;
-import io.gmss.infocad.service.ReportService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.gmss.fiscad.enums.FormatRapport;
+import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
+import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
+import io.gmss.fiscad.service.ReportService;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author AKAKPO Aurince
  */
 @RestController
 @RequestMapping(value = "/api/rapport", produces = MediaType.APPLICATION_JSON_VALUE)
-@Api(value = "controleur rapport", description = "API d'edition des rapport.", tags = {"Rapports"})
-@CrossOrigin(origins = "*", maxAge = 3600)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Report")
+@CrossOrigin(origins = "*")
 public class ReportingController {
     private final ReportService reportService;
     private final BlocRepository blocRepository;
@@ -40,7 +41,6 @@ public class ReportingController {
 
 
     @GetMapping("/structure/blocs/{formatRapport}/{structureId}")
-    @ApiOperation(value = "Liste des blos d'une structure.")
     public void imprimerBlocsParStructure(HttpServletResponse response, @PathVariable FormatRapport formatRapport, @PathVariable Long structureId) {
         try {
             reportService.imprimerBlocsStructure(response,formatRapport,structureId);
@@ -50,7 +50,6 @@ public class ReportingController {
     }
 
     @GetMapping("/bloc/enquetes/{formatRapport}/{blocId}")
-    @ApiOperation(value = "Liste des zones ou quartiers d'intervention d'une structure.")
     public void imprimerEnqueteParBloc(HttpServletResponse response, @PathVariable FormatRapport formatRapport, @PathVariable Long blocId) {
         try {
             reportService.imprimerEnqueteParBloc(response,formatRapport,blocId);
@@ -60,7 +59,6 @@ public class ReportingController {
     }
 
     @PostMapping("/filtre/enquetes/{formatRapport}")
-    @ApiOperation(value = "Liste des zones ou quartiers d'intervention d'une structure.")
     public void imprimerEnqueteParFiltre(HttpServletResponse response, @RequestBody FiltreEnquetePayLoad filtreEnquetePayLoad, @PathVariable FormatRapport formatRapport) {
         try {
             reportService.imprimerEnqueteParFiltre(response,filtreEnquetePayLoad,formatRapport);
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/BatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/BatimentController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java
index 1fc6570..fcab8ee 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/BatimentController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.Batiment;
-import io.gmss.infocad.interfaces.rfu.metier.BatimentService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.Batiment;
+import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/batiment", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Batiment")
+@CrossOrigin(origins = "*")
 public class BatimentController {
 
     private final BatimentService batimentService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueBatimentController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java
index d69cb93..0ffc26c 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueBatimentController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueBatimentService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/caracteristique-caracteristiqueBatiment", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Caractéristique batiment")
+@CrossOrigin(origins = "*")
 public class CaracteristiqueBatimentController {
 
     private final CaracteristiqueBatimentService caracteristiqueBatimentService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueParcelleController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueParcelleController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java
index 17bd965..8b1e146 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueParcelleController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueParcelleService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/caracteristique-parcelle", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Caractéristique parcelle")
+@CrossOrigin(origins = "*")
 public class CaracteristiqueParcelleController {
 
     private final CaracteristiqueParcelleService caracteristiqueParcelleService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
index 2a9822e..0580044 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/caracteristique-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Caractéristique unité de logement")
+@CrossOrigin(origins = "*")
 public class CaracteristiqueUniteLogementController {
 
     private final CaracteristiqueUniteLogementService caracteristiqueUniteLogementService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteBatimentController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java
index a79fa8d..6f29dea 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteBatimentController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/enquete-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Enquête batiment")
+@CrossOrigin(origins = "*")
 public class EnqueteBatimentController {
 
     private final EnqueteBatimentService enqueteBatimentService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteUniteLogementController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java
index de91284..b1abb8a 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteUniteLogementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.infocad.interfaces.rfu.metier.EnqueteUniteLogementService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/enquete-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Enquête unité de logement")
+@CrossOrigin(origins = "*")
 public class EnqueteUniteLogementController {
 
     private final EnqueteUniteLogementService enqueteUniteLogementService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/metier/UniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/rfu/metier/UniteLogementController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
index 3bfe886..9ee2121 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/metier/UniteLogementController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.metier;
+package io.gmss.fiscad.controllers.rfu.metier;
 
 
-import io.gmss.infocad.entities.rfu.metier.UniteLogement;
-import io.gmss.infocad.interfaces.rfu.metier.UniteLogementService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
+import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Unité de logement")
+@CrossOrigin(origins = "*")
 public class UniteLogementController {
 
     private final UniteLogementService enqueteUniteLogementService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/CampagneController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/controllers/rfu/parametre/CampagneController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java
index e5c87f6..4dd7912 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/CampagneController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java
@@ -1,21 +1,27 @@
-package io.gmss.infocad.controllers.rfu.parametre;
+package io.gmss.fiscad.controllers.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Campagne;
-import io.gmss.infocad.enums.TypeCampagne;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.parametre.CampagneService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.enums.TypeCampagne;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.CampagneService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
-@RequestMapping("api/campagne")
+@RequestMapping(value = "api/campagne", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Campagne")
 public class CampagneController {
 
     private final CampagneService campagneService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/CaracteristiqueController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/rfu/parametre/CaracteristiqueController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java
index 652f027..958b19b 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/CaracteristiqueController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.parametre;
+package io.gmss.fiscad.controllers.rfu.parametre;
 
 
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
-import io.gmss.infocad.interfaces.rfu.parametre.CaracteristiqueService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/caracteristique", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Caractéristique")
 public class CaracteristiqueController {
 
     private final CaracteristiqueService caracteristiqueService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/EquipeController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/controllers/rfu/parametre/EquipeController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java
index 2ed5188..8dd0aa4 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/EquipeController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java
@@ -1,19 +1,25 @@
-package io.gmss.infocad.controllers.rfu.parametre;
+package io.gmss.fiscad.controllers.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Equipe;
-import io.gmss.infocad.interfaces.rfu.parametre.EquipeService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
-@RequestMapping("api/equipe")
+@RequestMapping(value = "api/equipe", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Equipe")
 public class EquipeController {
 
     private final EquipeService equipeService;
diff --git a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/TypeCaracteristiqueController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/rfu/parametre/TypeCaracteristiqueController.java
rename to src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java
index d4956f3..56e0df8 100644
--- a/src/main/java/io/gmss/infocad/controllers/rfu/parametre/TypeCaracteristiqueController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.rfu.parametre;
+package io.gmss.fiscad.controllers.rfu.parametre;
 
 
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
-import io.gmss.infocad.interfaces.rfu.parametre.TypeCaracteristiqueService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.interfaces.rfu.parametre.TypeCaracteristiqueService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/type-caracteristique", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Type de caractéristique")
 public class TypeCaracteristiqueController {
 
     private final TypeCaracteristiqueService typeCaracteristiqueService;
diff --git a/src/main/java/io/gmss/infocad/controllers/statistique/StatistiqueController.java b/src/main/java/io/gmss/fiscad/controllers/statistique/StatistiqueController.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/controllers/statistique/StatistiqueController.java
rename to src/main/java/io/gmss/fiscad/controllers/statistique/StatistiqueController.java
index baaf216..eb4eb2c 100644
--- a/src/main/java/io/gmss/infocad/controllers/statistique/StatistiqueController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/statistique/StatistiqueController.java
@@ -1,17 +1,19 @@
-package io.gmss.infocad.controllers.statistique;
+package io.gmss.fiscad.controllers.statistique;
 
-import io.gmss.infocad.interfaces.statistique.StatistiquesService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "api/statistique", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Statistique")
+@CrossOrigin(origins = "*")
 public class StatistiqueController {
     private final StatistiquesService statistiquesService ;
 
diff --git a/src/main/java/io/gmss/infocad/controllers/synchronisation/RestaurationController.java b/src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/controllers/synchronisation/RestaurationController.java
rename to src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java
index 9ae736d..4af6a83 100644
--- a/src/main/java/io/gmss/infocad/controllers/synchronisation/RestaurationController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java
@@ -1,17 +1,19 @@
-package io.gmss.infocad.controllers.synchronisation;
+package io.gmss.fiscad.controllers.synchronisation;
 
-import io.gmss.infocad.interfaces.synchronisation.RestaurationService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.interfaces.synchronisation.RestaurationService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "api/restauration", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Restauration")
+@CrossOrigin(origins = "*")
 public class RestaurationController {
     public final RestaurationService restaurationService;
 
diff --git a/src/main/java/io/gmss/infocad/controllers/synchronisation/SynchronisationController.java b/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/controllers/synchronisation/SynchronisationController.java
rename to src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java
index 1f3a722..d642ec1 100644
--- a/src/main/java/io/gmss/infocad/controllers/synchronisation/SynchronisationController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java
@@ -1,8 +1,10 @@
-package io.gmss.infocad.controllers.synchronisation;
+package io.gmss.fiscad.controllers.synchronisation;
 
-import io.gmss.infocad.interfaces.synchronisation.SynchronisationService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.request.*;
+import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.request.*;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -13,6 +15,9 @@ import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/synchronisation", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Synchronisation")
+@CrossOrigin(origins = "*")
 public class SynchronisationController {
     private final SynchronisationService synchronisationService;
 
@@ -92,7 +97,9 @@ public class SynchronisationController {
                                        @RequestParam(required=false) Long max_numero_piece_id,
                                        @RequestParam(required=false) Long max_numero_upload_id,
                                        @RequestParam(required=false) Long max_numero_acteur_concerne_id,
-                                       @RequestParam(required=false) Long enqueteId
+                                       @RequestParam(required=false) Long enqueteId,
+                                       @RequestParam(required=false) Long enqueteBatimentId,
+                                       @RequestParam(required=false) Long enqueteUniteLogementId
     ) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, synchronisationService.syncFiles(file,
@@ -106,7 +113,7 @@ public class SynchronisationController {
                         max_numero_piece_id,
                         max_numero_upload_id,
                         max_numero_acteur_concerne_id,
-                        enqueteId), "Liste des fichiers synchronisée avec succès."),
+                        enqueteId, enqueteBatimentId, enqueteUniteLogementId), "Liste des fichiers synchronisée avec succès."),
                 HttpStatus.OK
         );
     }
@@ -158,7 +165,7 @@ public class SynchronisationController {
         );
     }
 
-    @PostMapping(path = "/caracteristique-enquete")
+    @PostMapping(path = "/caracteristique-parcelle")
     public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods) {
         return new ResponseEntity<>(
                 new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(caracteristiqueParcellePaylods), "Liste des caractéristiques des parcelles synchronisée avec succès."),
diff --git a/src/main/java/io/gmss/infocad/controllers/user/AuthController.java b/src/main/java/io/gmss/fiscad/controllers/user/AuthController.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/controllers/user/AuthController.java
rename to src/main/java/io/gmss/fiscad/controllers/user/AuthController.java
index ff0fd19..754bddf 100755
--- a/src/main/java/io/gmss/infocad/controllers/user/AuthController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/user/AuthController.java
@@ -1,30 +1,32 @@
-package io.gmss.infocad.controllers.user;
+package io.gmss.fiscad.controllers.user;
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
-import io.gmss.infocad.interfaces.user.RoleService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.JwtAuthenticationResponse;
-import io.gmss.infocad.paylaods.Login;
-import io.gmss.infocad.paylaods.UserRequest;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
+import io.gmss.fiscad.interfaces.user.RoleService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
+import io.gmss.fiscad.paylaods.Login;
+import io.gmss.fiscad.paylaods.UserRequest;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.HashSet;
 import java.util.Set;
 
 @RestController
 @RequestMapping(value = "api/auth", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Authentification")
+@CrossOrigin(origins = "*")
 public class AuthController {
 
     private final UserService userService;
diff --git a/src/main/java/io/gmss/infocad/controllers/user/DemandeReinitialisationMPController.java b/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/controllers/user/DemandeReinitialisationMPController.java
rename to src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java
index 63cc236..a027afb 100644
--- a/src/main/java/io/gmss/infocad/controllers/user/DemandeReinitialisationMPController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java
@@ -1,16 +1,18 @@
-package io.gmss.infocad.controllers.user;
+package io.gmss.fiscad.controllers.user;
 
 
-import io.gmss.infocad.entities.user.DemandeReinitialisationMP;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.interfaces.user.DemandeReinitialisationMPService;
-import io.gmss.infocad.interfaces.user.RoleService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.DemandeReinitialisationMPResponse;
-import io.gmss.infocad.security.CurrentUser;
-import io.gmss.infocad.security.UserPrincipal;
+import io.gmss.fiscad.entities.user.DemandeReinitialisationMP;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.interfaces.user.DemandeReinitialisationMPService;
+import io.gmss.fiscad.interfaces.user.RoleService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.DemandeReinitialisationMPResponse;
+import io.gmss.fiscad.security.CurrentUser;
+import io.gmss.fiscad.security.UserPrincipal;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -20,6 +22,9 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "api/demande-reinitialisation-mp", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Demande de réinitialisation mot de passe")
+@CrossOrigin(origins = "*")
 public class DemandeReinitialisationMPController {
 
     private final DemandeReinitialisationMPService demandeReinitialisationMPService;
diff --git a/src/main/java/io/gmss/infocad/controllers/user/RoleController.java b/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/controllers/user/RoleController.java
rename to src/main/java/io/gmss/fiscad/controllers/user/RoleController.java
index 610b117..1af7c20 100755
--- a/src/main/java/io/gmss/infocad/controllers/user/RoleController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/user/RoleController.java
@@ -1,9 +1,12 @@
-package io.gmss.infocad.controllers.user;
+package io.gmss.fiscad.controllers.user;
 
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.interfaces.user.RoleService;
-import io.gmss.infocad.paylaods.ApiResponse;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.interfaces.user.RoleService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "api/role", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "Role")
+@CrossOrigin(origins = "*")
 public class RoleController {
 
     private final RoleService roleService;
diff --git a/src/main/java/io/gmss/infocad/controllers/user/UserController.java b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/controllers/user/UserController.java
rename to src/main/java/io/gmss/fiscad/controllers/user/UserController.java
index abfc841..fdb5ed1 100755
--- a/src/main/java/io/gmss/infocad/controllers/user/UserController.java
+++ b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java
@@ -1,23 +1,29 @@
-package io.gmss.infocad.controllers.user;
+package io.gmss.fiscad.controllers.user;
 
 
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.ApiResponse;
-import io.gmss.infocad.paylaods.Login;
-import io.gmss.infocad.security.CurrentUser;
-import io.gmss.infocad.security.UserPrincipal;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.Login;
+import io.gmss.fiscad.security.CurrentUser;
+import io.gmss.fiscad.security.UserPrincipal;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+
 
 @RestController
 @RequestMapping(value = "api/user", produces = MediaType.APPLICATION_JSON_VALUE)
+@SecurityRequirement(name = "bearer")
+@Tag(name = "User")
+@CrossOrigin(origins = "*")
 public class UserController {
 
     private final UserService userService;
diff --git a/src/main/java/io/gmss/infocad/deserializer/LocalDateDeserializer.java b/src/main/java/io/gmss/fiscad/deserializer/LocalDateDeserializer.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/deserializer/LocalDateDeserializer.java
rename to src/main/java/io/gmss/fiscad/deserializer/LocalDateDeserializer.java
index 58a2c08..3144457 100644
--- a/src/main/java/io/gmss/infocad/deserializer/LocalDateDeserializer.java
+++ b/src/main/java/io/gmss/fiscad/deserializer/LocalDateDeserializer.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.deserializer;
+package io.gmss.fiscad.deserializer;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/src/main/java/io/gmss/infocad/deserializer/LocalDateTimeDeserializer.java b/src/main/java/io/gmss/fiscad/deserializer/LocalDateTimeDeserializer.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/deserializer/LocalDateTimeDeserializer.java
rename to src/main/java/io/gmss/fiscad/deserializer/LocalDateTimeDeserializer.java
index 08defff..ecdf261 100644
--- a/src/main/java/io/gmss/infocad/deserializer/LocalDateTimeDeserializer.java
+++ b/src/main/java/io/gmss/fiscad/deserializer/LocalDateTimeDeserializer.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.deserializer;
+package io.gmss.fiscad.deserializer;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/src/main/java/io/gmss/infocad/entities/BaseEntity.java b/src/main/java/io/gmss/fiscad/entities/BaseEntity.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/entities/BaseEntity.java
rename to src/main/java/io/gmss/fiscad/entities/BaseEntity.java
index e46b60f..c92da2b 100755
--- a/src/main/java/io/gmss/infocad/entities/BaseEntity.java
+++ b/src/main/java/io/gmss/fiscad/entities/BaseEntity.java
@@ -1,6 +1,8 @@
-package io.gmss.infocad.entities;
+package io.gmss.fiscad.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.data.annotation.CreatedBy;
@@ -9,8 +11,6 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.EntityListeners;
-import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 import java.time.Instant;
 
diff --git a/src/main/java/io/gmss/infocad/entities/decoupage/Arrondissement.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/decoupage/Arrondissement.java
rename to src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java
index e70fa70..8e1a7d2 100644
--- a/src/main/java/io/gmss/infocad/entities/decoupage/Arrondissement.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.entities.decoupage;
+package io.gmss.fiscad.entities.decoupage;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/decoupage/Commune.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/decoupage/Commune.java
rename to src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java
index 21c2100..b12696b 100644
--- a/src/main/java/io/gmss/infocad/entities/decoupage/Commune.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.entities.decoupage;
+package io.gmss.fiscad.entities.decoupage;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/decoupage/Departement.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/entities/decoupage/Departement.java
rename to src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java
index c09ff35..07d3e64 100644
--- a/src/main/java/io/gmss/infocad/entities/decoupage/Departement.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java
@@ -1,14 +1,14 @@
-package io.gmss.infocad.entities.decoupage;
+package io.gmss.fiscad.entities.decoupage;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/decoupage/Nationalite.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/entities/decoupage/Nationalite.java
rename to src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java
index e5c4f61..39c0e5c 100644
--- a/src/main/java/io/gmss/infocad/entities/decoupage/Nationalite.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.decoupage;
+package io.gmss.fiscad.entities.decoupage;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/decoupage/Quartier.java b/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/entities/decoupage/Quartier.java
rename to src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
index 76e28a6..528b825 100644
--- a/src/main/java/io/gmss/infocad/entities/decoupage/Quartier.java
+++ b/src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
@@ -1,14 +1,15 @@
-package io.gmss.infocad.entities.decoupage;
+package io.gmss.fiscad.entities.decoupage;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
@@ -27,5 +28,8 @@ public class Quartier extends BaseEntity implements Serializable {
     @JsonIgnore
     @ManyToOne
     private Arrondissement arrondissement;
+    @JsonIgnore
+    @OneToOne(mappedBy = "quartier")
+    private Bloc bloc;
 
 }
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/ActeurConcerne.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/ActeurConcerne.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java
index 595394e..768a6ad 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/ActeurConcerne.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java
@@ -1,13 +1,14 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
-import io.gmss.infocad.enums.RoleActeur;
-import io.gmss.infocad.enums.TypeDroit;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.enums.RoleActeur;
+import io.gmss.fiscad.enums.TypeDroit;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +17,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
@@ -63,7 +63,7 @@ public class ActeurConcerne extends BaseEntity implements Serializable {
     private Long blocId;
     @ColumnDefault("0")
     private int haveDeclarant ;
-    private Long max_numero_acteur_concerne_id ;
+    private Long max_numero_acteur_concerne_id;
 
 
 }
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Commentaire.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Commentaire.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Commentaire.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Commentaire.java
index dc1ca28..da9087f 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Commentaire.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Commentaire.java
@@ -1,10 +1,11 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateTimeDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.enums.Origine;
+import io.gmss.fiscad.deserializer.LocalDateTimeDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.enums.Origine;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Enquete.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Enquete.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
index ce50c45..e98e93d 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Enquete.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
@@ -1,30 +1,29 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.infocad.entities.rfu.parametre.Campagne;
-import io.gmss.infocad.entities.rfu.parametre.Equipe;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.StatusEnquete;
-import io.gmss.infocad.enums.StatutEnregistrement;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatutEnregistrement;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Type;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
@@ -76,7 +75,6 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateRejet;
-    @Type(type="text")
     private String descriptionMotifRejet;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
@@ -88,7 +86,6 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateSynchronisation;
     private boolean synchronise;
-    @Type(type="text")
     private String observationParticuliere;
     @Transient
     private String nomPrenomEnqueteur;
@@ -133,12 +130,12 @@ public class Enquete extends BaseEntity implements Serializable {
     private String emplacement;
     private float altitude;
     private float precision;
-    private byte nbreCoProprietaire;
-    private byte nbreIndivisiaire;
+    private int nbreCoProprietaire;
+    private int nbreIndivisiaire;
     private String autreAdresse;
     private String surface;
-    private byte nbreBatiment;
-    private byte nbrePiscine;
+    private int nbreBatiment;
+    private int nbrePiscine;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateDebutExcemption;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/EnqueteFiltreResponse.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/EnqueteFiltreResponse.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/EnqueteFiltreResponse.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/EnqueteFiltreResponse.java
index 0ed5564..5aa0d00 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/EnqueteFiltreResponse.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/EnqueteFiltreResponse.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import java.time.LocalDate;
 @Entity
 @Data
@@ -31,5 +31,7 @@ public class EnqueteFiltreResponse{
     private String typedomaine;
     private String naturedomaine;
     private String nupprovisoire;
+    private String qip;
+    private String numtitrefoncier;
 }
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/MembreGroupe.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/MembreGroupe.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java
index 2d27175..2763fd1 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/MembreGroupe.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java
@@ -1,10 +1,11 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Set;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Parcelle.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Parcelle.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java
index 7bb794e..7596c35 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Parcelle.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java
@@ -1,10 +1,11 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.entities.rfu.metier.Batiment;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.entities.rfu.metier.Batiment;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Piece.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Piece.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java
index 918ef6f..b76266a 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Piece.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java
@@ -1,14 +1,15 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
-import io.gmss.infocad.entities.infocad.parametre.TypePiece;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
+import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +18,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Tpe.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Tpe.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Tpe.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Tpe.java
index a56e24b..d898b30 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Tpe.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Tpe.java
@@ -1,7 +1,8 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/metier/Upload.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java
similarity index 78%
rename from src/main/java/io/gmss/infocad/entities/infocad/metier/Upload.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java
index 2bf1aec..8ea4825 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/metier/Upload.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java
@@ -1,14 +1,14 @@
-package io.gmss.infocad.entities.infocad.metier;
+package io.gmss.fiscad.entities.infocad.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @Entity
@@ -55,7 +55,10 @@ public class Upload extends BaseEntity implements Serializable {
     }
 
     public String getURIFile() {
-        return this.serverContext()+fileName;
+
+        String url = this.serverContext() + fileName;
+        System.out.println("url = " + url);
+        return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null;
     }
 
     private String serverContext(){
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Bloc.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/Bloc.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java
index 56aa602..2a291f6 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Bloc.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java
@@ -1,11 +1,12 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.user.User;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.user.User;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
@@ -38,6 +38,7 @@ public class Bloc extends BaseEntity implements Serializable {
     private Long id;
     @Column(updatable = false)
     private String cote;
+    private String coteq;
     private String nom;
     @JsonIgnore
     private String idBlocParArrondissement;
@@ -52,6 +53,10 @@ public class Bloc extends BaseEntity implements Serializable {
     private Set<Quartier> quartiers;
     @ManyToOne
     private Arrondissement arrondissement;
+
+    @OneToOne
+    private Quartier quartier;
+
     @ManyToOne
     private Structure structure;
     @JsonIgnore
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/ModeAcquisition.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/ModeAcquisition.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java
index 99e69c1..b07bbf7 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/ModeAcquisition.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/NatureDomaine.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/NatureDomaine.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java
index 5cc36a3..532587b 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/NatureDomaine.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Personne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/Personne.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java
index 6a30b1a..6a38610 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Personne.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java
@@ -1,13 +1,14 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.Piece;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.enums.Categorie;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.enums.Categorie;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +17,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/PositionRepresentation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/PositionRepresentation.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java
index 27bda4a..60f91ca 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/PositionRepresentation.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Profession.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/Profession.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java
index 8f02bbe..529f68b 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Profession.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java
@@ -1,7 +1,8 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationGeographique.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationGeographique.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationGeographique.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationGeographique.java
index 2991c4a..cdd7f1a 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationGeographique.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationGeographique.java
@@ -1,6 +1,10 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,10 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationMatrimoniale.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationMatrimoniale.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java
index 5e9de47..0ecb624 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationMatrimoniale.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java
@@ -1,7 +1,8 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroit.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroit.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroit.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroit.java
index b43b4de..83eaa6c 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroit.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroit.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroitExerce.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroitExerce.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroitExerce.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroitExerce.java
index 831ec2a..3a349a1 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroitExerce.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroitExerce.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Set;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Structure.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/Structure.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java
index 5420f13..59a13d5 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/Structure.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.user.User;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.user.User;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeContestation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeContestation.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java
index beb6088..9b560a4 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeContestation.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeDomaine.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeDomaine.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeDomaine.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeDomaine.java
index 7861535..37e8dfd 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeDomaine.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeDomaine.java
@@ -1,7 +1,8 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
+import io.gmss.fiscad.entities.BaseEntity;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePersonne.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePersonne.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java
index d181d78..5401e1c 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePersonne.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.enums.Categorie;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.enums.Categorie;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePiece.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePiece.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePiece.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePiece.java
index 7df8fb0..8b5eec5 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePiece.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePiece.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Piece;
-import io.gmss.infocad.enums.CategoriePiece;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.enums.CategoriePiece;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeRepresentation.java b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeRepresentation.java
rename to src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java
index 5c9f4ef..26da214 100644
--- a/src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeRepresentation.java
+++ b/src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.infocad.parametre;
+package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/Batiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/Batiment.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
index 0de087d..ffa9a53 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/Batiment.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
@@ -1,19 +1,19 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueBatiment.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java
index 4395705..5da42fa 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueBatiment.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueParcelle.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueParcelle.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java
index 8f75f69..b932ba6 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueParcelle.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java
@@ -1,10 +1,11 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueUniteLogement.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java
index 6f41bf4..eecdea3 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueUniteLogement.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java
@@ -1,9 +1,10 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteBatiment.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java
index 5b08f8e..aa3ed1f 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteBatiment.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java
@@ -1,17 +1,17 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.infocad.metier.Upload;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.StatusEnquete;
-import io.gmss.infocad.enums.StatutEnregistrement;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.StatutEnregistrement;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
@@ -46,13 +45,13 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     private String numCompteurSbee;
     private boolean soneb;
     private String numCompteurSoneb;
-    private byte nbreLotUnite;
-    private byte nbreUniteLocation;
+    private int nbreLotUnite;
+    private int nbreUniteLocation;
     private float surfaceLouee;
-    private byte nbreMenage;
-    private byte nbreHabitant;
+    private int nbreMenage;
+    private int nbreHabitant;
     private float valeurMensuelleLocation;
-    private byte nbreMoisLocation;
+    private int nbreMoisLocation;
     private String autreCaracteristiquePhysique;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
@@ -75,8 +74,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @JsonIgnore
     @ManyToOne
     private User user;
-    @Enumerated(EnumType.STRING)
-    private StatusEnquete statusEnquete;
     @JsonIgnore
     @OneToMany(mappedBy = "enqueteBatiment")
     private List<Upload> uploads;
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteUniteLogement.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java
index c005d6a..e5559f4 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteUniteLogement.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java
@@ -1,17 +1,17 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.infocad.metier.Upload;
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.StatusEnquete;
-import io.gmss.infocad.enums.StatutEnregistrement;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.StatutEnregistrement;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
@@ -40,13 +39,13 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private float surface;
-    private byte nbrePiece; //les champs byte sont des integer,
+    private int nbrePiece; //les champs int sont des integer,
     // c'est juste la taille en mémoire que je veux préserver
-    private byte nbreHabitant;
-    private byte nbreMenage;
+    private int nbreHabitant;
+    private int nbreMenage;
     private boolean enLocation;
     private float montantMensuelLoyer;
-    private byte nbreMoisEnLocation;
+    private int nbreMoisEnLocation;
     private float montantLocatifAnnuelDeclare;
     private float surfaceLouee;
     private boolean sbee;
@@ -80,6 +79,4 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @JsonIgnore
     @Enumerated(EnumType.STRING)
     private StatutEnregistrement statutEnregistrement;
-    @Enumerated(EnumType.STRING)
-    private StatusEnquete statusEnquete;
 }
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/metier/UniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/entities/rfu/metier/UniteLogement.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java
index c4a3bd8..7ff2ccc 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/metier/UniteLogement.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.entities.rfu.metier;
+package io.gmss.fiscad.entities.rfu.metier;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Campagne.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/entities/rfu/parametre/Campagne.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java
index 227f35e..97946d1 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Campagne.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java
@@ -1,19 +1,19 @@
-package io.gmss.infocad.entities.rfu.parametre;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.enums.TypeCampagne;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.enums.TypeCampagne;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Caracteristique.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/entities/rfu/parametre/Caracteristique.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java
index f8b7ea2..fc81c6f 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Caracteristique.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java
@@ -1,18 +1,18 @@
-package io.gmss.infocad.entities.rfu.parametre;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
-import io.gmss.infocad.enums.TypeImmeuble;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
+import io.gmss.fiscad.enums.TypeImmeuble;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Equipe.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java
similarity index 78%
rename from src/main/java/io/gmss/infocad/entities/rfu/parametre/Equipe.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java
index 00c7568..d8429f4 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Equipe.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Equipe.java
@@ -1,16 +1,16 @@
-package io.gmss.infocad.entities.rfu.parametre;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Participer.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/entities/rfu/parametre/Participer.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java
index b47d79e..fb4f7a7 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/parametre/Participer.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/Participer.java
@@ -1,17 +1,17 @@
-package io.gmss.infocad.entities.rfu.parametre;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.user.User;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.user.User;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 
diff --git a/src/main/java/io/gmss/infocad/entities/rfu/parametre/TypeCaracteristique.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/entities/rfu/parametre/TypeCaracteristique.java
rename to src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java
index 50a5a43..0bcd2ee 100644
--- a/src/main/java/io/gmss/infocad/entities/rfu/parametre/TypeCaracteristique.java
+++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/TypeCaracteristique.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.entities.rfu.parametre;
+package io.gmss.fiscad.entities.rfu.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.enums.TypeImmeuble;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.enums.TypeImmeuble;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/entities/user/DemandeReinitialisationMP.java b/src/main/java/io/gmss/fiscad/entities/user/DemandeReinitialisationMP.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/entities/user/DemandeReinitialisationMP.java
rename to src/main/java/io/gmss/fiscad/entities/user/DemandeReinitialisationMP.java
index 70dbec7..da7b41c 100644
--- a/src/main/java/io/gmss/infocad/entities/user/DemandeReinitialisationMP.java
+++ b/src/main/java/io/gmss/fiscad/entities/user/DemandeReinitialisationMP.java
@@ -1,7 +1,8 @@
-package io.gmss.infocad.entities.user;
+package io.gmss.fiscad.entities.user;
 
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.enums.EtatDemande;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.enums.EtatDemande;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
diff --git a/src/main/java/io/gmss/infocad/entities/user/Role.java b/src/main/java/io/gmss/fiscad/entities/user/Role.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/entities/user/Role.java
rename to src/main/java/io/gmss/fiscad/entities/user/Role.java
index b8ff590..55edd5a 100755
--- a/src/main/java/io/gmss/infocad/entities/user/Role.java
+++ b/src/main/java/io/gmss/fiscad/entities/user/Role.java
@@ -1,16 +1,16 @@
-package io.gmss.infocad.entities.user;
+package io.gmss.fiscad.entities.user;
 
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.enums.UserRole;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.enums.UserRole;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Objects;
 
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -29,6 +29,7 @@ public class Role extends BaseEntity implements Serializable {
         this.description = description;
     }
 
+    @Override
     public boolean equals(Object o) {
 
         // If the object is compared with itself then return true
@@ -48,4 +49,9 @@ public class Role extends BaseEntity implements Serializable {
         // Compare the data members and return accordingly
         return r.getNom().equals(this.getNom());
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, nom, description);
+    }
 }
diff --git a/src/main/java/io/gmss/infocad/entities/user/User.java b/src/main/java/io/gmss/fiscad/entities/user/User.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/entities/user/User.java
rename to src/main/java/io/gmss/fiscad/entities/user/User.java
index d7e3aeb..f98bdbc 100755
--- a/src/main/java/io/gmss/infocad/entities/user/User.java
+++ b/src/main/java/io/gmss/fiscad/entities/user/User.java
@@ -1,12 +1,13 @@
-package io.gmss.infocad.entities.user;
+package io.gmss.fiscad.entities.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.infocad.entities.BaseEntity;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.rfu.parametre.Participer;
-import io.gmss.infocad.enums.UserRole;
+import io.gmss.fiscad.entities.BaseEntity;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.rfu.parametre.Participer;
+import io.gmss.fiscad.enums.UserRole;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,7 +15,6 @@ import lombok.Setter;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/io/gmss/infocad/enums/Categorie.java b/src/main/java/io/gmss/fiscad/enums/Categorie.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/enums/Categorie.java
rename to src/main/java/io/gmss/fiscad/enums/Categorie.java
index 308e266..b4383fc 100644
--- a/src/main/java/io/gmss/infocad/enums/Categorie.java
+++ b/src/main/java/io/gmss/fiscad/enums/Categorie.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum Categorie {
 
diff --git a/src/main/java/io/gmss/infocad/enums/CategoriePiece.java b/src/main/java/io/gmss/fiscad/enums/CategoriePiece.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/enums/CategoriePiece.java
rename to src/main/java/io/gmss/fiscad/enums/CategoriePiece.java
index 2c070ae..dda918a 100644
--- a/src/main/java/io/gmss/infocad/enums/CategoriePiece.java
+++ b/src/main/java/io/gmss/fiscad/enums/CategoriePiece.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum CategoriePiece {
 
diff --git a/src/main/java/io/gmss/infocad/enums/EtatDemande.java b/src/main/java/io/gmss/fiscad/enums/EtatDemande.java
similarity index 64%
rename from src/main/java/io/gmss/infocad/enums/EtatDemande.java
rename to src/main/java/io/gmss/fiscad/enums/EtatDemande.java
index 3fa7d3a..2f2e194 100644
--- a/src/main/java/io/gmss/infocad/enums/EtatDemande.java
+++ b/src/main/java/io/gmss/fiscad/enums/EtatDemande.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum EtatDemande {
     TRAITE,
diff --git a/src/main/java/io/gmss/infocad/enums/FormatRapport.java b/src/main/java/io/gmss/fiscad/enums/FormatRapport.java
similarity index 61%
rename from src/main/java/io/gmss/infocad/enums/FormatRapport.java
rename to src/main/java/io/gmss/fiscad/enums/FormatRapport.java
index f31194c..1215f93 100644
--- a/src/main/java/io/gmss/infocad/enums/FormatRapport.java
+++ b/src/main/java/io/gmss/fiscad/enums/FormatRapport.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum FormatRapport {
     PDF,
diff --git a/src/main/java/io/gmss/infocad/enums/Origine.java b/src/main/java/io/gmss/fiscad/enums/Origine.java
similarity index 59%
rename from src/main/java/io/gmss/infocad/enums/Origine.java
rename to src/main/java/io/gmss/fiscad/enums/Origine.java
index 16a7344..7ea4edf 100644
--- a/src/main/java/io/gmss/infocad/enums/Origine.java
+++ b/src/main/java/io/gmss/fiscad/enums/Origine.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum Origine {
     WEB,
diff --git a/src/main/java/io/gmss/infocad/enums/PaymentStatus.java b/src/main/java/io/gmss/fiscad/enums/PaymentStatus.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/enums/PaymentStatus.java
rename to src/main/java/io/gmss/fiscad/enums/PaymentStatus.java
index 29410e5..49a8234 100644
--- a/src/main/java/io/gmss/infocad/enums/PaymentStatus.java
+++ b/src/main/java/io/gmss/fiscad/enums/PaymentStatus.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum PaymentStatus {
     SUCCESS,
diff --git a/src/main/java/io/gmss/infocad/enums/RoleActeur.java b/src/main/java/io/gmss/fiscad/enums/RoleActeur.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/enums/RoleActeur.java
rename to src/main/java/io/gmss/fiscad/enums/RoleActeur.java
index 23ec236..6a901e7 100644
--- a/src/main/java/io/gmss/infocad/enums/RoleActeur.java
+++ b/src/main/java/io/gmss/fiscad/enums/RoleActeur.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum RoleActeur {
 
diff --git a/src/main/java/io/gmss/infocad/enums/Sexe.java b/src/main/java/io/gmss/fiscad/enums/Sexe.java
similarity index 60%
rename from src/main/java/io/gmss/infocad/enums/Sexe.java
rename to src/main/java/io/gmss/fiscad/enums/Sexe.java
index e52e68d..cb3484f 100644
--- a/src/main/java/io/gmss/infocad/enums/Sexe.java
+++ b/src/main/java/io/gmss/fiscad/enums/Sexe.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum Sexe {
     MASCULIN,
diff --git a/src/main/java/io/gmss/infocad/enums/StatusEnquete.java b/src/main/java/io/gmss/fiscad/enums/StatusEnquete.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/enums/StatusEnquete.java
rename to src/main/java/io/gmss/fiscad/enums/StatusEnquete.java
index d780aaa..0692e99 100755
--- a/src/main/java/io/gmss/infocad/enums/StatusEnquete.java
+++ b/src/main/java/io/gmss/fiscad/enums/StatusEnquete.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum StatusEnquete {
     EN_COURS,
diff --git a/src/main/java/io/gmss/infocad/enums/StatutEnregistrement.java b/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/enums/StatutEnregistrement.java
rename to src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java
index 0d4715a..38f7881 100644
--- a/src/main/java/io/gmss/infocad/enums/StatutEnregistrement.java
+++ b/src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum StatutEnregistrement {
     NOUVELLE_INSERTION,
diff --git a/src/main/java/io/gmss/infocad/enums/TypeCampagne.java b/src/main/java/io/gmss/fiscad/enums/TypeCampagne.java
similarity index 66%
rename from src/main/java/io/gmss/infocad/enums/TypeCampagne.java
rename to src/main/java/io/gmss/fiscad/enums/TypeCampagne.java
index f2c3d72..9db53f2 100644
--- a/src/main/java/io/gmss/infocad/enums/TypeCampagne.java
+++ b/src/main/java/io/gmss/fiscad/enums/TypeCampagne.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum TypeCampagne {
 
diff --git a/src/main/java/io/gmss/infocad/enums/TypeDroit.java b/src/main/java/io/gmss/fiscad/enums/TypeDroit.java
similarity index 70%
rename from src/main/java/io/gmss/infocad/enums/TypeDroit.java
rename to src/main/java/io/gmss/fiscad/enums/TypeDroit.java
index 48eb87c..5e44804 100644
--- a/src/main/java/io/gmss/infocad/enums/TypeDroit.java
+++ b/src/main/java/io/gmss/fiscad/enums/TypeDroit.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum TypeDroit {
     PROPRIETE,
diff --git a/src/main/java/io/gmss/infocad/enums/TypeImmeuble.java b/src/main/java/io/gmss/fiscad/enums/TypeImmeuble.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/enums/TypeImmeuble.java
rename to src/main/java/io/gmss/fiscad/enums/TypeImmeuble.java
index 59fa937..fc01fdd 100644
--- a/src/main/java/io/gmss/infocad/enums/TypeImmeuble.java
+++ b/src/main/java/io/gmss/fiscad/enums/TypeImmeuble.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum TypeImmeuble {
     PARCELLE,
diff --git a/src/main/java/io/gmss/infocad/enums/UserRole.java b/src/main/java/io/gmss/fiscad/enums/UserRole.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/enums/UserRole.java
rename to src/main/java/io/gmss/fiscad/enums/UserRole.java
index a679f70..35e3191 100644
--- a/src/main/java/io/gmss/infocad/enums/UserRole.java
+++ b/src/main/java/io/gmss/fiscad/enums/UserRole.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.enums;
+package io.gmss.fiscad.enums;
 
 public enum UserRole {
 
diff --git a/src/main/java/io/gmss/infocad/exceptions/BadRequestException.java b/src/main/java/io/gmss/fiscad/exceptions/BadRequestException.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/exceptions/BadRequestException.java
rename to src/main/java/io/gmss/fiscad/exceptions/BadRequestException.java
index d179379..783d3e9 100755
--- a/src/main/java/io/gmss/infocad/exceptions/BadRequestException.java
+++ b/src/main/java/io/gmss/fiscad/exceptions/BadRequestException.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.exceptions;
+package io.gmss.fiscad.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/io/gmss/infocad/exceptions/FileStorageException.java b/src/main/java/io/gmss/fiscad/exceptions/FileStorageException.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/exceptions/FileStorageException.java
rename to src/main/java/io/gmss/fiscad/exceptions/FileStorageException.java
index a3c3a17..02aec19 100644
--- a/src/main/java/io/gmss/infocad/exceptions/FileStorageException.java
+++ b/src/main/java/io/gmss/fiscad/exceptions/FileStorageException.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.exceptions;
+package io.gmss.fiscad.exceptions;
 public class FileStorageException extends RuntimeException {
     public FileStorageException(String message) {
         super(message);
diff --git a/src/main/java/io/gmss/infocad/exceptions/MyFileNotFoundException.java b/src/main/java/io/gmss/fiscad/exceptions/MyFileNotFoundException.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/exceptions/MyFileNotFoundException.java
rename to src/main/java/io/gmss/fiscad/exceptions/MyFileNotFoundException.java
index 48f20b6..ea7d4b2 100644
--- a/src/main/java/io/gmss/infocad/exceptions/MyFileNotFoundException.java
+++ b/src/main/java/io/gmss/fiscad/exceptions/MyFileNotFoundException.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.exceptions;
+package io.gmss.fiscad.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/io/gmss/infocad/exceptions/NotFoundException.java b/src/main/java/io/gmss/fiscad/exceptions/NotFoundException.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/exceptions/NotFoundException.java
rename to src/main/java/io/gmss/fiscad/exceptions/NotFoundException.java
index ff10b7d..2b60b74 100755
--- a/src/main/java/io/gmss/infocad/exceptions/NotFoundException.java
+++ b/src/main/java/io/gmss/fiscad/exceptions/NotFoundException.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.exceptions;
+package io.gmss.fiscad.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/io/gmss/infocad/exceptions/ResourceNotFoundException.java b/src/main/java/io/gmss/fiscad/exceptions/ResourceNotFoundException.java
similarity index 95%
rename from src/main/java/io/gmss/infocad/exceptions/ResourceNotFoundException.java
rename to src/main/java/io/gmss/fiscad/exceptions/ResourceNotFoundException.java
index 4ee8d98..9c25fac 100644
--- a/src/main/java/io/gmss/infocad/exceptions/ResourceNotFoundException.java
+++ b/src/main/java/io/gmss/fiscad/exceptions/ResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.exceptions;
+package io.gmss.fiscad.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/io/gmss/infocad/implementations/decoupage/ArrondissementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/decoupage/ArrondissementServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java
index e73e00b..b7a460c 100644
--- a/src/main/java/io/gmss/infocad/implementations/decoupage/ArrondissementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/ArrondissementServiceImpl.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.implementations.decoupage;
+package io.gmss.fiscad.implementations.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
-import io.gmss.infocad.interfaces.decoupage.CommuneService;
-import io.gmss.infocad.repositories.decoupage.ArrondissementRepository;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
+import io.gmss.fiscad.interfaces.decoupage.CommuneService;
+import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/decoupage/CommuneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/implementations/decoupage/CommuneServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java
index 19f265f..b21526a 100644
--- a/src/main/java/io/gmss/infocad/implementations/decoupage/CommuneServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/CommuneServiceImpl.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.implementations.decoupage;
+package io.gmss.fiscad.implementations.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.CommuneService;
-import io.gmss.infocad.interfaces.decoupage.DepartementService;
-import io.gmss.infocad.repositories.decoupage.CommuneRepository;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.CommuneService;
+import io.gmss.fiscad.interfaces.decoupage.DepartementService;
+import io.gmss.fiscad.repositories.decoupage.CommuneRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/decoupage/DepartementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/decoupage/DepartementServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java
index 07679b7..1a0a3ff 100644
--- a/src/main/java/io/gmss/infocad/implementations/decoupage/DepartementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/DepartementServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.decoupage;
+package io.gmss.fiscad.implementations.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.DepartementService;
-import io.gmss.infocad.repositories.decoupage.DepartementRepository;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.DepartementService;
+import io.gmss.fiscad.repositories.decoupage.DepartementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/decoupage/NationaliteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/decoupage/NationaliteServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java
index 8b7ffad..ed5878e 100644
--- a/src/main/java/io/gmss/infocad/implementations/decoupage/NationaliteServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/NationaliteServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.decoupage;
+package io.gmss.fiscad.implementations.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.NationaliteService;
-import io.gmss.infocad.repositories.decoupage.NationaliteRepository;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.NationaliteService;
+import io.gmss.fiscad.repositories.decoupage.NationaliteRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/decoupage/QuartierServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/decoupage/QuartierServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java
index c406522..915f794 100644
--- a/src/main/java/io/gmss/infocad/implementations/decoupage/QuartierServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/decoupage/QuartierServiceImpl.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.implementations.decoupage;
+package io.gmss.fiscad.implementations.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
-import io.gmss.infocad.interfaces.decoupage.QuartierService;
-import io.gmss.infocad.repositories.decoupage.QuartierRepository;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
+import io.gmss.fiscad.interfaces.decoupage.QuartierService;
+import io.gmss.fiscad.repositories.decoupage.QuartierRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/ActeurConcerneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java
similarity index 64%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/ActeurConcerneServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java
index b7811df..97204bf 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/ActeurConcerneServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ActeurConcerneServiceImpl.java
@@ -1,10 +1,11 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.ActeurConcerneService;
-import io.gmss.infocad.repositories.infocad.metier.ActeurConcerneRepository;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.ActeurConcerneService;
+import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -12,12 +13,13 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Optional;
 @Service
+@RequiredArgsConstructor
 public class ActeurConcerneServiceImpl implements ActeurConcerneService {
     private final ActeurConcerneRepository acteurConcerneRepository;
 
-    public ActeurConcerneServiceImpl(ActeurConcerneRepository acteurConcerneRepository) {
-        this.acteurConcerneRepository = acteurConcerneRepository;
-    }
+//    public ActeurConcerneServiceImpl(ActeurConcerneRepository acteurConcerneRepository) {
+//        this.acteurConcerneRepository = acteurConcerneRepository;
+//    }
 
     @Override
     public ActeurConcerne createActeurConcerne(ActeurConcerne acteurConcerne) throws BadRequestException {
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/CommentaireServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/CommentaireServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java
index 66970a4..acd6693 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/CommentaireServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/CommentaireServiceImpl.java
@@ -1,13 +1,13 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Commentaire;
-import io.gmss.infocad.enums.Origine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.CommentaireService;
-import io.gmss.infocad.paylaods.request.SyncCommentaireRequest;
-import io.gmss.infocad.paylaods.response.CommentaireResponse;
-import io.gmss.infocad.repositories.infocad.metier.CommentaireRepository;
+import io.gmss.fiscad.entities.infocad.metier.Commentaire;
+import io.gmss.fiscad.enums.Origine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService;
+import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest;
+import io.gmss.fiscad.paylaods.response.CommentaireResponse;
+import io.gmss.fiscad.repositories.infocad.metier.CommentaireRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/EnqueteServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/EnqueteServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java
index 4d40c1f..f8a465d 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/EnqueteServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java
@@ -1,42 +1,52 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.EnqueteFiltreResponse;
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.StatusEnquete;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.request.EnquetePayLoad;
-import io.gmss.infocad.paylaods.request.EnqueteTraitementPayLoad;
-import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.infocad.paylaods.response.*;
-import io.gmss.infocad.repositories.decoupage.ArrondissementRepository;
-import io.gmss.infocad.repositories.decoupage.CommuneRepository;
-import io.gmss.infocad.repositories.infocad.metier.ActeurConcerneRepository;
-import io.gmss.infocad.repositories.infocad.metier.EnqueteRepository;
-import io.gmss.infocad.repositories.infocad.metier.ParcelleRepository;
-import io.gmss.infocad.repositories.infocad.parametre.BlocRepository;
-import io.gmss.infocad.repositories.user.UserRepository;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.StatusEnquete;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
+import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
+import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
+import io.gmss.fiscad.paylaods.response.*;
+import io.gmss.fiscad.paylaods.response.FicheResponse.*;
+import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository;
+import io.gmss.fiscad.repositories.decoupage.CommuneRepository;
+import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository;
+import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
+import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository;
+import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository;
+import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 @Service
+@RequiredArgsConstructor
 public class EnqueteServiceImpl implements EnqueteService {
     private Authentication authentication;
     private final EnqueteRepository enqueteRepository;
@@ -47,22 +57,14 @@ public class EnqueteServiceImpl implements EnqueteService {
     private final CommuneRepository communeRepository;
     private final ArrondissementRepository arrondissementRepository;
     private final ActeurConcerneRepository acteurConcerneRepository;
+    private final ModelMapper modelMapper;
+    private final CaracteristiqueParcelleRepository caracteristiqueParcelleRepository;
+    private final EnqueteBatimentRepository enqueteBatimentRepository;
+    private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
 
     @PersistenceContext
     private final EntityManager em;
 
-    public EnqueteServiceImpl(EnqueteRepository enqueteRepository, BlocRepository blocRepository, ParcelleRepository parcelleRepository, UserRepository userRepository, UserService userService, CommuneRepository communeRepository, ArrondissementRepository arrondissementRepository, ActeurConcerneRepository acteurConcerneRepository, EntityManager em) {
-        this.enqueteRepository = enqueteRepository;
-        this.blocRepository = blocRepository;
-        this.parcelleRepository = parcelleRepository;
-        this.userRepository = userRepository;
-        this.userService = userService;
-        this.communeRepository = communeRepository;
-        this.arrondissementRepository = arrondissementRepository;
-        this.acteurConcerneRepository = acteurConcerneRepository;
-        this.em = em;
-    }
-
 
     @Override
     public Enquete createEnquete(EnquetePayLoad enquetePayLoad) throws BadRequestException {
@@ -120,7 +122,9 @@ public class EnqueteServiceImpl implements EnqueteService {
                 " tp.libelle as typePersonne," +
                 " td.libelle as typeDomaine, " +
                 " nd.libelle as natureDomaine, " +
-                " p.nup_provisoire as nupProvisoire " +
+                " p.nup_provisoire as nupProvisoire, " +
+                " p.qip as qip, " +
+                " p.num_titre_foncier as numTitreFoncier " +
                 " from enquete e " +
                 " inner join bloc b on b.id=e.bloc_id " +
                 " inner join arrondissement a on a.id= b.arrondissement_id  " +
@@ -169,18 +173,20 @@ public class EnqueteServiceImpl implements EnqueteService {
             condition+= " AND e.user_id = "+filtreEnquetePayLoad.getEnqueteurId() ;
         }
 
+        if(filtreEnquetePayLoad.getStatutEnquete()!=null){
+            condition+= " AND e.status_enquete = "+filtreEnquetePayLoad.getStatutEnquete() ;
+        }
+
         if(filtreEnquetePayLoad.getLitige()!=null){
             condition+= " AND e.litige is "+filtreEnquetePayLoad.getLitige() ;
         }
 
+
+
         System.out.println(condition);
-        StringBuilder sb=new StringBuilder(sql).append(condition);
-        query = em.createNativeQuery(sb.toString(),EnqueteFiltreResponse.class);
-        List<EnqueteFiltreResponse>  enqueteFiltreResponses=query.getResultList();
-        //       System.out.println((EnqueteFiltreResponse) list.get(0));
-//        List<EnqueteFiltreResponse> enqueteFiltreResponses=list.stream()
-//                .map(item -> item instanceof EnqueteFiltreResponse ? (EnqueteFiltreResponse) item : null)
-//                .collect(Collectors.toList());
+        StringBuilder sb = new StringBuilder(sql).append(condition);
+        query = em.createNativeQuery(sb.toString(), EnqueteFiltreResponse.class);
+        List<EnqueteFiltreResponse> enqueteFiltreResponses = query.getResultList();
 
         return  enqueteFiltreResponses ;
     }
@@ -369,11 +375,51 @@ public class EnqueteServiceImpl implements EnqueteService {
 
     @Override
     public FicheEnqueteResponse getFicheEnquete(Long enqueteId) {
-        Optional<Enquete> optionalEnquete= enqueteRepository.findById(enqueteId);
-        List<ActeurConcerne> acteurConcernes=acteurConcerneRepository.findActeurConcerneByEnqueteId(enqueteId);
-        FicheEnqueteResponse ficheEnqueteResponse = new FicheEnqueteResponse();
-        ficheEnqueteResponse.setEnquete(optionalEnquete.orElse(null));
-        ficheEnqueteResponse.setActeurConcernes(acteurConcernes);
+
+        Optional<Enquete> optionalEnquete = enqueteRepository.findById(enqueteId);
+        List<ActeurConcerne> acteurConcernes = acteurConcerneRepository.findActeurConcerneByEnquete_Id(enqueteId);
+
+        FicheEnqueteResponse ficheEnqueteResponse = new FicheEnqueteResponse(); // payload de réponse global
+
+        FicheEnquetesResponse ficheEnquetesResponse = new FicheEnquetesResponse(); // classe payload de Enquete
+
+        if(optionalEnquete.isPresent()){
+            ficheEnquetesResponse =  modelMapper.map(optionalEnquete.get(), FicheEnquetesResponse.class);
+        }
+
+        List<FicheActeurConcerneResponse> ficheActeurConcerneResponses = new ArrayList<>();
+        if(!acteurConcernes.isEmpty()){
+            acteurConcernes.stream().forEach(acteurConcerne -> ficheActeurConcerneResponses.add(modelMapper.map(acteurConcerne, FicheActeurConcerneResponse.class)));
+        }
+
+        List<CaracteristiqueParcelle> caracteristiqueParcelles = caracteristiqueParcelleRepository.findAllByEnquete_Id(enqueteId);
+
+        List<FicheCaracteristiqueParcelleResponse> caracteristiqueParcelleResponses = new ArrayList<>();
+        if(!caracteristiqueParcelles.isEmpty()){
+            caracteristiqueParcelles.stream().forEach(caracteristiqueParcelle -> caracteristiqueParcelleResponses.add(modelMapper.map(caracteristiqueParcelle, FicheCaracteristiqueParcelleResponse.class)));
+        }
+
+        List<FicheEnqueteBatimentResponse> enqueteBatimentResponses = new ArrayList<>();
+
+        List<EnqueteBatiment> enqueteBatiments = enqueteBatimentRepository.findAllByEnquete_Id(enqueteId);
+        if(!enqueteBatiments.isEmpty()){
+            enqueteBatiments.stream().forEach(enqueteBatiment -> enqueteBatimentResponses.add(modelMapper.map(enqueteBatiment, FicheEnqueteBatimentResponse.class)));
+        }
+
+        List<FicheEnqueteUniteLogementResponse> enqueteUniteLogementResponses = new ArrayList<>();
+
+        List<EnqueteUniteLogement> enqueteUniteLogements = enqueteUniteLogementRepository.findAllByEnquete_Id(enqueteId);
+        if(!enqueteUniteLogements.isEmpty()){
+            enqueteUniteLogements.stream().forEach(enqueteUniteLogement -> enqueteUniteLogementResponses.add(modelMapper.map(enqueteUniteLogement, FicheEnqueteUniteLogementResponse.class)));
+        }
+
+        ficheEnquetesResponse.setCaracteristiquesParcelles(caracteristiqueParcelleResponses);
+        ficheEnquetesResponse.setEnquetesBatiments(enqueteBatimentResponses);
+        ficheEnquetesResponse.setEnquetesUniteLogements(enqueteUniteLogementResponses);
+
+        ficheEnqueteResponse.setEnquete(ficheEnquetesResponse);
+        ficheEnqueteResponse.setActeurConcernes(ficheActeurConcerneResponses);
+
         return ficheEnqueteResponse ;
     }
 
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/ParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/ParcelleServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java
index 0c8ae81..7f88f0a 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/ParcelleServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java
@@ -1,18 +1,18 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.ParcelleService;
-import io.gmss.infocad.paylaods.request.ParcellePayLoad;
-import io.gmss.infocad.repositories.decoupage.QuartierRepository;
-import io.gmss.infocad.repositories.infocad.metier.ParcelleRepository;
-import io.gmss.infocad.repositories.infocad.parametre.NatureDomaineRepository;
-import io.gmss.infocad.repositories.infocad.parametre.SituationGeographiqueRepository;
-import io.gmss.infocad.service.GeometryService;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
+import io.gmss.fiscad.paylaods.request.ParcellePayLoad;
+import io.gmss.fiscad.repositories.decoupage.QuartierRepository;
+import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository;
+import io.gmss.fiscad.service.GeometryService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/PieceServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/PieceServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java
index 0fbb29d..28ea5c0 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/PieceServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Piece;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.PieceService;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/metier/TpeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/metier/TpeServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java
index f868adc..d9a0c14 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/metier/TpeServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/TpeServiceImpl.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.implementations.infocad.metier;
+package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.metier.TpeService;
-import io.gmss.infocad.repositories.infocad.metier.EnqueteRepository;
-import io.gmss.infocad.repositories.infocad.metier.TpeRepository;
-import io.gmss.infocad.service.StringService;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.metier.TpeService;
+import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
+import io.gmss.fiscad.repositories.infocad.metier.TpeRepository;
+import io.gmss.fiscad.service.StringService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/BlocServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/BlocServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java
index bfd615a..d3776eb 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/BlocServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java
@@ -1,15 +1,16 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
-import io.gmss.infocad.interfaces.infocad.parametre.BlocService;
-import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
-import io.gmss.infocad.repositories.infocad.parametre.BlocRepository;
-import io.gmss.infocad.service.StringService;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
+import io.gmss.fiscad.interfaces.infocad.parametre.BlocService;
+import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
+import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.service.StringService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -45,9 +46,21 @@ public class BlocServiceImpl implements BlocService {
             bloc.setCote(getCoteValue(bloc, idBlocParArrondissement, bloc.getStructure().getId()));
         }
 
+        if(bloc.getQuartier() != null){
+            bloc.setCoteq(getCoteQuartierByCoteBloc(bloc.getCote(), bloc.getQuartier()));
+        }
+
         return  blocRepository.save(bloc);
     }
 
+    private String getCoteQuartierByCoteBloc(String cote, Quartier quartier) {
+        if(cote == null) {
+            throw new BadRequestException("Le bloc spécifié ne dispose pas encore de code.");
+        }else{
+            return new StringBuilder().append(cote.substring(0,3)).append(quartier.getCode()).toString();
+        }
+    }
+
     private String getCoteValue(Bloc bloc, String idBlocParArrondissement, Long structure_id) {
         StringBuilder builder = new StringBuilder();
 
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java
index 0911da6..aabd48f 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ModeAcquisitionServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.ModeAcquisitionService;
-import io.gmss.infocad.repositories.infocad.parametre.ModeAcquisitionRepository;
+import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.ModeAcquisitionService;
+import io.gmss.fiscad.repositories.infocad.parametre.ModeAcquisitionRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/NatureDomaineServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/NatureDomaineServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java
index 5695e2f..79e6d7f 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/NatureDomaineServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/NatureDomaineServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.NatureDomaineService;
-import io.gmss.infocad.repositories.infocad.parametre.NatureDomaineRepository;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.NatureDomaineService;
+import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java
index f4fb1e4..aaf9d4d 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/PositionRepresentationServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.PositionRepresentationService;
-import io.gmss.infocad.repositories.infocad.parametre.PositionRepresentationRepository;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.PositionRepresentationService;
+import io.gmss.fiscad.repositories.infocad.parametre.PositionRepresentationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/ProfessionServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/ProfessionServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java
index ae067e2..14244b2 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/ProfessionServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/ProfessionServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Profession;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.ProfessionService;
-import io.gmss.infocad.repositories.infocad.parametre.ProfessionRepository;
+import io.gmss.fiscad.entities.infocad.parametre.Profession;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.ProfessionService;
+import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java
index dddc4bb..e417837 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationGeographiqueServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.SituationGeographiqueService;
-import io.gmss.infocad.repositories.infocad.parametre.SituationGeographiqueRepository;
+import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.SituationGeographiqueService;
+import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java
index b855fbd..8e3c424 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SituationMatrimonialeServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationMatrimoniale;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.SituationMatrimonialeService;
-import io.gmss.infocad.repositories.infocad.parametre.SituationMatrimonialeRepository;
+import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.SituationMatrimonialeService;
+import io.gmss.fiscad.repositories.infocad.parametre.SituationMatrimonialeRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SourceDroitServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/SourceDroitServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java
index ce4f650..b178ded 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/SourceDroitServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/SourceDroitServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.SourceDroitService;
-import io.gmss.infocad.repositories.infocad.parametre.SourceDroitRepository;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.SourceDroitService;
+import io.gmss.fiscad.repositories.infocad.parametre.SourceDroitRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/StructureServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/StructureServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java
index edb6c37..130f81a 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/StructureServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
-import io.gmss.infocad.paylaods.response.StructureResponse;
-import io.gmss.infocad.repositories.infocad.parametre.StructureRepository;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
+import io.gmss.fiscad.paylaods.response.StructureResponse;
+import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeContestationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeContestationServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java
index 98fcdb5..99bc792 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeContestationServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeContestationServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeContestationService;
-import io.gmss.infocad.repositories.infocad.parametre.TypeContestationRepository;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeContestationService;
+import io.gmss.fiscad.repositories.infocad.parametre.TypeContestationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeDomaineServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeDomaineServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java
index fbbbb26..25cf9cb 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeDomaineServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeDomaineServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeDomaine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeDomaineService;
-import io.gmss.infocad.repositories.infocad.parametre.TypeDomaineRepository;
+import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeDomaineService;
+import io.gmss.fiscad.repositories.infocad.parametre.TypeDomaineRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePersonneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePersonneServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java
index 7c884a8..c3fc09e 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePersonneServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePersonneServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePersonne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.TypePersonneService;
-import io.gmss.infocad.repositories.infocad.parametre.TypePersonneRepository;
+import io.gmss.fiscad.entities.infocad.parametre.TypePersonne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypePersonneService;
+import io.gmss.fiscad.repositories.infocad.parametre.TypePersonneRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePieceServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePieceServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java
index 5768f4f..edd6e3e 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypePieceServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypePieceServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePiece;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.TypePieceService;
-import io.gmss.infocad.repositories.infocad.parametre.TypePieceRepository;
+import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypePieceService;
+import io.gmss.fiscad.repositories.infocad.parametre.TypePieceRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java
index 6b3ffae..c66bad7 100644
--- a/src/main/java/io/gmss/infocad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRepresentationServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.infocad.parametre;
+package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.TypeRepresentationService;
-import io.gmss.infocad.repositories.infocad.parametre.TypeRepresentationRepository;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.TypeRepresentationService;
+import io.gmss.fiscad.repositories.infocad.parametre.TypeRepresentationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/notification/EmailServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/notification/EmailServiceImpl.java
similarity index 98%
rename from src/main/java/io/gmss/infocad/implementations/notification/EmailServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/notification/EmailServiceImpl.java
index 1484af2..833b722 100644
--- a/src/main/java/io/gmss/infocad/implementations/notification/EmailServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/notification/EmailServiceImpl.java
@@ -1,15 +1,15 @@
-package io.gmss.infocad.implementations.notification;
+package io.gmss.fiscad.implementations.notification;
 
-import io.gmss.infocad.interfaces.notification.EmailService;
-import io.gmss.infocad.paylaods.EmailDetails;
+import io.gmss.fiscad.interfaces.notification.EmailService;
+import io.gmss.fiscad.paylaods.EmailDetails;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
 import java.io.File;
 
 // Annotation
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/BatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/BatimentServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java
index a9d8615..0896abc 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/BatimentServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.Batiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.BatimentService;
-import io.gmss.infocad.repositories.rfu.metier.BatimentRepository;
+import io.gmss.fiscad.entities.rfu.metier.Batiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
+import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java
index 8c94ae2..7a4ab21 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueBatimentService;
-import io.gmss.infocad.repositories.rfu.metier.CaracteristiqueBatimentRepository;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
+import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueBatimentRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
index f75c37d..45e7c0e 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueParcelleService;
-import io.gmss.infocad.repositories.rfu.metier.CaracteristiqueParcelleRepository;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
+import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
index c208cb9..46bea52 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
-import io.gmss.infocad.repositories.rfu.metier.CaracteristiqueUniteLogementRepository;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
+import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueUniteLogementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
index 5b6fd58..6103200 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
-import io.gmss.infocad.repositories.rfu.metier.EnqueteBatimentRepository;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
+import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
index a844610..9c71983 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.EnqueteUniteLogementService;
-import io.gmss.infocad.repositories.rfu.metier.EnqueteUniteLogementRepository;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
+import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/metier/UniteLogementServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/rfu/metier/UniteLogementServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
index f3876ac..8558847 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/metier/UniteLogementServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/UniteLogementServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.metier;
+package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.UniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.metier.UniteLogementService;
-import io.gmss.infocad.repositories.rfu.metier.UniteLogementRepository;
+import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService;
+import io.gmss.fiscad.repositories.rfu.metier.UniteLogementRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/CampagneServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/implementations/rfu/parametre/CampagneServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java
index 539386a..59d7379 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/CampagneServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CampagneServiceImpl.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.implementations.rfu.parametre;
+package io.gmss.fiscad.implementations.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Campagne;
-import io.gmss.infocad.enums.TypeCampagne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.parametre.CampagneService;
-import io.gmss.infocad.repositories.rfu.parametre.CampagneRepository;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.enums.TypeCampagne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.CampagneService;
+import io.gmss.fiscad.repositories.rfu.parametre.CampagneRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java
index 4f97212..957c9c0 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/CaracteristiqueServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.parametre;
+package io.gmss.fiscad.implementations.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.parametre.CaracteristiqueService;
-import io.gmss.infocad.repositories.rfu.parametre.CaracteristiqueRepository;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService;
+import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/EquipeServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/implementations/rfu/parametre/EquipeServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java
index cb3c978..c998bf3 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/EquipeServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.parametre;
+package io.gmss.fiscad.implementations.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Equipe;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.parametre.EquipeService;
-import io.gmss.infocad.repositories.rfu.parametre.EquipeRepository;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
+import io.gmss.fiscad.repositories.rfu.parametre.EquipeRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java
index 0901258..7964042 100644
--- a/src/main/java/io/gmss/infocad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/rfu/parametre/TypeCaracteristiqueServiceImpl.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.implementations.rfu.parametre;
+package io.gmss.fiscad.implementations.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.rfu.parametre.TypeCaracteristiqueService;
-import io.gmss.infocad.repositories.rfu.parametre.TypeCaracteristiqueRepository;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.rfu.parametre.TypeCaracteristiqueService;
+import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/synchronisation/RestaurationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/implementations/synchronisation/RestaurationServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java
index 9053047..08e065a 100644
--- a/src/main/java/io/gmss/infocad/implementations/synchronisation/RestaurationServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java
@@ -1,13 +1,13 @@
-package io.gmss.infocad.implementations.synchronisation;
+package io.gmss.fiscad.implementations.synchronisation;
 
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.interfaces.synchronisation.RestaurationService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.response.restoration.*;
-import io.gmss.infocad.repositories.infocad.metier.*;
-import io.gmss.infocad.repositories.infocad.parametre.PersonneRepository;
-import io.gmss.infocad.service.FileStorageService;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.interfaces.synchronisation.RestaurationService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.response.restoration.*;
+import io.gmss.fiscad.repositories.infocad.metier.*;
+import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
+import io.gmss.fiscad.service.FileStorageService;
 import org.springframework.core.io.Resource;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -25,7 +25,7 @@ public class RestaurationServiceImpl implements RestaurationService {
     public final MembreGroupeRepository membreGroupeRepository;
     public final PieceRepository pieceRepository;
     public final UploadRepository uploadRepository;
-    private final FileStorageService fileStorageService;;
+    private final FileStorageService fileStorageService;
     private final TpeRepository tpeRepository;
     private final UserService userService;
     private Authentication authentication;
@@ -79,14 +79,14 @@ public class RestaurationServiceImpl implements RestaurationService {
     }
 
     @Override
-    public List<io.gmss.infocad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId) {
+    public List<io.gmss.fiscad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId) {
         List<UploadPayLoad> uploadPayLoads = uploadRepository.getUploadByTerminalId(terminaleId);
 
-        List<io.gmss.infocad.paylaods.request.UploadPayLoad>  uploadPayLoadsOut=new ArrayList<>();
+        List<io.gmss.fiscad.paylaods.request.UploadPayLoad>  uploadPayLoadsOut=new ArrayList<>();
 
         System.out.println(uploadPayLoads.size());
         uploadPayLoads.forEach(uploadPayLoad -> {
-            io.gmss.infocad.paylaods.request.UploadPayLoad uploadPayLoadLocal=new io.gmss.infocad.paylaods.request.UploadPayLoad();
+            io.gmss.fiscad.paylaods.request.UploadPayLoad uploadPayLoadLocal=new io.gmss.fiscad.paylaods.request.UploadPayLoad();
             uploadPayLoadLocal.setTerminalId(uploadPayLoad.getTerminalId());
             String  inputStream= getUploadFile(uploadPayLoad);
             uploadPayLoadLocal.setFileBase64(inputStream);
diff --git a/src/main/java/io/gmss/infocad/implementations/synchronisation/StatistiquesServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/StatistiquesServiceImpl.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/implementations/synchronisation/StatistiquesServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/synchronisation/StatistiquesServiceImpl.java
index 9ada7ba..5edaa69 100644
--- a/src/main/java/io/gmss/infocad/implementations/synchronisation/StatistiquesServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/StatistiquesServiceImpl.java
@@ -1,13 +1,13 @@
-package io.gmss.infocad.implementations.synchronisation;
+package io.gmss.fiscad.implementations.synchronisation;
 
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.interfaces.statistique.StatistiquesService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.response.StatEnqueteAdminDecoupageResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteAdminStructureResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteParBlocResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteParStatutResponse;
-import io.gmss.infocad.repositories.infocad.metier.EnqueteRepository;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.response.StatEnqueteAdminDecoupageResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteAdminStructureResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteParBlocResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteParStatutResponse;
+import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@ public class StatistiquesServiceImpl implements StatistiquesService {
             authentication = SecurityContextHolder.getContext().getAuthentication();
             userName = authentication.getName();
             User user = userService.getUserByUsername(userName);
-            statEnqueteParStatutResponse= user.isAdmin()?enqueteRepository.getStatEnqueteParStatut():enqueteRepository.getStatEnqueteParStatut(user.getId());
+            statEnqueteParStatutResponse= user.isAdmin() ? enqueteRepository.getStatEnqueteParStatut() : enqueteRepository.getStatEnqueteParStatut(user.getId());
             return statEnqueteParStatutResponse;
         }catch (Exception e){
             return new ArrayList<>();
diff --git a/src/main/java/io/gmss/infocad/implementations/synchronisation/SynchronisationServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/implementations/synchronisation/SynchronisationServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java
index c145b0a..8e0ad3c 100644
--- a/src/main/java/io/gmss/infocad/implementations/synchronisation/SynchronisationServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java
@@ -1,29 +1,30 @@
-package io.gmss.infocad.implementations.synchronisation;
+package io.gmss.fiscad.implementations.synchronisation;
 
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.entities.infocad.metier.*;
-import io.gmss.infocad.entities.infocad.parametre.*;
-import io.gmss.infocad.entities.rfu.metier.*;
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.Categorie;
-import io.gmss.infocad.enums.StatusEnquete;
-import io.gmss.infocad.enums.StatutEnregistrement;
-import io.gmss.infocad.interfaces.synchronisation.SynchronisationService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.request.*;
-import io.gmss.infocad.paylaods.response.*;
-import io.gmss.infocad.repositories.decoupage.*;
-import io.gmss.infocad.repositories.infocad.metier.*;
-import io.gmss.infocad.repositories.infocad.parametre.*;
-import io.gmss.infocad.repositories.rfu.metier.*;
-import io.gmss.infocad.repositories.rfu.parametre.CaracteristiqueRepository;
-import io.gmss.infocad.repositories.rfu.parametre.TypeCaracteristiqueRepository;
-import io.gmss.infocad.repositories.user.UserRepository;
-import io.gmss.infocad.service.FileStorageService;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.entities.infocad.metier.*;
+import io.gmss.fiscad.entities.infocad.parametre.*;
+import io.gmss.fiscad.entities.rfu.metier.*;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.Categorie;
+import io.gmss.fiscad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatutEnregistrement;
+import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.request.*;
+import io.gmss.fiscad.paylaods.response.*;
+import io.gmss.fiscad.repositories.decoupage.*;
+import io.gmss.fiscad.repositories.infocad.metier.*;
+import io.gmss.fiscad.repositories.infocad.parametre.*;
+import io.gmss.fiscad.repositories.rfu.metier.*;
+import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository;
+import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import io.gmss.fiscad.service.FileStorageService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -35,6 +36,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
+@RequiredArgsConstructor
 public class SynchronisationServiceImpl implements SynchronisationService {
     private Authentication authentication;
     private final UserService userService;
@@ -80,53 +82,54 @@ public class SynchronisationServiceImpl implements SynchronisationService {
     private final CaracteristiqueParcelleRepository caracteristiqueParcelleRepository;
     private final CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository;
 
-    public SynchronisationServiceImpl(UserService userService, DepartementRepository departementRepository, CommuneRepository communeRepository, ArrondissementRepository arrondissementRepository, QuartierRepository quartierRepository, BlocRepository blocRepository, ModeAcquisitionRepository modeAcquisitionRepository, NationaliteRepository nationaliteRepository, NatureDomaineRepository natureDomaineRepository, PositionRepresentationRepository positionRepresentationRepository, ProfessionRepository professionRepository, SituationMatrimonialeRepository situationMatrimonialeRepository, SourceDroitRepository sourceDroitRepository, StructureRepository structureRepository, TypeContestationRepository typeContestationRepository, TypeDomaineRepository typeDomaineRepository, TypePersonneRepository typePersonneRepository, TypePieceRepository typePieceRepository, TypeRepresentationRepository typeRepresentationRepository, MembreGroupeRepository membreGroupeRepository, PersonneRepository personneRepository, EnqueteRepository enqueteRepository, ParcelleRepository parcelleRepository, UserRepository userRepository, SituationGeographiqueRepository situationGeographiqueRepository, PieceRepository pieceRepository, ActeurConcerneRepository acteurConcerneRepository, UploadRepository uploadRepository, FileStorageService fileStorageService, TpeRepository tpeRepository, BatimentRepository batimentRepository, UniteLogementRepository uniteLogementRepository, CaracteristiqueRepository caracteristiqueRepository, TypeCaracteristiqueRepository typeCaracteristiqueRepository, EnqueteBatimentRepository enqueteBatimentRepository, EnqueteUniteLogementRepository enqueteUniteLogementRepository, CaracteristiqueBatimentRepository caracteristiqueBatimentRepository, CaracteristiqueParcelleRepository caracteristiqueParcelleRepository, CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository) {
-        this.userService = userService;
-        this.departementRepository = departementRepository;
-        this.communeRepository = communeRepository;
-        this.arrondissementRepository = arrondissementRepository;
-        this.quartierRepository = quartierRepository;
-        this.blocRepository = blocRepository;
-        this.modeAcquisitionRepository = modeAcquisitionRepository;
-        this.nationaliteRepository = nationaliteRepository;
-        this.natureDomaineRepository = natureDomaineRepository;
-        this.positionRepresentationRepository = positionRepresentationRepository;
-        this.professionRepository = professionRepository;
-        this.situationMatrimonialeRepository = situationMatrimonialeRepository;
-        this.sourceDroitRepository = sourceDroitRepository;
-        this.structureRepository = structureRepository;
-        this.typeContestationRepository = typeContestationRepository;
-        this.typeDomaineRepository = typeDomaineRepository;
-        this.typePersonneRepository = typePersonneRepository;
-        this.typePieceRepository = typePieceRepository;
-        this.typeRepresentationRepository = typeRepresentationRepository;
-        this.membreGroupeRepository = membreGroupeRepository;
-        this.personneRepository = personneRepository;
-        this.enqueteRepository = enqueteRepository;
-        this.parcelleRepository = parcelleRepository;
-        this.userRepository = userRepository;
-        this.situationGeographiqueRepository = situationGeographiqueRepository;
-        this.pieceRepository = pieceRepository;
-        this.acteurConcerneRepository = acteurConcerneRepository;
-        this.uploadRepository = uploadRepository;
-        this.fileStorageService = fileStorageService;
-        this.tpeRepository = tpeRepository;
-        this.batimentRepository = batimentRepository;
-        this.uniteLogementRepository = uniteLogementRepository;
-        this.caracteristiqueRepository = caracteristiqueRepository;
-        this.typeCaracteristiqueRepository = typeCaracteristiqueRepository;
-        this.enqueteBatimentRepository = enqueteBatimentRepository;
-        this.enqueteUniteLogementRepository = enqueteUniteLogementRepository;
-        this.caracteristiqueBatimentRepository = caracteristiqueBatimentRepository;
-        this.caracteristiqueParcelleRepository = caracteristiqueParcelleRepository;
-        this.caracteristiqueUniteLogementRepository = caracteristiqueUniteLogementRepository;
-    }
+//    public SynchronisationServiceImpl(UserService userService, DepartementRepository departementRepository, CommuneRepository communeRepository, ArrondissementRepository arrondissementRepository, QuartierRepository quartierRepository, BlocRepository blocRepository, ModeAcquisitionRepository modeAcquisitionRepository, NationaliteRepository nationaliteRepository, NatureDomaineRepository natureDomaineRepository, PositionRepresentationRepository positionRepresentationRepository, ProfessionRepository professionRepository, SituationMatrimonialeRepository situationMatrimonialeRepository, SourceDroitRepository sourceDroitRepository, StructureRepository structureRepository, TypeContestationRepository typeContestationRepository, TypeDomaineRepository typeDomaineRepository, TypePersonneRepository typePersonneRepository, TypePieceRepository typePieceRepository, TypeRepresentationRepository typeRepresentationRepository, MembreGroupeRepository membreGroupeRepository, PersonneRepository personneRepository, EnqueteRepository enqueteRepository, ParcelleRepository parcelleRepository, UserRepository userRepository, SituationGeographiqueRepository situationGeographiqueRepository, PieceRepository pieceRepository, ActeurConcerneRepository acteurConcerneRepository, UploadRepository uploadRepository, FileStorageService fileStorageService, TpeRepository tpeRepository, BatimentRepository batimentRepository, UniteLogementRepository uniteLogementRepository, CaracteristiqueRepository caracteristiqueRepository, TypeCaracteristiqueRepository typeCaracteristiqueRepository, EnqueteBatimentRepository enqueteBatimentRepository, EnqueteUniteLogementRepository enqueteUniteLogementRepository, CaracteristiqueBatimentRepository caracteristiqueBatimentRepository, CaracteristiqueParcelleRepository caracteristiqueParcelleRepository, CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository) {
+//        this.userService = userService;
+//        this.departementRepository = departementRepository;
+//        this.communeRepository = communeRepository;
+//        this.arrondissementRepository = arrondissementRepository;
+//        this.quartierRepository = quartierRepository;
+//        this.blocRepository = blocRepository;
+//        this.modeAcquisitionRepository = modeAcquisitionRepository;
+//        this.nationaliteRepository = nationaliteRepository;
+//        this.natureDomaineRepository = natureDomaineRepository;
+//        this.positionRepresentationRepository = positionRepresentationRepository;
+//        this.professionRepository = professionRepository;
+//        this.situationMatrimonialeRepository = situationMatrimonialeRepository;
+//        this.sourceDroitRepository = sourceDroitRepository;
+//        this.structureRepository = structureRepository;
+//        this.typeContestationRepository = typeContestationRepository;
+//        this.typeDomaineRepository = typeDomaineRepository;
+//        this.typePersonneRepository = typePersonneRepository;
+//        this.typePieceRepository = typePieceRepository;
+//        this.typeRepresentationRepository = typeRepresentationRepository;
+//        this.membreGroupeRepository = membreGroupeRepository;
+//        this.personneRepository = personneRepository;
+//        this.enqueteRepository = enqueteRepository;
+//        this.parcelleRepository = parcelleRepository;
+//        this.userRepository = userRepository;
+//        this.situationGeographiqueRepository = situationGeographiqueRepository;
+//        this.pieceRepository = pieceRepository;
+//        this.acteurConcerneRepository = acteurConcerneRepository;
+//        this.uploadRepository = uploadRepository;
+//        this.fileStorageService = fileStorageService;
+//        this.tpeRepository = tpeRepository;
+//        this.batimentRepository = batimentRepository;
+//        this.uniteLogementRepository = uniteLogementRepository;
+//        this.caracteristiqueRepository = caracteristiqueRepository;
+//        this.typeCaracteristiqueRepository = typeCaracteristiqueRepository;
+//        this.enqueteBatimentRepository = enqueteBatimentRepository;
+//        this.enqueteUniteLogementRepository = enqueteUniteLogementRepository;
+//        this.caracteristiqueBatimentRepository = caracteristiqueBatimentRepository;
+//        this.caracteristiqueParcelleRepository = caracteristiqueParcelleRepository;
+//        this.caracteristiqueUniteLogementRepository = caracteristiqueUniteLogementRepository;
+//    }
 
 
     @Override
     public UserDecoupageSyncResponses getDecoupageAdminUserConnecter() {
         authentication = SecurityContextHolder.getContext().getAuthentication();
         String userName = authentication.getName();
+
         User user = userService.getUserByUsername(userName);
         List<DepartementSyncResponse> departementSyncResponses =
                 departementRepository.getDepartementResponse();
@@ -280,6 +283,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 System.out.println(syncResponse);
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(personnePayLoad.getIdBackend(),
                         personnePayLoad.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -437,6 +441,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(membreGroupePayLoad.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(membreGroupePayLoad.getIdBackend(),
                         membreGroupePayLoad.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -489,7 +494,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             return syncResponses;
         }
         enquetePayLoads.forEach(enquetePayLoad -> {
-            System.out.println("enquetePayLoad = " + enquetePayLoad);
             try {
                 if (enquetePayLoad.getTerminalId() == null) {
                     SyncResponse syncResponse = new SyncResponse(enquetePayLoad.getIdBackend(),
@@ -571,8 +575,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                         }
                     }
                 } else {
-                    // TODO: 19/01/2025 Est-il  nécessaire des rechercher les lignes de la table enquete ayant meme [externalKey, terminalId, parcelleId] ?
-                    // TODO: 19/01/2025 Si oui, que faire ? 
                     enquete = getEnqueteFromEnquetePayLoad(enquete, enquetePayLoad);
                     enquete.setStatutEnregistrement(StatutEnregistrement.NOUVELLE_INSERTION);
                     enquete = enqueteRepository.save(enquete);
@@ -585,6 +587,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(enquetePayLoad.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(enquetePayLoad.getIdBackend(),
                         enquetePayLoad.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -633,7 +636,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             enquete.setTerminal(optionalTpe.orElse(null));
         }
 
-        enquete.setStatusEnquete(StatusEnquete.SYNCHRONISE);
+        enquete.setStatusEnquete(enquetePayLoad.getStatusEnquete());
         enquete.setLitige(enquetePayLoad.isLitige());
         enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere());
         enquete.setDateEnquete(enquetePayLoad.getDateEnquete());
@@ -723,13 +726,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
 
     private CaracteristiqueUniteLogement getCaracteristiqueUniteLogementFromCaracteristiqueUniteLogementPayLoad(CaracteristiqueUniteLogement caracteristiqueUniteLogement, CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod) {
 
-
-        // TODO: 15/01/2025 A revoir si garder le commentaire
-//        if (batimentPaylaod.getUserId() != null) {
-//            Optional<User> optionalUser = userRepository.findById(batimentPaylaod.getUserId());
-//            batiment.setUser(optionalUser.orElse(null));
-//        }
-
         if (caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId() != null) {
             Optional<EnqueteUniteLogement> optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueUniteLogementPaylod.getEnqueteUniteLogementId(), caracteristiqueUniteLogementPaylod.getTerminalId());
             caracteristiqueUniteLogement.setEnqueteUniteLogement(optionalEnqueteUniteLogement.orElse(null));
@@ -740,14 +736,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             caracteristiqueUniteLogement.setCaracteristique(optionalCaracteristique.orElse(null));
         }
 
-        // TODO: 15/01/2025 Est-il nécessaire de mettre le terminal qui a fait cette synchronisation ? Vu que les enquetes du batiment
-        // TODO : sont déjà fait par un TPE qui doit être le même que celui-ci
-
-//        if (caracteristiqueBatimentPaylod.getTerminalId() != null) {
-//            Optional<Tpe> optionalTpe = tpeRepository.findById(caracteristiqueBatimentPaylod.getTerminalId());
-//            caracteristiqueBatiment.sett(optionalTpe.orElse(null));
-//        }
-
         caracteristiqueUniteLogement.setValeur(caracteristiqueUniteLogementPaylod.getValeur());
         caracteristiqueUniteLogement.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey());
         return caracteristiqueUniteLogement;
@@ -758,12 +746,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
     private CaracteristiqueBatiment getCaracteristiqueBatimentFromCaracteristiqueBatimentPayLoad(CaracteristiqueBatiment caracteristiqueBatiment, CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod) {
 
 
-        // TODO: 15/01/2025 A revoir si garder le commentaire
-//        if (batimentPaylaod.getUserId() != null) {
-//            Optional<User> optionalUser = userRepository.findById(batimentPaylaod.getUserId());
-//            batiment.setUser(optionalUser.orElse(null));
-//        }
-
         if (caracteristiqueBatimentPaylod.getEnqueteBatimentId() != null) {
             Optional<EnqueteBatiment> optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueBatimentPaylod.getEnqueteBatimentId(), caracteristiqueBatimentPaylod.getTerminalId());
             caracteristiqueBatiment.setEnqueteBatiment(optionalEnqueteBatiment.orElse(null));
@@ -774,14 +756,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             caracteristiqueBatiment.setCaracteristique(optionalCaracteristique.orElse(null));
         }
 
-        // TODO: 15/01/2025 Est-il nécessaire de mettre le terminal qui a fait cette synchronisation ? Vu que les enquetes du batiment
-        // TODO : sont déjà fait par un TPE qui doit être le même que celui-ci
-
-//        if (caracteristiqueBatimentPaylod.getTerminalId() != null) {
-//            Optional<Tpe> optionalTpe = tpeRepository.findById(caracteristiqueBatimentPaylod.getTerminalId());
-//            caracteristiqueBatiment.sett(optionalTpe.orElse(null));
-//        }
-
         caracteristiqueBatiment.setValeur(caracteristiqueBatimentPaylod.getValeur());
         caracteristiqueBatiment.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey());
         return caracteristiqueBatiment;
@@ -790,13 +764,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
 
     private CaracteristiqueParcelle getCaracteristiqueParcelleFromCaracteristiqueParcellePayLoad(CaracteristiqueParcelle caracteristiqueParcelle, CaracteristiqueParcellePaylod caracteristiqueParcellePaylod) {
 
-
-        // TODO: 15/01/2025 A revoir si garder le commentaire
-//        if (batimentPaylaod.getUserId() != null) {
-//            Optional<User> optionalUser = userRepository.findById(batimentPaylaod.getUserId());
-//            batiment.setUser(optionalUser.orElse(null));
-//        }
-
         if (caracteristiqueParcellePaylod.getEnqueteId() != null) {
             Optional<Enquete> optionalEnquete = enqueteRepository.findFirstByExternalKeyAndTerminal_Id(caracteristiqueParcellePaylod.getEnqueteId(), caracteristiqueParcellePaylod.getTerminalId());
             caracteristiqueParcelle.setEnquete(optionalEnquete.orElse(null));
@@ -807,13 +774,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             caracteristiqueParcelle.setCaracteristique(optionalCaracteristique.orElse(null));
         }
 
-        // TODO: 15/01/2025 Est-il nécessaire de mettre le terminal qui a fait cette synchronisation ? Vu que les enquetes du batiment
-        // TODO : sont déjà fait par un TPE qui doit être le même que celui-ci
-
-//        if (caracteristiqueBatimentPaylod.getTerminalId() != null) {
-//            Optional<Tpe> optionalTpe = tpeRepository.findById(caracteristiqueBatimentPaylod.getTerminalId());
-//            caracteristiqueBatiment.sett(optionalTpe.orElse(null));
-//        }
 
         caracteristiqueParcelle.setValeur(caracteristiqueParcellePaylod.getValeur());
         caracteristiqueParcelle.setExternalKey(caracteristiqueParcellePaylod.getExternalKey());
@@ -872,6 +832,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(parcellePayLoad.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(parcellePayLoad.getIdBackend(),
                         parcellePayLoad.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1125,6 +1086,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(acteurConcernePayLoad.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(acteurConcernePayLoad.getIdBackend(),
                         acteurConcernePayLoad.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1182,7 +1144,10 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                                   Long max_numero_piece_id,
                                   Long max_numero_upload_id,
                                   Long max_numero_acteur_concerne_id,
-                                  Long enqueteId) {
+                                  Long enqueteId,
+                                  Long enqueteBatimentId,
+                                  Long enqueteUniteLogementId) {
+
         UploadPayLoad uploadPayLoad = new UploadPayLoad();
         uploadPayLoad.setSynchronise(false);
         uploadPayLoad.setFile(file);
@@ -1197,6 +1162,9 @@ public class SynchronisationServiceImpl implements SynchronisationService {
         uploadPayLoad.setMax_numero_piece_id(max_numero_piece_id);
         uploadPayLoad.setMax_numero_acteur_concerne_id(max_numero_acteur_concerne_id);
         uploadPayLoad.setEnqueteId(enqueteId);
+        uploadPayLoad.setEnqueteBatimentId(enqueteBatimentId);
+        uploadPayLoad.setEnqueteUniteLogementId(enqueteUniteLogementId);
+
         try {
             Upload upload = new Upload();
             SyncResponse syncResponse = new SyncResponse();
@@ -1213,24 +1181,50 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 }
             }
 
-            if (uploadPayLoad.getPieceId() == null && uploadPayLoad.getMembreGroupeId() == null) {
-                syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
-                        uploadPayLoad.getExternalKey(), false, "La pièce ou le groupe concernée n'est pas précisé");
-                return syncResponse;
-            }
-            Optional<Piece> optionalPiece = null;
-            if (uploadPayLoad.getPieceId() != null) {
-                optionalPiece = pieceRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getPieceId(),terminalId);
-            }
-            Optional<MembreGroupe> optionalMembreGroupe = null;
-            if (uploadPayLoad.getMembreGroupeId() != null) {
-                optionalMembreGroupe = membreGroupeRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getMembreGroupeId(),terminalId);
-            }
-            if((optionalMembreGroupe==null || optionalMembreGroupe.isEmpty()) && (optionalPiece==null || optionalPiece.isEmpty())) {
-                syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
-                        uploadPayLoad.getExternalKey(), false, "La pièce ou le groupe précisée n'existe pas");
-                return syncResponse;
+            if ((uploadPayLoad.getPieceId() == null || uploadPayLoad.getPieceId() == 0) && (uploadPayLoad.getMembreGroupeId() == null || uploadPayLoad.getMembreGroupeId() == 0)) {
+
+                if((uploadPayLoad.getEnqueteBatimentId() == null || uploadPayLoad.getEnqueteBatimentId() == 0) && (uploadPayLoad.getEnqueteUniteLogementId() == null || uploadPayLoad.getEnqueteUniteLogementId() == 0)){
+                    syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
+                            uploadPayLoad.getExternalKey(), false, "La pièce, le membre groupe concernée, l'enquête batiment,  l'enquête unité de logement n'est pas précisé");
+                    return syncResponse;
+                }else{
+                    Optional<EnqueteUniteLogement> optionalEnqueteUniteLogement = null;
+                    if(uploadPayLoad.getEnqueteUniteLogementId() != null && uploadPayLoad.getEnqueteUniteLogementId() != 0){
+                        optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getEnqueteUniteLogementId(), uploadPayLoad.getTerminalId());
+                    }
+                    if(optionalEnqueteUniteLogement == null && optionalEnqueteUniteLogement.isEmpty()){
+                        syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
+                                uploadPayLoad.getExternalKey(), false, "L'enquête de l'unité de logement précisée n'existe pas");
+                        return syncResponse;
+                    }
+
+                    Optional<EnqueteBatiment> optionalEnqueteBatiment = null;
+
+                    if(uploadPayLoad.getEnqueteBatimentId() != null && uploadPayLoad.getEnqueteBatimentId() != 0){
+                        optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getEnqueteBatimentId(), uploadPayLoad.getTerminalId());
+                    }
+                    if(optionalEnqueteBatiment == null && optionalEnqueteBatiment.isEmpty()){
+                        syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
+                                uploadPayLoad.getExternalKey(), false, "L'enquête bâtiment précisée n'existe pas");
+                        return syncResponse;
+                    }
+                }
+            }else{
+                Optional<Piece> optionalPiece = null;
+                if (uploadPayLoad.getPieceId() != null) {
+                    optionalPiece = pieceRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getPieceId(),terminalId);
+                }
+                Optional<MembreGroupe> optionalMembreGroupe = null;
+                if (uploadPayLoad.getMembreGroupeId() != null) {
+                    optionalMembreGroupe = membreGroupeRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getMembreGroupeId(),terminalId);
+                }
+                if((optionalMembreGroupe == null || optionalMembreGroupe.isEmpty()) && (optionalPiece == null || optionalPiece.isEmpty())) {
+                    syncResponse = new SyncResponse(uploadPayLoad.getIdBackend(),
+                            uploadPayLoad.getExternalKey(), false, "La pièce ou le groupe précisée n'existe pas");
+                    return syncResponse;
+                }
             }
+
             uploadPayLoad.setSynchronise(true);
             if (uploadPayLoad.getIdBackend() != null && uploadPayLoad.getIdBackend() != 0) {
                 Optional<Upload> optionalUpload = uploadRepository.findById(uploadPayLoad.getIdBackend());
@@ -1296,10 +1290,20 @@ public class SynchronisationServiceImpl implements SynchronisationService {
             Optional<MembreGroupe> optionalMembreGroupe = membreGroupeRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getMembreGroupeId(), uploadPayLoad.getTerminalId());
             upload.setMembreGroupe(optionalMembreGroupe.orElse(null));
         }
+
+        if (uploadPayLoad.getEnqueteBatimentId() != null) {
+            Optional<EnqueteBatiment> optionalEnqueteBatiment = enqueteBatimentRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getEnqueteBatimentId(), uploadPayLoad.getTerminalId());
+            upload.setEnqueteBatiment(optionalEnqueteBatiment.orElse(null));
+        }
+        if (uploadPayLoad.getEnqueteUniteLogementId() != null) {
+            Optional<EnqueteUniteLogement> optionalEnqueteUniteLogement = enqueteUniteLogementRepository.findFirstByExternalKeyAndTerminal_Id(uploadPayLoad.getEnqueteUniteLogementId(), uploadPayLoad.getTerminalId());
+            upload.setEnqueteUniteLogement(optionalEnqueteUniteLogement.orElse(null));
+        }
         if (uploadPayLoad.getIdBackend() != null && uploadPayLoad.getIdBackend() != 0) {
             try {
                 fileStorageService.deleteFile(upload.getFileName());
             } catch (IOException e) {
+                e.printStackTrace();
                 //throw new RuntimeException(e);
             }
         }
@@ -1388,6 +1392,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(batimentPaylaod.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(batimentPaylaod.getIdBackend(),
                         batimentPaylaod.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1465,6 +1470,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(uniteLogementPaylaod.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(uniteLogementPaylaod.getIdBackend(),
                         uniteLogementPaylaod.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1554,6 +1560,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(caracteristiqueBatimentPaylod.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(caracteristiqueBatimentPaylod.getIdBackend(),
                         caracteristiqueBatimentPaylod.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1647,6 +1654,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(caracteristiqueUniteLogementPaylod.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(caracteristiqueUniteLogementPaylod.getIdBackend(),
                         caracteristiqueUniteLogementPaylod.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1741,6 +1749,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(caracteristiqueParcellePaylod.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(caracteristiqueParcellePaylod.getIdBackend(),
                         caracteristiqueParcellePaylod.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1852,7 +1861,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                         //récupération de l'enquete en base de donnéees
                         enqueteBatiment = optionalEnqueteBatiment.get();
                         //verification du statut de l'enquete (Si le status est en_cours ou rejet alors mise à jour)
-                        if(enqueteBatiment.getStatusEnquete().equals(StatusEnquete.EN_COURS) || enqueteBatiment.getStatusEnquete().equals(StatusEnquete.REJETE)){
+                        if(enqueteBatiment.getEnquete().getStatusEnquete().equals(StatusEnquete.EN_COURS) || enqueteBatiment.getEnquete().getStatusEnquete().equals(StatusEnquete.REJETE)){
                             // suppression des pièces, uploads et acteurs concernés
                             deleteAllUploadFromEnqueteBatiment(enqueteBatiment);
                             enqueteBatiment = getEnqueteBatimentFromEnqueteBatimentPayLoad(enqueteBatiment, enqueteBatimentPayload);
@@ -1864,8 +1873,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                         }
                     }
                 } else {
-                    // TODO: 19/01/2025 Est-il  nécessaire des rechercher les lignes de la table enquete ayant meme [externalKey, terminalId, batimentId, enqueteId] ?
-                    // TODO: 19/01/2025 Si oui, que faire ?
                     enqueteBatiment = getEnqueteBatimentFromEnqueteBatimentPayLoad(enqueteBatiment, enqueteBatimentPayload);
                     enqueteBatiment.setStatutEnregistrement(StatutEnregistrement.NOUVELLE_INSERTION);
                     enqueteBatiment = enqueteBatimentRepository.save(enqueteBatiment);
@@ -1878,6 +1885,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(enqueteBatimentPayload.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(enqueteBatimentPayload.getIdBackend(),
                         enqueteBatimentPayload.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
@@ -1983,7 +1991,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                         //récupération de l'enquete en base de donnéees
                         enqueteUniteLogement = optionalEnqueteUniteLogement.get();
                         //verification du statut de l'enquete (Si le status est en_cours ou rejet alors mise à jour)
-                        if(enqueteUniteLogement.getStatusEnquete().equals(StatusEnquete.EN_COURS) || enqueteUniteLogement.getStatusEnquete().equals(StatusEnquete.REJETE)){
+                        if(enqueteUniteLogement.getEnquete().getStatusEnquete().equals(StatusEnquete.EN_COURS) || enqueteUniteLogement.getEnquete().getStatusEnquete().equals(StatusEnquete.REJETE)){
                             // suppression des pièces, uploads et acteurs concernés
                             // TODO: 19/01/2025 S'assurer que la suppression des uploads est nécessaire et correcte
                             deleteAllUploadFromEnqueteUniteLogement(enqueteUniteLogement);
@@ -1996,8 +2004,6 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                         }
                     }
                 } else {
-                    // TODO: 19/01/2025 Est-il  nécessaire des rechercher les lignes de la table enquete ayant meme [externalKey, terminalId, uniteLogementId, enqueteId] ?
-                    // TODO: 19/01/2025 Si oui, que faire ?
                     enqueteUniteLogement = getEnqueteUniteLogementFromEnqueteUniteLogementPayLoad(enqueteUniteLogement, enqueteUniteLogementPayload);
                     enqueteUniteLogement.setStatutEnregistrement(StatutEnregistrement.NOUVELLE_INSERTION);
                     enqueteUniteLogement = enqueteUniteLogementRepository.save(enqueteUniteLogement);
@@ -2010,6 +2016,7 @@ public class SynchronisationServiceImpl implements SynchronisationService {
                 syncResponse.setIdBackend(enqueteUniteLogementPayload.getIdBackend());
                 syncResponses.add(syncResponse);
             } catch (Exception e) {
+                e.printStackTrace();
                 SyncResponse syncResponse = new SyncResponse(enqueteUniteLogementPayload.getIdBackend(),
                         enqueteUniteLogementPayload.getExternalKey(), false, "Erreur inattendue");
                 syncResponses.add(syncResponse);
diff --git a/src/main/java/io/gmss/infocad/implementations/user/DemandeReinitialisationMPServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/implementations/user/DemandeReinitialisationMPServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java
index e0ce908..ae8d404 100644
--- a/src/main/java/io/gmss/infocad/implementations/user/DemandeReinitialisationMPServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/user/DemandeReinitialisationMPServiceImpl.java
@@ -1,14 +1,14 @@
-package io.gmss.infocad.implementations.user;
+package io.gmss.fiscad.implementations.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.DemandeReinitialisationMP;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.EtatDemande;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.user.DemandeReinitialisationMPService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.repositories.user.DemandeReinitialisationMPRepository;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.DemandeReinitialisationMP;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.EtatDemande;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.user.DemandeReinitialisationMPService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.repositories.user.DemandeReinitialisationMPRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/user/RoleServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/implementations/user/RoleServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java
index 6ea25c4..4ad923a 100644
--- a/src/main/java/io/gmss/infocad/implementations/user/RoleServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/user/RoleServiceImpl.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.implementations.user;
+package io.gmss.fiscad.implementations.user;
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.user.RoleService;
-import io.gmss.infocad.repositories.user.RoleRepository;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.user.RoleService;
+import io.gmss.fiscad.repositories.user.RoleRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/io/gmss/infocad/implementations/user/UserServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/implementations/user/UserServiceImpl.java
rename to src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java
index 062ff42..fb85c57 100644
--- a/src/main/java/io/gmss/infocad/implementations/user/UserServiceImpl.java
+++ b/src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java
@@ -1,20 +1,20 @@
-package io.gmss.infocad.implementations.user;
+package io.gmss.fiscad.implementations.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
-import io.gmss.infocad.interfaces.user.RoleService;
-import io.gmss.infocad.interfaces.user.UserService;
-import io.gmss.infocad.paylaods.JwtAuthenticationResponse;
-import io.gmss.infocad.paylaods.Login;
-import io.gmss.infocad.paylaods.UserListByStructureResponse;
-import io.gmss.infocad.paylaods.UserResponse;
-import io.gmss.infocad.repositories.user.UserRepository;
-import io.gmss.infocad.security.TokenAuthentificationProvider;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
+import io.gmss.fiscad.interfaces.user.RoleService;
+import io.gmss.fiscad.interfaces.user.UserService;
+import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
+import io.gmss.fiscad.paylaods.Login;
+import io.gmss.fiscad.paylaods.UserListByStructureResponse;
+import io.gmss.fiscad.paylaods.UserResponse;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import io.gmss.fiscad.security.TokenAuthentificationProvider;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.authentication.AuthenticationManager;
diff --git a/src/main/java/io/gmss/infocad/interfaces/decoupage/ArrondissementService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/ArrondissementService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/decoupage/ArrondissementService.java
rename to src/main/java/io/gmss/fiscad/interfaces/decoupage/ArrondissementService.java
index 929f683..000091e 100755
--- a/src/main/java/io/gmss/infocad/interfaces/decoupage/ArrondissementService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/ArrondissementService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.decoupage;
+package io.gmss.fiscad.interfaces.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/decoupage/CommuneService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/CommuneService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/decoupage/CommuneService.java
rename to src/main/java/io/gmss/fiscad/interfaces/decoupage/CommuneService.java
index f905966..e6d4756 100755
--- a/src/main/java/io/gmss/infocad/interfaces/decoupage/CommuneService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/CommuneService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.decoupage;
+package io.gmss.fiscad.interfaces.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/decoupage/DepartementService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/DepartementService.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/interfaces/decoupage/DepartementService.java
rename to src/main/java/io/gmss/fiscad/interfaces/decoupage/DepartementService.java
index af93448..e7659ce 100755
--- a/src/main/java/io/gmss/infocad/interfaces/decoupage/DepartementService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/DepartementService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.decoupage;
+package io.gmss.fiscad.interfaces.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/decoupage/NationaliteService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/NationaliteService.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/interfaces/decoupage/NationaliteService.java
rename to src/main/java/io/gmss/fiscad/interfaces/decoupage/NationaliteService.java
index 3631ead..3b2091c 100755
--- a/src/main/java/io/gmss/infocad/interfaces/decoupage/NationaliteService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/NationaliteService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.decoupage;
+package io.gmss.fiscad.interfaces.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/decoupage/QuartierService.java b/src/main/java/io/gmss/fiscad/interfaces/decoupage/QuartierService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/decoupage/QuartierService.java
rename to src/main/java/io/gmss/fiscad/interfaces/decoupage/QuartierService.java
index 19293b3..e383456 100755
--- a/src/main/java/io/gmss/infocad/interfaces/decoupage/QuartierService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/decoupage/QuartierService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.decoupage;
+package io.gmss.fiscad.interfaces.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/ActeurConcerneService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ActeurConcerneService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/ActeurConcerneService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ActeurConcerneService.java
index 4e14cbf..0af7aee 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/ActeurConcerneService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ActeurConcerneService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/CommentaireService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/CommentaireService.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/CommentaireService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/CommentaireService.java
index c843e07..4aace64 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/CommentaireService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/CommentaireService.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Commentaire;
-import io.gmss.infocad.enums.Origine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.paylaods.request.SyncCommentaireRequest;
-import io.gmss.infocad.paylaods.response.CommentaireResponse;
+import io.gmss.fiscad.entities.infocad.metier.Commentaire;
+import io.gmss.fiscad.enums.Origine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest;
+import io.gmss.fiscad.paylaods.response.CommentaireResponse;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/EnqueteService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java
similarity index 65%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/EnqueteService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java
index cc2289a..9180130 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/EnqueteService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java
@@ -1,16 +1,16 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.EnqueteFiltreResponse;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.paylaods.request.EnquetePayLoad;
-import io.gmss.infocad.paylaods.request.EnqueteTraitementPayLoad;
-import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.infocad.paylaods.response.EnqueteNonSyncResponse;
-import io.gmss.infocad.paylaods.response.EnqueteResponse;
-import io.gmss.infocad.paylaods.response.FicheEnqueteResponse;
-import io.gmss.infocad.paylaods.response.UserDecoupageEnqResponses;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
+import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
+import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
+import io.gmss.fiscad.paylaods.response.EnqueteNonSyncResponse;
+import io.gmss.fiscad.paylaods.response.EnqueteResponse;
+import io.gmss.fiscad.paylaods.response.FicheEnqueteResponse;
+import io.gmss.fiscad.paylaods.response.UserDecoupageEnqResponses;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/MembreGroupeService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/MembreGroupeService.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/MembreGroupeService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/MembreGroupeService.java
index 5d2c9de..6816250 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/MembreGroupeService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/MembreGroupeService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/ParcelleService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java
similarity index 67%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/ParcelleService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java
index 03de161..587df2c 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/ParcelleService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.paylaods.request.ParcellePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.request.ParcellePayLoad;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/PieceService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PieceService.java
similarity index 69%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/PieceService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PieceService.java
index 5fc4388..9e6385a 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/PieceService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PieceService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Piece;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/TpeService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/TpeService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/metier/TpeService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/metier/TpeService.java
index 4275524..ffcaf6a 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/metier/TpeService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/TpeService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.metier;
+package io.gmss.fiscad.interfaces.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/BlocService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/BlocService.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/BlocService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/BlocService.java
index 5e865ea..588c38b 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/BlocService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/BlocService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ModeAcquisitionService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ModeAcquisitionService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ModeAcquisitionService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ModeAcquisitionService.java
index e8fe0d8..e045bee 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ModeAcquisitionService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ModeAcquisitionService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/NatureDomaineService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/NatureDomaineService.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/NatureDomaineService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/NatureDomaineService.java
index c189151..9880c1b 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/NatureDomaineService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/NatureDomaineService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PersonneService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PersonneService.java
similarity index 70%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PersonneService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PersonneService.java
index 5c02395..c876929 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PersonneService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PersonneService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PositionRepresentationService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PositionRepresentationService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PositionRepresentationService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PositionRepresentationService.java
index 4d811b2..95eb61c 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/PositionRepresentationService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/PositionRepresentationService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ProfessionService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ProfessionService.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ProfessionService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ProfessionService.java
index 19e51e7..9ac83d8 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/ProfessionService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/ProfessionService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Profession;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.Profession;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationGeographiqueService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationGeographiqueService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationGeographiqueService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationGeographiqueService.java
index 96cc8e0..c32a12c 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationGeographiqueService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationGeographiqueService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationMatrimonialeService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationMatrimonialeService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationMatrimonialeService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationMatrimonialeService.java
index 17b9b52..3773a6a 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SituationMatrimonialeService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SituationMatrimonialeService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationMatrimoniale;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitExerceService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitExerceService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitExerceService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitExerceService.java
index c22209a..d77fbf1 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitExerceService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitExerceService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroitExerce;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroitExerce;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitService.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitService.java
index 400f9d5..6ed63a6 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/SourceDroitService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/SourceDroitService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/StructureService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java
similarity index 69%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/StructureService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java
index 10bb4f8..98abdfc 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/StructureService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/StructureService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
-import io.gmss.infocad.paylaods.response.StructureResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.response.StructureResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeContestationService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeContestationService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeContestationService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeContestationService.java
index 4579d21..9013bd9 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeContestationService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeContestationService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeDomaineService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeDomaineService.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeDomaineService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeDomaineService.java
index 73ba844..d19040e 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeDomaineService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeDomaineService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeDomaine;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePersonneService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePersonneService.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePersonneService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePersonneService.java
index 6b5b2dc..a5f82fe 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePersonneService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePersonneService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePersonne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.TypePersonne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePieceService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePieceService.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePieceService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePieceService.java
index d2f3d53..07ed018 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypePieceService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypePieceService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePiece;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeRepresentationService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRepresentationService.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeRepresentationService.java
rename to src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRepresentationService.java
index 5a6ceb1..0ee61fc 100755
--- a/src/main/java/io/gmss/infocad/interfaces/infocad/parametre/TypeRepresentationService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRepresentationService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.infocad.parametre;
+package io.gmss.fiscad.interfaces.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/notification/EmailService.java b/src/main/java/io/gmss/fiscad/interfaces/notification/EmailService.java
similarity index 61%
rename from src/main/java/io/gmss/infocad/interfaces/notification/EmailService.java
rename to src/main/java/io/gmss/fiscad/interfaces/notification/EmailService.java
index 81afa18..1b14295 100644
--- a/src/main/java/io/gmss/infocad/interfaces/notification/EmailService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/notification/EmailService.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.interfaces.notification;
+package io.gmss.fiscad.interfaces.notification;
 
-import io.gmss.infocad.paylaods.EmailDetails;
+import io.gmss.fiscad.paylaods.EmailDetails;
 
 public interface EmailService {
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/BatimentService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/BatimentService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java
index c95b911..3ac3817 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/BatimentService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.Batiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.Batiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueBatimentService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueBatimentService.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueBatimentService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueBatimentService.java
index 1d301ae..e941d49 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueBatimentService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueBatimentService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueParcelleService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
index 8b2d02f..d7f31cf 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java
index 237c0a7..1920997 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueUniteLogementService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteBatimentService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteBatimentService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java
index d8dcbcc..51b4a96 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteBatimentService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteUniteLogementService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteUniteLogementService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java
index bb0eb0d..b28668f 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/EnqueteUniteLogementService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/UniteLogementService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/metier/UniteLogementService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java
index 8df8a22..46a3c8c 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/metier/UniteLogementService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.metier;
+package io.gmss.fiscad.interfaces.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.UniteLogement;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CampagneService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CampagneService.java
similarity index 70%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CampagneService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CampagneService.java
index 1e393b7..df2bd72 100644
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CampagneService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CampagneService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.rfu.parametre;
+package io.gmss.fiscad.interfaces.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Campagne;
-import io.gmss.infocad.enums.TypeCampagne;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.enums.TypeCampagne;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CaracteristiqueService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CaracteristiqueService.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CaracteristiqueService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CaracteristiqueService.java
index 632c1bc..ff6f5a3 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/CaracteristiqueService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/CaracteristiqueService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.parametre;
+package io.gmss.fiscad.interfaces.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/EquipeService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java
similarity index 70%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/parametre/EquipeService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java
index 16a3093..332eccc 100644
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/EquipeService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.parametre;
+package io.gmss.fiscad.interfaces.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Equipe;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/TypeCaracteristiqueService.java b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/TypeCaracteristiqueService.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/interfaces/rfu/parametre/TypeCaracteristiqueService.java
rename to src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/TypeCaracteristiqueService.java
index 2f109e0..364f847 100755
--- a/src/main/java/io/gmss/infocad/interfaces/rfu/parametre/TypeCaracteristiqueService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/TypeCaracteristiqueService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.interfaces.rfu.parametre;
+package io.gmss.fiscad.interfaces.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/statistique/StatistiquesService.java b/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java
similarity index 50%
rename from src/main/java/io/gmss/infocad/interfaces/statistique/StatistiquesService.java
rename to src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java
index 64193f3..5b4126a 100644
--- a/src/main/java/io/gmss/infocad/interfaces/statistique/StatistiquesService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/statistique/StatistiquesService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.statistique;
+package io.gmss.fiscad.interfaces.statistique;
 
-import io.gmss.infocad.paylaods.response.StatEnqueteAdminDecoupageResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteAdminStructureResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteParBlocResponse;
-import io.gmss.infocad.paylaods.response.StatEnqueteParStatutResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteAdminDecoupageResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteAdminStructureResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteParBlocResponse;
+import io.gmss.fiscad.paylaods.response.StatEnqueteParStatutResponse;
 
 import java.util.List;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/synchronisation/RestaurationService.java b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java
similarity index 65%
rename from src/main/java/io/gmss/infocad/interfaces/synchronisation/RestaurationService.java
rename to src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java
index b142f93..6b8fead 100644
--- a/src/main/java/io/gmss/infocad/interfaces/synchronisation/RestaurationService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.interfaces.synchronisation;
+package io.gmss.fiscad.interfaces.synchronisation;
 
-import io.gmss.infocad.entities.infocad.metier.Tpe;
-import io.gmss.infocad.paylaods.response.restoration.*;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.paylaods.response.restoration.*;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ public interface RestaurationService {
     List<ParcellePayLoad> getParcelle(Long terminaleId) ;
     List<PiecePayLoad> getPieces(Long terminaleId) ;
     List<MembreGroupePayLoad> getMembreGroupe(Long terminaleId) ;
-    List<io.gmss.infocad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId) ;
+    List<io.gmss.fiscad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId) ;
 
     public List<Tpe> getTpeListByCurrentUser();
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/synchronisation/SynchronisationService.java b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/interfaces/synchronisation/SynchronisationService.java
rename to src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java
index 22ba824..606572d 100755
--- a/src/main/java/io/gmss/infocad/interfaces/synchronisation/SynchronisationService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.interfaces.synchronisation;
+package io.gmss.fiscad.interfaces.synchronisation;
 
-import io.gmss.infocad.paylaods.request.*;
-import io.gmss.infocad.paylaods.response.ReferencesSyncResponses;
-import io.gmss.infocad.paylaods.response.SyncEnqueteAllDataResponse;
-import io.gmss.infocad.paylaods.response.SyncResponse;
-import io.gmss.infocad.paylaods.response.UserDecoupageSyncResponses;
+import io.gmss.fiscad.paylaods.request.*;
+import io.gmss.fiscad.paylaods.response.ReferencesSyncResponses;
+import io.gmss.fiscad.paylaods.response.SyncEnqueteAllDataResponse;
+import io.gmss.fiscad.paylaods.response.SyncResponse;
+import io.gmss.fiscad.paylaods.response.UserDecoupageSyncResponses;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -38,7 +38,10 @@ public interface SynchronisationService {
                                   Long max_numero_piece_id,
                                   Long max_numero_upload_id,
                                   Long max_numero_acteur_concerne_id,
-                                  Long enqueteId);
+                                  Long enqueteId,
+                                  Long enqueteBatimentId,
+                                  Long enqueteUniteLogementId
+                                  );
 
     public List<SyncResponse> syncEnqueteFromMobile(List<Long> idEnquete);
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/user/DemandeReinitialisationMPService.java b/src/main/java/io/gmss/fiscad/interfaces/user/DemandeReinitialisationMPService.java
similarity index 78%
rename from src/main/java/io/gmss/infocad/interfaces/user/DemandeReinitialisationMPService.java
rename to src/main/java/io/gmss/fiscad/interfaces/user/DemandeReinitialisationMPService.java
index 644e8df..2a1796a 100755
--- a/src/main/java/io/gmss/infocad/interfaces/user/DemandeReinitialisationMPService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/user/DemandeReinitialisationMPService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.user;
+package io.gmss.fiscad.interfaces.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.DemandeReinitialisationMP;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.DemandeReinitialisationMP;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/user/RoleService.java b/src/main/java/io/gmss/fiscad/interfaces/user/RoleService.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/interfaces/user/RoleService.java
rename to src/main/java/io/gmss/fiscad/interfaces/user/RoleService.java
index 546c9aa..230e824 100755
--- a/src/main/java/io/gmss/infocad/interfaces/user/RoleService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/user/RoleService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.interfaces.user;
+package io.gmss.fiscad.interfaces.user;
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.exceptions.BadRequestException;
-import io.gmss.infocad.exceptions.NotFoundException;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.exceptions.BadRequestException;
+import io.gmss.fiscad.exceptions.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/interfaces/user/UserService.java b/src/main/java/io/gmss/fiscad/interfaces/user/UserService.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/interfaces/user/UserService.java
rename to src/main/java/io/gmss/fiscad/interfaces/user/UserService.java
index e9ff841..ff5116e 100755
--- a/src/main/java/io/gmss/infocad/interfaces/user/UserService.java
+++ b/src/main/java/io/gmss/fiscad/interfaces/user/UserService.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.interfaces.user;
+package io.gmss.fiscad.interfaces.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
-import io.gmss.infocad.paylaods.JwtAuthenticationResponse;
-import io.gmss.infocad.paylaods.Login;
-import io.gmss.infocad.paylaods.UserListByStructureResponse;
-import io.gmss.infocad.paylaods.UserResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
+import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
+import io.gmss.fiscad.paylaods.Login;
+import io.gmss.fiscad.paylaods.UserListByStructureResponse;
+import io.gmss.fiscad.paylaods.UserResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/ApiResponse.java b/src/main/java/io/gmss/fiscad/paylaods/ApiResponse.java
similarity index 93%
rename from src/main/java/io/gmss/infocad/paylaods/ApiResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/ApiResponse.java
index f7488f9..ee2a311 100755
--- a/src/main/java/io/gmss/infocad/paylaods/ApiResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/ApiResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/gmss/infocad/paylaods/Critere.java b/src/main/java/io/gmss/fiscad/paylaods/Critere.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/Critere.java
rename to src/main/java/io/gmss/fiscad/paylaods/Critere.java
index 4dfaa8c..fcd47db 100755
--- a/src/main/java/io/gmss/infocad/paylaods/Critere.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/Critere.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 
-import io.gmss.infocad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatusEnquete;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/gmss/infocad/paylaods/DemandeReinitialisationMPResponse.java b/src/main/java/io/gmss/fiscad/paylaods/DemandeReinitialisationMPResponse.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/paylaods/DemandeReinitialisationMPResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/DemandeReinitialisationMPResponse.java
index 9b0b1c5..33dfd9d 100644
--- a/src/main/java/io/gmss/infocad/paylaods/DemandeReinitialisationMPResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/DemandeReinitialisationMPResponse.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
-import io.gmss.infocad.enums.EtatDemande;
+import io.gmss.fiscad.enums.EtatDemande;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/gmss/infocad/paylaods/EmailDetails.java b/src/main/java/io/gmss/fiscad/paylaods/EmailDetails.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/paylaods/EmailDetails.java
rename to src/main/java/io/gmss/fiscad/paylaods/EmailDetails.java
index ff21e1b..090f925 100644
--- a/src/main/java/io/gmss/infocad/paylaods/EmailDetails.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/EmailDetails.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/gmss/infocad/paylaods/JwtAuthenticationResponse.java b/src/main/java/io/gmss/fiscad/paylaods/JwtAuthenticationResponse.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/paylaods/JwtAuthenticationResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/JwtAuthenticationResponse.java
index 00ff47a..ae918c7 100755
--- a/src/main/java/io/gmss/infocad/paylaods/JwtAuthenticationResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/JwtAuthenticationResponse.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import java.util.Date;
 
 @JsonAutoDetect
diff --git a/src/main/java/io/gmss/infocad/paylaods/Login.java b/src/main/java/io/gmss/fiscad/paylaods/Login.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/paylaods/Login.java
rename to src/main/java/io/gmss/fiscad/paylaods/Login.java
index 216ed08..e89f871 100755
--- a/src/main/java/io/gmss/infocad/paylaods/Login.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/Login.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
-import io.gmss.infocad.enums.UserRole;
+import io.gmss.fiscad.enums.UserRole;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/StatusResponse.java b/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/paylaods/StatusResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java
index 7f5edc4..2923bc2 100755
--- a/src/main/java/io/gmss/infocad/paylaods/StatusResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
-import io.gmss.infocad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatusEnquete;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/gmss/infocad/paylaods/UserListByStructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/UserListByStructureResponse.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/paylaods/UserListByStructureResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/UserListByStructureResponse.java
index 2987d9f..242be97 100644
--- a/src/main/java/io/gmss/infocad/paylaods/UserListByStructureResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/UserListByStructureResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/gmss/infocad/paylaods/UserRequest.java b/src/main/java/io/gmss/fiscad/paylaods/UserRequest.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/UserRequest.java
rename to src/main/java/io/gmss/fiscad/paylaods/UserRequest.java
index 56ecad1..a2f9997 100644
--- a/src/main/java/io/gmss/infocad/paylaods/UserRequest.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/UserRequest.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/gmss/infocad/paylaods/UserResponse.java b/src/main/java/io/gmss/fiscad/paylaods/UserResponse.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/paylaods/UserResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/UserResponse.java
index 6f27a1a..2414fe2 100644
--- a/src/main/java/io/gmss/infocad/paylaods/UserResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/UserResponse.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.paylaods;
+package io.gmss.fiscad.paylaods;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.Role;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.Role;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/ActeurConcernePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/request/ActeurConcernePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java
index 9781e69..7e8dcfa 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/ActeurConcernePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/ActeurConcernePayLoad.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
-import io.gmss.infocad.enums.RoleActeur;
-import io.gmss.infocad.enums.TypeDroit;
+import io.gmss.fiscad.enums.RoleActeur;
+import io.gmss.fiscad.enums.TypeDroit;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import lombok.Data;
 import org.hibernate.annotations.ColumnDefault;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 
 @Data
 public class ActeurConcernePayLoad {
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/BatimentPaylaod.java b/src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/paylaods/request/BatimentPaylaod.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java
index f987a75..13af4aa 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/BatimentPaylaod.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/BatimentPaylaod.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueBatimentPaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueBatimentPaylod.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java
index 93bd976..90487bc 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueBatimentPaylod.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueBatimentPaylod.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueParcellePaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueParcellePaylod.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java
index e4a8f08..bb116bb 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueParcellePaylod.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueParcellePaylod.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueUniteLogementPaylod.java b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueUniteLogementPaylod.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java
index 2fb9c9e..86d0592 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueUniteLogementPaylod.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/CaracteristiqueUniteLogementPaylod.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/CommentaireRequest.java b/src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/paylaods/request/CommentaireRequest.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java
index c86fa51..4266492 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/CommentaireRequest.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/CommentaireRequest.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
-import io.gmss.infocad.enums.Origine;
+import io.gmss.fiscad.enums.Origine;
 import lombok.Data;
 
 @Data
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteAllDataPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/request/EnqueteAllDataPayload.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java
index 340467b..b363d37 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteAllDataPayload.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteBatimentPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/request/EnqueteBatimentPayload.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java
index ad2b1fe..9e73f7e 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteBatimentPayload.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteBatimentPayload.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
@@ -24,13 +24,13 @@ public class EnqueteBatimentPayload {
     private String numCompteurSbee;
     private boolean soneb;
     private String numCompteurSoneb;
-    private byte nbreLotUnite;
-    private byte nbreUniteLocation;
+    private int nbreLotUnite;
+    private int nbreUniteLocation;
     private float surfaceLouee;
-    private byte nbreMenage;
-    private byte nbreHabitant;
+    private int nbreMenage;
+    private int nbreHabitant;
     private float valeurMensuelleLocation;
-    private byte nbreMoisLocation;
+    private int nbreMoisLocation;
     private String autreCaracteristiquePhysique;
     private LocalDate dateDebutExcemption;
     private LocalDate dateFinExcemption;
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/EnquetePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/paylaods/request/EnquetePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java
index 5ae02c7..9ae7e24 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/EnquetePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnquetePayLoad.java
@@ -1,10 +1,10 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
-import io.gmss.infocad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatusEnquete;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import lombok.Data;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import java.time.LocalDate;
 @Data
 public class EnquetePayLoad {
@@ -43,12 +43,12 @@ public class EnquetePayLoad {
     private String emplacement;
     private float altitude;
     private float precision;
-    private byte nbreCoProprietaire;
-    private byte nbreIndivisiaire;
+    private int nbreCoProprietaire;
+    private int nbreIndivisiaire;
     private String autreAdresse;
     private String surface;
-    private byte nbreBatiment;
-    private byte nbrePiscine;
+    private int nbreBatiment;
+    private int nbrePiscine;
     private LocalDate dateDebutExcemption;
     private LocalDate dateFinExcemption;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteTraitementPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteTraitementPayLoad.java
similarity index 75%
rename from src/main/java/io/gmss/infocad/paylaods/request/EnqueteTraitementPayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/EnqueteTraitementPayLoad.java
index 430a5fd..30c7e28 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteTraitementPayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteTraitementPayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteUniteLogementPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/paylaods/request/EnqueteUniteLogementPayload.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java
index 52739ad..e0c94f8 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/EnqueteUniteLogementPayload.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/EnqueteUniteLogementPayload.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
@@ -13,12 +13,12 @@ public class EnqueteUniteLogementPayload {
     private String observation;
     private Long userId;
     private float surface;
-    private byte nbrePiece;
-    private byte nbreHabitant;
-    private byte nbreMenage;
+    private int nbrePiece;
+    private int nbreHabitant;
+    private int nbreMenage;
     private boolean enLocation;
     private float montantMensuelLoyer;
-    private byte nbreMoisEnLocation;
+    private int nbreMoisEnLocation;
     private float montantLocatifAnnuelDeclare;
     private float surfaceLouee;
     private boolean sbee;
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/FiltreEnquetePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/FiltreEnquetePayLoad.java
similarity index 85%
rename from src/main/java/io/gmss/infocad/paylaods/request/FiltreEnquetePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/FiltreEnquetePayLoad.java
index be3cfaf..d335cd5 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/FiltreEnquetePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/FiltreEnquetePayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
@@ -16,6 +16,7 @@ public class FiltreEnquetePayLoad {
     private String prenomPersonne;
     private String enqueteurId;
     private Boolean litige;
+    private String statutEnquete;
 
 }
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/MembreGroupePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/paylaods/request/MembreGroupePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java
index 312e8b4..f7d3dc8 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/MembreGroupePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/MembreGroupePayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/ParcellePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/paylaods/request/ParcellePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java
index 67df9ed..a25c772 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/ParcellePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/ParcellePayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 @Data
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/PersonnePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java
similarity index 93%
rename from src/main/java/io/gmss/infocad/paylaods/request/PersonnePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java
index 2015ade..81130cd 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/PersonnePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
-import io.gmss.infocad.enums.Categorie;
+import io.gmss.fiscad.enums.Categorie;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import lombok.Data;
 import org.hibernate.annotations.ColumnDefault;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 
 @Data
 public class PersonnePayLoad {
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/PiecePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/paylaods/request/PiecePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java
index dc0e546..a3bcbb0 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/PiecePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/PiecePayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/SyncCommentaireRequest.java b/src/main/java/io/gmss/fiscad/paylaods/request/SyncCommentaireRequest.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/paylaods/request/SyncCommentaireRequest.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/SyncCommentaireRequest.java
index 2516bfb..39b8edf 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/SyncCommentaireRequest.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/SyncCommentaireRequest.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/UniteLogementPaylaod.java b/src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/request/UniteLogementPaylaod.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java
index 91c73c2..bdcf200 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/UniteLogementPaylaod.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/UniteLogementPaylaod.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 @Data
diff --git a/src/main/java/io/gmss/infocad/paylaods/request/UploadPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/paylaods/request/UploadPayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java
index 8f2d618..3b261c7 100644
--- a/src/main/java/io/gmss/infocad/paylaods/request/UploadPayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/request/UploadPayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.request;
+package io.gmss.fiscad.paylaods.request;
 
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,6 +22,8 @@ public class UploadPayLoad {
     private Long max_numero_acteur_concerne_id;
     private Long enqueteId;
     private Long blocId;
+    private Long enqueteBatimentId;
+    private Long enqueteUniteLogementId;
 
 }
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/ArrondissementEnqResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementEnqResponse.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/paylaods/response/ArrondissementEnqResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementEnqResponse.java
index 7f8d7ac..7142a7b 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/ArrondissementEnqResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementEnqResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface ArrondissementEnqResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/ArrondissementSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/response/ArrondissementSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java
index 71af1cb..dd63b46 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/ArrondissementSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/ArrondissementSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface ArrondissementSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/BlocEnqResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/BlocEnqResponse.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/paylaods/response/BlocEnqResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/BlocEnqResponse.java
index f59d123..67e2fcd 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/BlocEnqResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/BlocEnqResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface BlocEnqResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/BlocSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java
similarity index 67%
rename from src/main/java/io/gmss/infocad/paylaods/response/BlocSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java
index 350a718..d77a0c1 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/BlocSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/BlocSyncResponse.java
@@ -1,8 +1,9 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface BlocSyncResponse {
     public Long getId();
     public String getCote();
     public String getNom();
     public Long getArrondissementId();
+    public Long getQuartierId();
 }
\ No newline at end of file
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/CommentaireResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/CommentaireResponse.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/paylaods/response/CommentaireResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/CommentaireResponse.java
index 9a1452a..efb6f2c 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/CommentaireResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/CommentaireResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/CommuneEnqResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/CommuneEnqResponse.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/response/CommuneEnqResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/CommuneEnqResponse.java
index 18d2839..976e3de 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/CommuneEnqResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/CommuneEnqResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface CommuneEnqResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/CommuneSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java
similarity index 78%
rename from src/main/java/io/gmss/infocad/paylaods/response/CommuneSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java
index af3d5e0..8bde1bf 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/CommuneSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/CommuneSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface CommuneSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/DepartementEnqResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/DepartementEnqResponse.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/paylaods/response/DepartementEnqResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/DepartementEnqResponse.java
index caadff6..6711b7c 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/DepartementEnqResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/DepartementEnqResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface DepartementEnqResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/DepartementSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/paylaods/response/DepartementSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java
index 56b5028..6beff2f 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/DepartementSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/DepartementSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface DepartementSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/EnqueteNonSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/paylaods/response/EnqueteNonSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java
index cb52d38..2fd9ad4 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/EnqueteNonSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteNonSyncResponse.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
-import io.gmss.infocad.enums.StatusEnquete;
+import io.gmss.fiscad.enums.StatusEnquete;
 
 
 public interface EnqueteNonSyncResponse {
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java
new file mode 100644
index 0000000..cf435f2
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/EnquetePayLoadResponse.java
@@ -0,0 +1,9 @@
+package io.gmss.fiscad.paylaods.response;
+
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+
+public class EnquetePayLoadResponse {
+    private Enquete enquete;
+
+}
+
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/EnqueteResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteResponse.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/paylaods/response/EnqueteResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/EnqueteResponse.java
index 4f72528..b8a73f3 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/EnqueteResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/EnqueteResponse.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java
new file mode 100644
index 0000000..80a2e53
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheEnqueteResponse.java
@@ -0,0 +1,21 @@
+package io.gmss.fiscad.paylaods.response;
+
+import io.gmss.fiscad.paylaods.response.FicheResponse.FicheActeurConcerneResponse;
+import io.gmss.fiscad.paylaods.response.FicheResponse.FicheEnquetesResponse;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Data
+@Getter
+@Setter
+public class FicheEnqueteResponse {
+    //private Enquete enquete ;
+    //private List<ActeurConcerne> acteurConcernes;
+
+    private FicheEnquetesResponse enquete ;
+    private List<FicheActeurConcerneResponse> acteurConcernes;
+}
+
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheActeurConcerneResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheActeurConcerneResponse.java
new file mode 100644
index 0000000..5ef0c93
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheActeurConcerneResponse.java
@@ -0,0 +1,40 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.enums.RoleActeur;
+import io.gmss.fiscad.enums.TypeDroit;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Data
+@Getter
+@Setter
+public class FicheActeurConcerneResponse {
+    private Long id;
+    private String observation;
+    @Enumerated(EnumType.STRING)
+    private TypeDroit typeDroit;
+    private float part;
+    private TypeRepresentation typeRepresentation;
+    private PositionRepresentation positionRepresentation;
+    private Personne personne;
+    private TypeContestation typeContestation;
+    @Enumerated(EnumType.STRING)
+    private RoleActeur roleActeur;
+    //@OneToMany(mappedBy = "acteurConcerne")
+    private List<Piece> pieces;
+    private boolean synchronise;
+    //////////////////////////////
+    private Long blocId;
+    private int haveDeclarant ;
+    private Long max_numero_acteur_concerne_id;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheBatimentResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheBatimentResponse.java
new file mode 100644
index 0000000..73b117a
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheBatimentResponse.java
@@ -0,0 +1,25 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+
+@Data
+@Getter
+@Setter
+public class FicheBatimentResponse {
+
+    private Long id;
+    private String nub;
+    private String code;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateConstruction;
+    private Long idDerniereEnquete;
+    //private Parcelle parcelle;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueBatimentResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueBatimentResponse.java
new file mode 100644
index 0000000..e992faf
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueBatimentResponse.java
@@ -0,0 +1,17 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Data
+@Getter
+@Setter
+public class FicheCaracteristiqueBatimentResponse {
+    private Long id;
+    //private EnqueteBatiment enqueteBatiment;
+    private Caracteristique caracteristique;
+    private String valeur;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueParcelleResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueParcelleResponse.java
new file mode 100644
index 0000000..4707ff8
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueParcelleResponse.java
@@ -0,0 +1,17 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Getter
+@Setter
+public class FicheCaracteristiqueParcelleResponse {
+
+    private Long id;
+    //private Enquete enquete;
+    private Caracteristique caracteristique;
+    private String valeur;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueUniteLogementResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueUniteLogementResponse.java
new file mode 100644
index 0000000..fe75479
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheCaracteristiqueUniteLogementResponse.java
@@ -0,0 +1,17 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Setter
+@Getter
+public class FicheCaracteristiqueUniteLogementResponse {
+
+    private Long id;
+    //private EnqueteUniteLogement enqueteUniteLogement;
+    private Caracteristique caracteristique;
+    private String valeur;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteBatimentResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteBatimentResponse.java
new file mode 100644
index 0000000..d62b6b2
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteBatimentResponse.java
@@ -0,0 +1,47 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+import java.util.List;
+
+
+@Data
+@Getter
+@Setter
+public class FicheEnqueteBatimentResponse {
+    private Long id;
+    private float surfaceAuSol;
+    private String autreMenuisierie;
+    private String autreMur;
+    private boolean sbee;
+    private String numCompteurSbee;
+    private boolean soneb;
+    private String numCompteurSoneb;
+    private int nbreLotUnite;
+    private int nbreUniteLocation;
+    private float surfaceLouee;
+    private int nbreMenage;
+    private int nbreHabitant;
+    private float valeurMensuelleLocation;
+    private int nbreMoisLocation;
+    private String autreCaracteristiquePhysique;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateDebutExcemption;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateFinExcemption;
+    private Personne personne;
+    //private Enquete enquete;
+    private FicheBatimentResponse batiment;
+    private List<FicheCaracteristiqueBatimentResponse> caracteristiqueBatiments;
+    private List<Upload> uploads;
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteUniteLogementResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteUniteLogementResponse.java
new file mode 100644
index 0000000..ead7667
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnqueteUniteLogementResponse.java
@@ -0,0 +1,48 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+import java.util.List;
+
+
+@Data
+@Setter
+@Getter
+public class FicheEnqueteUniteLogementResponse {
+
+    private Long id;
+    private float surface;
+    private int nbrePiece;
+    private int nbreHabitant;
+    private int nbreMenage;
+    private boolean enLocation;
+    private float montantMensuelLoyer;
+    private int nbreMoisEnLocation;
+    private float montantLocatifAnnuelDeclare;
+    private float surfaceLouee;
+    private boolean sbee;
+    private boolean soneb;
+    private String numCompteurSbee;
+    private String numCompteurSoneb;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateDebutExcemption;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateFinExcemption;
+    //private Enquete enquete;
+    private Personne personne;
+
+    private FicheUniteLogementResponse uniteLogement;
+    private List<FicheCaracteristiqueUniteLogementResponse> caracteristiqueUniteLogements;
+    private List<Upload> uploads;
+
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java
new file mode 100644
index 0000000..7bb0d6b
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheEnquetesResponse.java
@@ -0,0 +1,190 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.StatusEnquete;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Transient;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@Getter
+@Setter
+public class FicheEnquetesResponse {
+    private Long id;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateEnquete;
+    private boolean litige;
+    private Parcelle parcelle;
+    private Campagne campagne;
+    private Equipe equipe;
+    @Enumerated(EnumType.STRING)
+    private StatusEnquete statusEnquete;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateValidation;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateRejet;
+    private String descriptionMotifRejet;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateFinalisation;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateLitigeResolu;
+    @JsonFormat
+    private Bloc bloc;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateSynchronisation;
+    private boolean synchronise;
+    private String observationParticuliere;
+    @Transient
+    private String nomPrenomEnqueteur;
+    @Transient
+    private String nomBloc;
+    @Transient
+    private String departement;
+    @Transient
+    private String commune;
+    @Transient
+    private String arrondissement;
+    @Transient
+    private String codeBloc;
+    @Transient
+    private String telEnqueteur;
+    @Transient
+    private String typeDomaine;
+
+    @JsonIgnore
+    private User user;
+
+    @Transient
+    private String structureEnqueteur;
+//    @JsonIgnore
+//    @ManyToOne
+//    private Tpe terminal;
+//    @Transient
+//    private Long terminalId;
+
+    ////////////////////////////////
+    private Long quartierId;
+    private Long arrondissementId;
+    private Long communeId;
+    private Long departementId;
+    private Long numeroProvisoir;
+    private String codeParcelle;
+    private String nomProprietaireParcelle;
+    private String codeEquipe;
+    private String numeroTitreFoncier;
+
+    /// Nouveau champs ajoutés pour RFU Abomey
+    private String numEnterParcelle;
+    private String numRue;
+    private String nomRue;
+    private String emplacement;
+    private float altitude;
+    private float precision;
+    private int nbreCoProprietaire;
+    private int nbreIndivisiaire;
+    private String autreAdresse;
+    private String surface;
+    private int nbreBatiment;
+    private int nbrePiscine;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateDebutExcemption;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate dateFinExcemption;
+
+//    public Long getTerminalId(){
+//        if(this.terminal!=null){
+//            return this.terminal.getId();
+//        }else return null;
+//    }
+
+
+    private List<FicheCaracteristiqueParcelleResponse> caracteristiquesParcelles;
+    private List<FicheEnqueteBatimentResponse> enquetesBatiments;
+    private List<FicheEnqueteUniteLogementResponse> enquetesUniteLogements;
+
+    public String getNomPrenomEnqueteur(){
+        if(this.user!=null){
+            return this.user.getNom()+" "+this.user.getPrenom();
+        }else return "";
+    }
+    public String getNomBloc(){
+        if(this.bloc!=null){
+            return this.bloc.getNom();
+        }else return "";
+    }
+
+    public String getCodeBloc(){
+        if(this.bloc!=null){
+            return this.bloc.getCote();
+        }else return "";
+    }
+    public String getDepartement(){
+        if(this.bloc!=null){
+            Arrondissement arrondissement= this.bloc.getArrondissement();
+            if(arrondissement!=null){
+                return arrondissement.getCommune().getDepartement().getNom();
+            }else return "";
+        }else return "";
+    }
+    public String getCommune(){
+        if(this.bloc!=null){
+            Arrondissement arrondissement= this.bloc.getArrondissement();
+            if(arrondissement!=null){
+                return arrondissement.getCommune().getNom();
+            }else return "";
+        }else return "";
+    }
+
+    public String getArrondissement(){
+        if(this.bloc!=null) {
+            Arrondissement arrondissement= this.bloc.getArrondissement();
+            if(arrondissement!=null){
+                return arrondissement.getNom();
+            }else return "";
+        }else return "";
+    }
+    public String getTypeDomaine(){
+        if(this.parcelle!=null){
+            NatureDomaine natureDomaine= this.parcelle.getNatureDomaine();
+            if(natureDomaine!=null){
+                return natureDomaine.getTypeDomaine().getLibelle();
+            }else return "";
+        }else return "";
+    }
+
+    public String getTelEnqueteur(){
+        if(this.user !=null){
+            return this.user.getTel();
+        }else return "";
+    }
+
+    public String getStructureEnqueteur(){
+        if(this.user !=null){
+            return this.user.getStructure().getNom();
+        }else return "";
+    }
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheParcelleResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheParcelleResponse.java
new file mode 100644
index 0000000..60aab55
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheParcelleResponse.java
@@ -0,0 +1,4 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+public class FicheParcelleResponse {
+}
diff --git a/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheUniteLogementResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheUniteLogementResponse.java
new file mode 100644
index 0000000..f7fd3d5
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/FicheResponse/FicheUniteLogementResponse.java
@@ -0,0 +1,18 @@
+package io.gmss.fiscad.paylaods.response.FicheResponse;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Setter
+@Getter
+public class FicheUniteLogementResponse {
+
+    private Long id;
+    private String nul;
+    private String numeroEtage;
+    private String code;
+    //private Batiment batiment;
+    private Long idDerniereEnquete;
+}
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/GenericIDResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/GenericIDResponse.java
similarity index 59%
rename from src/main/java/io/gmss/infocad/paylaods/response/GenericIDResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/GenericIDResponse.java
index 185fa23..3c9f1f8 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/GenericIDResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/GenericIDResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface GenericIDResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionSourceSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionSourceSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java
index 97a1146..3b7aabd 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionSourceSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionSourceSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface ModesAcquisitionSourceSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java
similarity index 78%
rename from src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java
index 53d6e64..86aba56 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/ModesAcquisitionTypePersonneSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface ModesAcquisitionTypePersonneSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/NatureDomaineSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/paylaods/response/NatureDomaineSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java
index 4302a68..740cc50 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/NatureDomaineSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/NatureDomaineSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface NatureDomaineSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/QuartierSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/response/QuartierSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java
index 65009bc..8061186 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/QuartierSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/QuartierSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface QuartierSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/ReferencesSyncResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/paylaods/response/ReferencesSyncResponses.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java
index 06925fc..91cd040 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/ReferencesSyncResponses.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/ReferencesSyncResponses.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
-import io.gmss.infocad.entities.decoupage.Nationalite;
-import io.gmss.infocad.entities.infocad.parametre.*;
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.entities.infocad.parametre.*;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/SourceDroitsSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/paylaods/response/SourceDroitsSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java
index 82c7f31..5a7f075 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/SourceDroitsSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/SourceDroitsSyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface SourceDroitsSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminDecoupageResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminDecoupageResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java
index 434982b..95055d7 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminDecoupageResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminDecoupageResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface StatEnqueteAdminDecoupageResponse {
     public String getArrondissement();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminStructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminStructureResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java
index 6e7777e..0d50d08 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteAdminStructureResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteAdminStructureResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface StatEnqueteAdminStructureResponse {
     public String getStructure();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParBlocResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParBlocResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java
index c956c3d..20ceb0f 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParBlocResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParBlocResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface StatEnqueteParBlocResponse {
     public String getBloc();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParStatutResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParStatutResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java
index 3afac5b..4165231 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/StatEnqueteParStatutResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/StatEnqueteParStatutResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface StatEnqueteParStatutResponse {
     public String getStatutEnquete();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/StructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/StructureResponse.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/paylaods/response/StructureResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/StructureResponse.java
index 8fdd7ca..0112bee 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/StructureResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/StructureResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface StructureResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/SyncEnqueteAllDataResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/paylaods/response/SyncEnqueteAllDataResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java
index 4ff3f3a..c10dfb6 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/SyncEnqueteAllDataResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/SyncEnqueteAllDataResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/SyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/paylaods/response/SyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java
index 87e5a2a..53a4d31 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/SyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/SyncResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java
similarity index 84%
rename from src/main/java/io/gmss/infocad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java
index 5fbc8da..a64414f 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/TypePersonneNatureDomaineSyncResponse.java
@@ -1,5 +1,5 @@
 
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 public interface TypePersonneNatureDomaineSyncResponse {
     public Long getId();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageEnqResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageEnqResponses.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java
index e091269..232e31e 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageEnqResponses.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageEnqResponses.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageSyncResponses.java b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageSyncResponses.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java
index 30f6e8e..d931235 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/UserDecoupageSyncResponses.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/UserDecoupageSyncResponses.java
@@ -1,5 +1,5 @@
 
-package io.gmss.infocad.paylaods.response;
+package io.gmss.fiscad.paylaods.response;
 
 import lombok.Data;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/report/BlocsParStructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/report/BlocsParStructureResponse.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/paylaods/response/report/BlocsParStructureResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/report/BlocsParStructureResponse.java
index 4bb2559..3accf51 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/report/BlocsParStructureResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/report/BlocsParStructureResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response.report;
+package io.gmss.fiscad.paylaods.response.report;
 
 public interface BlocsParStructureResponse {
     public String getCode();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/report/EnqueteParBlocResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/report/EnqueteParBlocResponse.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/paylaods/response/report/EnqueteParBlocResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/report/EnqueteParBlocResponse.java
index af949d3..261287b 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/report/EnqueteParBlocResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/report/EnqueteParBlocResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response.report;
+package io.gmss.fiscad.paylaods.response.report;
 
 public interface EnqueteParBlocResponse {
     public String getNupProvisoire();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/report/ZoneInterventionParStructureResponse.java b/src/main/java/io/gmss/fiscad/paylaods/response/report/ZoneInterventionParStructureResponse.java
similarity index 79%
rename from src/main/java/io/gmss/infocad/paylaods/response/report/ZoneInterventionParStructureResponse.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/report/ZoneInterventionParStructureResponse.java
index b17886f..3d251fe 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/report/ZoneInterventionParStructureResponse.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/report/ZoneInterventionParStructureResponse.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response.report;
+package io.gmss.fiscad.paylaods.response.report;
 
 public interface ZoneInterventionParStructureResponse {
     public String getDepartement();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/ActeurConcernePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/ActeurConcernePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java
index 57da3f5..1ac7c23 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/ActeurConcernePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ActeurConcernePayLoad.java
@@ -1,10 +1,9 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
-import io.gmss.infocad.enums.RoleActeur;
-import io.gmss.infocad.enums.TypeDroit;
-
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import io.gmss.fiscad.enums.RoleActeur;
+import io.gmss.fiscad.enums.TypeDroit;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
 
 public interface ActeurConcernePayLoad {
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/EnquetePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java
similarity index 81%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/EnquetePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java
index 5effe63..cb40f0a 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/EnquetePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/EnquetePayLoad.java
@@ -1,12 +1,12 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
-import io.gmss.infocad.enums.StatusEnquete;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.enums.StatusEnquete;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import java.time.LocalDate;
 
 public interface EnquetePayLoad {
@@ -45,12 +45,12 @@ public interface EnquetePayLoad {
     public String getEmplacement();
     public float getAltitude();
     public float getPrecision();
-    public byte getNbreCoProprietaire();
-    public byte getNbreIndivisiaire();
+    public int getNbreCoProprietaire();
+    public int getNbreIndivisiaire();
     public String getAutreAdresse();
     public String getSurface();
-    public byte getNbreBatiment();
-    public byte getNbrePiscine();
+    public int getNbreBatiment();
+    public int getNbrePiscine();
     public LocalDate getDateDebutExcemption();
     public LocalDate getDateFinExcemption();
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/MembreGroupePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/MembreGroupePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java
index 83cfdfb..e7368de 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/MembreGroupePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/MembreGroupePayLoad.java
@@ -1,5 +1,5 @@
 
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
 public interface MembreGroupePayLoad {
     public Long getIdBackend();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/ParcellePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/ParcellePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java
index 9215484..8e90923 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/ParcellePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/ParcellePayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
 public interface ParcellePayLoad {
     public Long getIdBackend();
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/PersonnePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PersonnePayLoad.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/PersonnePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/PersonnePayLoad.java
index 5698adf..5b32b95 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/PersonnePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PersonnePayLoad.java
@@ -1,9 +1,8 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
-import io.gmss.infocad.enums.Categorie;
-
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import io.gmss.fiscad.enums.Categorie;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
 
 public interface PersonnePayLoad {
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/PiecePayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/PiecePayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java
index 0003ca6..f90b10c 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/PiecePayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/PiecePayLoad.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.infocad.deserializer.LocalDateDeserializer;
+import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/restoration/UploadPayLoad.java b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/paylaods/response/restoration/UploadPayLoad.java
rename to src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java
index fa486f9..05cdaec 100644
--- a/src/main/java/io/gmss/infocad/paylaods/response/restoration/UploadPayLoad.java
+++ b/src/main/java/io/gmss/fiscad/paylaods/response/restoration/UploadPayLoad.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.paylaods.response.restoration;
+package io.gmss.fiscad.paylaods.response.restoration;
 
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/src/main/java/io/gmss/infocad/proprietes/FileStorageProperties.java b/src/main/java/io/gmss/fiscad/proprietes/FileStorageProperties.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/proprietes/FileStorageProperties.java
rename to src/main/java/io/gmss/fiscad/proprietes/FileStorageProperties.java
index b75c396..65682d0 100644
--- a/src/main/java/io/gmss/infocad/proprietes/FileStorageProperties.java
+++ b/src/main/java/io/gmss/fiscad/proprietes/FileStorageProperties.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.proprietes;
+package io.gmss.fiscad.proprietes;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/decoupage/ArrondissementRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/repositories/decoupage/ArrondissementRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java
index a0b91ac..8d9c6b7 100755
--- a/src/main/java/io/gmss/infocad/repositories/decoupage/ArrondissementRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/ArrondissementRepository.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.repositories.decoupage;
+package io.gmss.fiscad.repositories.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.paylaods.response.ArrondissementEnqResponse;
-import io.gmss.infocad.paylaods.response.ArrondissementSyncResponse;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.paylaods.response.ArrondissementEnqResponse;
+import io.gmss.fiscad.paylaods.response.ArrondissementSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/decoupage/CommuneRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/repositories/decoupage/CommuneRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java
index 9bcb9fa..2c6cb83 100755
--- a/src/main/java/io/gmss/infocad/repositories/decoupage/CommuneRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/CommuneRepository.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.repositories.decoupage;
+package io.gmss.fiscad.repositories.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.paylaods.response.CommuneEnqResponse;
-import io.gmss.infocad.paylaods.response.CommuneSyncResponse;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.paylaods.response.CommuneEnqResponse;
+import io.gmss.fiscad.paylaods.response.CommuneSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/decoupage/DepartementRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java
similarity index 71%
rename from src/main/java/io/gmss/infocad/repositories/decoupage/DepartementRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java
index 9bfdae1..c4cf479 100755
--- a/src/main/java/io/gmss/infocad/repositories/decoupage/DepartementRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/DepartementRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.decoupage;
+package io.gmss.fiscad.repositories.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Departement;
-import io.gmss.infocad.paylaods.response.DepartementSyncResponse;
+import io.gmss.fiscad.entities.decoupage.Departement;
+import io.gmss.fiscad.paylaods.response.DepartementSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/decoupage/NationaliteRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/repositories/decoupage/NationaliteRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java
index c11855e..b8bcb18 100755
--- a/src/main/java/io/gmss/infocad/repositories/decoupage/NationaliteRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/NationaliteRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.decoupage;
+package io.gmss.fiscad.repositories.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Nationalite;
+import io.gmss.fiscad.entities.decoupage.Nationalite;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/decoupage/QuartierRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/repositories/decoupage/QuartierRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java
index 105bc0b..3feaac6 100755
--- a/src/main/java/io/gmss/infocad/repositories/decoupage/QuartierRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.repositories.decoupage;
+package io.gmss.fiscad.repositories.decoupage;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Quartier;
-import io.gmss.infocad.paylaods.response.QuartierSyncResponse;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Quartier;
+import io.gmss.fiscad.paylaods.response.QuartierSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/ActeurConcerneRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java
similarity index 87%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/ActeurConcerneRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java
index a14bd28..54a2358 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/ActeurConcerneRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ActeurConcerneRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.paylaods.response.restoration.ActeurConcernePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
+import io.gmss.fiscad.paylaods.response.restoration.ActeurConcernePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -10,7 +10,7 @@ import java.util.Optional;
 
 public interface ActeurConcerneRepository extends JpaRepository<ActeurConcerne, Long> {
     Optional<ActeurConcerne> findFirstByExternalKey(Long externalKey);
-    List<ActeurConcerne> findActeurConcerneByEnqueteId(Long EnqueteId);
+    List<ActeurConcerne> findActeurConcerneByEnquete_Id(Long EnqueteId);
     Optional<ActeurConcerne> findFirstByExternalKeyAndTerminal_Id(Long externalKey,Long terminalId);
 
     @Query(value = "delete from acteur_concerne ac  where ac.id in (select ac.id from enquete e" +
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/CommentaireRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/CommentaireRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java
index 64dfeea..ce5d029 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/CommentaireRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/CommentaireRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Commentaire;
-import io.gmss.infocad.enums.Origine;
+import io.gmss.fiscad.entities.infocad.metier.Commentaire;
+import io.gmss.fiscad.enums.Origine;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/EnqueteRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/EnqueteRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java
index 844b93c..00b3106 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/EnqueteRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/EnqueteRepository.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.paylaods.response.*;
-import io.gmss.infocad.paylaods.response.report.EnqueteParBlocResponse;
-import io.gmss.infocad.paylaods.response.restoration.EnquetePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.paylaods.response.*;
+import io.gmss.fiscad.paylaods.response.report.EnqueteParBlocResponse;
+import io.gmss.fiscad.paylaods.response.restoration.EnquetePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -108,10 +108,10 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
             " a.nom as  arrondissement, " +
             " SUM(case when e.status_enquete='VALIDE' then 1 else 0 end) + " +
             " SUM(case when e.status_enquete='REJETE' then 1 else 0 end) + " +
-            " SUM(case when e.status_enquete='SYNCHRONISE' then 1 else 0 end)  as total, " +
+            " SUM(case when e.status_enquete='FINALISE' then 1 else 0 end)  as total, " +
             " SUM(case when e.status_enquete='VALIDE' then 1 else 0 end) as valide, " +
             " SUM(case when e.status_enquete='REJETE' then 1 else 0 end) as rejet, " +
-            " SUM(case when e.status_enquete='SYNCHRONISE' then 1 else 0 end) as synchronise " +
+            " SUM(case when e.status_enquete='FINALISE' then 1 else 0 end) as finalise " +
             " from enquete e " +
             " right join bloc b on b.id=e.bloc_id" +
             " right join arrondissement a on a.id=b.arrondissement_id" +
@@ -123,10 +123,10 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
             " s.nom as  structure, " +
             " SUM(case when e.status_enquete='VALIDE' then 1 else 0 end) + " +
             " SUM(case when e.status_enquete='REJETE' then 1 else 0 end) + " +
-            " SUM(case when e.status_enquete='SYNCHRONISE' then 1 else 0 end)  as total, " +
+            " SUM(case when e.status_enquete='FINALISE' then 1 else 0 end)  as total, " +
             " SUM(case when e.status_enquete='VALIDE' then 1 else 0 end) as valide, " +
             " SUM(case when e.status_enquete='REJETE' then 1 else 0 end) as rejet, " +
-            " SUM(case when e.status_enquete='SYNCHRONISE' then 1 else 0 end) as synchronise " +
+            " SUM(case when e.status_enquete='FINALISE' then 1 else 0 end) as finalise " +
             " from enquete e " +
             " right join bloc b on b.id=e.bloc_id" +
             " right join structure s on s.id=b.structure_id " +
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/MembreGroupeRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/MembreGroupeRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java
index 0e44421..0d55bcd 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/MembreGroupeRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/MembreGroupeRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
-import io.gmss.infocad.paylaods.response.restoration.MembreGroupePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
+import io.gmss.fiscad.paylaods.response.restoration.MembreGroupePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/ParcelleRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/ParcelleRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java
index 5fcf191..db48151 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/ParcelleRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Parcelle;
-import io.gmss.infocad.paylaods.response.restoration.ParcellePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.Parcelle;
+import io.gmss.fiscad.paylaods.response.restoration.ParcellePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/PieceRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java
similarity index 92%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/PieceRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java
index 72140d0..39a0fc8 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/PieceRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/PieceRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Piece;
-import io.gmss.infocad.paylaods.response.restoration.PiecePayLoad;
+import io.gmss.fiscad.entities.infocad.metier.Piece;
+import io.gmss.fiscad.paylaods.response.restoration.PiecePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/TpeRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java
similarity index 82%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/TpeRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java
index 4209dfd..1c48fd7 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/TpeRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/TpeRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/metier/UploadRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java
similarity index 86%
rename from src/main/java/io/gmss/infocad/repositories/infocad/metier/UploadRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java
index dd60314..236ec6f 100644
--- a/src/main/java/io/gmss/infocad/repositories/infocad/metier/UploadRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/UploadRepository.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.repositories.infocad.metier;
+package io.gmss.fiscad.repositories.infocad.metier;
 
-import io.gmss.infocad.entities.infocad.metier.Upload;
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.infocad.paylaods.response.restoration.UploadPayLoad;
+import io.gmss.fiscad.entities.infocad.metier.Upload;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.paylaods.response.restoration.UploadPayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/BlocRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java
similarity index 89%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/BlocRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java
index 27c6cea..d386f00 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/BlocRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/BlocRepository.java
@@ -1,11 +1,11 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.paylaods.response.BlocEnqResponse;
-import io.gmss.infocad.paylaods.response.BlocSyncResponse;
-import io.gmss.infocad.paylaods.response.report.BlocsParStructureResponse;
-import io.gmss.infocad.paylaods.response.report.ZoneInterventionParStructureResponse;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.paylaods.response.BlocEnqResponse;
+import io.gmss.fiscad.paylaods.response.BlocSyncResponse;
+import io.gmss.fiscad.paylaods.response.report.BlocsParStructureResponse;
+import io.gmss.fiscad.paylaods.response.report.ZoneInterventionParStructureResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface BlocRepository extends JpaRepository<Bloc, Long> {
     List<Bloc> findAllByStructure_Id(Long structureId);
-    @Query(value = "select b.id, b.cote, b.nom, b.arrondissement_id as arrondissementid " +
+    @Query(value = "select b.id, b.cote, b.nom, b.arrondissement_id as arrondissementid, b.quartier_id as quartierid " +
             " from bloc b" +
             " where b.deleted is false and b.structure_id = ?1 ",nativeQuery = true)
     List<BlocSyncResponse> getBlocResponse(Long structure_id);
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/ModeAcquisitionRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/ModeAcquisitionRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java
index 39453b9..9656245 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/ModeAcquisitionRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ModeAcquisitionRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
-import io.gmss.infocad.paylaods.response.ModesAcquisitionTypePersonneSyncResponse;
+import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
+import io.gmss.fiscad.paylaods.response.ModesAcquisitionTypePersonneSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/NatureDomaineRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java
similarity index 76%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/NatureDomaineRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java
index e8297f7..db68cf4 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/NatureDomaineRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/NatureDomaineRepository.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.infocad.paylaods.response.NatureDomaineSyncResponse;
-import io.gmss.infocad.paylaods.response.TypePersonneNatureDomaineSyncResponse;
+import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
+import io.gmss.fiscad.paylaods.response.NatureDomaineSyncResponse;
+import io.gmss.fiscad.paylaods.response.TypePersonneNatureDomaineSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/PersonneRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/PersonneRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java
index 5ddc7f4..b08a853 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/PersonneRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PersonneRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Personne;
-import io.gmss.infocad.paylaods.response.restoration.PersonnePayLoad;
+import io.gmss.fiscad.entities.infocad.parametre.Personne;
+import io.gmss.fiscad.paylaods.response.restoration.PersonnePayLoad;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/PositionRepresentationRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/PositionRepresentationRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java
index 3f2aca6..2425d5b 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/PositionRepresentationRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/PositionRepresentationRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
+import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PositionRepresentationRepository extends JpaRepository<PositionRepresentation, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/ProfessionRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java
similarity index 55%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/ProfessionRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java
index b29bda7..8b6a021 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/ProfessionRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/ProfessionRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Profession;
+import io.gmss.fiscad.entities.infocad.parametre.Profession;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ProfessionRepository extends JpaRepository<Profession, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationGeographiqueRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationGeographiqueRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java
index 38adf83..1bacb42 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationGeographiqueRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationGeographiqueRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
+import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SituationGeographiqueRepository extends JpaRepository<SituationGeographique, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationMatrimonialeRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationMatrimonialeRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java
index f6b7b58..dbe4f41 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SituationMatrimonialeRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SituationMatrimonialeRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SituationMatrimoniale;
+import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SituationMatrimonialeRepository extends JpaRepository<SituationMatrimoniale, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitExerceRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitExerceRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java
index 5578f64..6c3bec7 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitExerceRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitExerceRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroitExerce;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroitExerce;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SourceDroitExerceRepository extends JpaRepository<SourceDroitExerce, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java
similarity index 77%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java
index 66b7838..f5460ea 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/SourceDroitRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/SourceDroitRepository.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
-import io.gmss.infocad.paylaods.response.ModesAcquisitionSourceSyncResponse;
-import io.gmss.infocad.paylaods.response.SourceDroitsSyncResponse;
+import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
+import io.gmss.fiscad.paylaods.response.ModesAcquisitionSourceSyncResponse;
+import io.gmss.fiscad.paylaods.response.SourceDroitsSyncResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/StructureRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java
similarity index 80%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/StructureRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java
index 4c3c6c3..b6ac16c 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/StructureRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/StructureRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.paylaods.response.StructureResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.paylaods.response.StructureResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeContestationRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeContestationRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java
index 32e63c1..baf84f8 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeContestationRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeContestationRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TypeContestationRepository extends JpaRepository<TypeContestation, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeDomaineRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java
similarity index 55%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeDomaineRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java
index 162e5ca..b7e0136 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeDomaineRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeDomaineRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeDomaine;
+import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TypeDomaineRepository extends JpaRepository<TypeDomaine, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePersonneRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java
similarity index 60%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePersonneRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java
index 458fe9d..50323a1 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePersonneRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePersonneRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePersonne;
-import io.gmss.infocad.enums.Categorie;
+import io.gmss.fiscad.entities.infocad.parametre.TypePersonne;
+import io.gmss.fiscad.enums.Categorie;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePieceRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java
similarity index 55%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePieceRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java
index bb73680..0ad0acd 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypePieceRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypePieceRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypePiece;
+import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TypePieceRepository extends JpaRepository<TypePiece, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeRepresentationRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeRepresentationRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java
index 5d5149b..9cfc5f3 100755
--- a/src/main/java/io/gmss/infocad/repositories/infocad/parametre/TypeRepresentationRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/infocad/parametre/TypeRepresentationRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.infocad.parametre;
+package io.gmss.fiscad.repositories.infocad.parametre;
 
-import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
+import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TypeRepresentationRepository extends JpaRepository<TypeRepresentation, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/BatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/BatimentRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java
index 57e8d41..868e666 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/BatimentRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/BatimentRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.Batiment;
+import io.gmss.fiscad.entities.rfu.metier.Batiment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
similarity index 57%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
index 2a27a2c..e2811bd 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
diff --git a/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java
new file mode 100755
index 0000000..c8466a1
--- /dev/null
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java
@@ -0,0 +1,14 @@
+package io.gmss.fiscad.repositories.rfu.metier;
+
+import io.gmss.fiscad.entities.infocad.metier.Enquete;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+
+public interface CaracteristiqueParcelleRepository extends JpaRepository<CaracteristiqueParcelle, Long> {
+
+    void deleteAllByEnquete(Enquete enquete);
+    List<CaracteristiqueParcelle> findAllByEnquete_Id(Long id);
+}
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
similarity index 58%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
index c5f2e94..4c1d4e2 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java
similarity index 59%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteBatimentRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java
index 8594b80..2ecba74 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteBatimentRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteBatimentRepository.java
@@ -1,12 +1,15 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 
 public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment, Long> {
 
     Optional<EnqueteBatiment> findFirstByExternalKeyAndTerminal_Id(Long externalKey,Long TerminalId);
+
+    List<EnqueteBatiment> findAllByEnquete_Id(Long enqueteId);
 }
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteUniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
similarity index 60%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
index 9f2cf18..270eaf4 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
@@ -1,11 +1,13 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
+import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 
 public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUniteLogement, Long> {
     Optional<EnqueteUniteLogement> findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId);
+    List<EnqueteUniteLogement> findAllByEnquete_Id(Long id);
 }
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/UniteLogementRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/repositories/rfu/metier/UniteLogementRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java
index c733a26..43ec811 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/UniteLogementRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/metier/UniteLogementRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.rfu.metier;
+package io.gmss.fiscad.repositories.rfu.metier;
 
-import io.gmss.infocad.entities.rfu.metier.UniteLogement;
+import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/CampagneRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java
similarity index 60%
rename from src/main/java/io/gmss/infocad/repositories/rfu/parametre/CampagneRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java
index 10a9dc8..8a34220 100644
--- a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/CampagneRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CampagneRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.rfu.parametre;
+package io.gmss.fiscad.repositories.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Campagne;
-import io.gmss.infocad.enums.TypeCampagne;
+import io.gmss.fiscad.entities.rfu.parametre.Campagne;
+import io.gmss.fiscad.enums.TypeCampagne;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/CaracteristiqueRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java
similarity index 74%
rename from src/main/java/io/gmss/infocad/repositories/rfu/parametre/CaracteristiqueRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java
index 225a465..41985c1 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/CaracteristiqueRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/CaracteristiqueRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.rfu.parametre;
+package io.gmss.fiscad.repositories.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
+import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/EquipeRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java
similarity index 56%
rename from src/main/java/io/gmss/infocad/repositories/rfu/parametre/EquipeRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java
index 54f2388..22d658b 100644
--- a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/EquipeRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/EquipeRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.rfu.parametre;
+package io.gmss.fiscad.repositories.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.Equipe;
+import io.gmss.fiscad.entities.rfu.parametre.Equipe;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface EquipeRepository extends JpaRepository<Equipe, Long> {
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java
similarity index 67%
rename from src/main/java/io/gmss/infocad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java
index 761b68a..0ac6aaa 100755
--- a/src/main/java/io/gmss/infocad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/rfu/parametre/TypeCaracteristiqueRepository.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.repositories.rfu.parametre;
+package io.gmss.fiscad.repositories.rfu.parametre;
 
-import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
+import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/repositories/user/DemandeReinitialisationMPRepository.java b/src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java
similarity index 60%
rename from src/main/java/io/gmss/infocad/repositories/user/DemandeReinitialisationMPRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java
index cc8ddbb..9f68276 100755
--- a/src/main/java/io/gmss/infocad/repositories/user/DemandeReinitialisationMPRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/user/DemandeReinitialisationMPRepository.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.repositories.user;
+package io.gmss.fiscad.repositories.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.DemandeReinitialisationMP;
-import io.gmss.infocad.enums.EtatDemande;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.DemandeReinitialisationMP;
+import io.gmss.fiscad.enums.EtatDemande;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/repositories/user/RoleRepository.java b/src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java
similarity index 73%
rename from src/main/java/io/gmss/infocad/repositories/user/RoleRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java
index af89085..342bf2e 100755
--- a/src/main/java/io/gmss/infocad/repositories/user/RoleRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/user/RoleRepository.java
@@ -1,7 +1,7 @@
-package io.gmss.infocad.repositories.user;
+package io.gmss.fiscad.repositories.user;
 
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.enums.UserRole;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.enums.UserRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/io/gmss/infocad/repositories/user/UserRepository.java b/src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java
similarity index 69%
rename from src/main/java/io/gmss/infocad/repositories/user/UserRepository.java
rename to src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java
index c02af05..d67d1d6 100755
--- a/src/main/java/io/gmss/infocad/repositories/user/UserRepository.java
+++ b/src/main/java/io/gmss/fiscad/repositories/user/UserRepository.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.repositories.user;
+package io.gmss.fiscad.repositories.user;
 
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.entities.user.Role;
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.enums.UserRole;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.user.Role;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.enums.UserRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/gmss/infocad/security/CurrentUser.java b/src/main/java/io/gmss/fiscad/security/CurrentUser.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/security/CurrentUser.java
rename to src/main/java/io/gmss/fiscad/security/CurrentUser.java
index 5c1beb1..dfcf0bb 100755
--- a/src/main/java/io/gmss/infocad/security/CurrentUser.java
+++ b/src/main/java/io/gmss/fiscad/security/CurrentUser.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 
diff --git a/src/main/java/io/gmss/infocad/security/CustomUserDetailsService.java b/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java
similarity index 72%
rename from src/main/java/io/gmss/infocad/security/CustomUserDetailsService.java
rename to src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java
index d4623a6..33db96d 100755
--- a/src/main/java/io/gmss/infocad/security/CustomUserDetailsService.java
+++ b/src/main/java/io/gmss/fiscad/security/CustomUserDetailsService.java
@@ -1,8 +1,8 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.repositories.user.RoleRepository;
-import io.gmss.infocad.repositories.user.UserRepository;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.repositories.user.UserRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -10,16 +10,12 @@ import org.springframework.stereotype.Service;
 
 
 @Service
+@RequiredArgsConstructor
 public class CustomUserDetailsService implements UserDetailsService {
 
 	
     private final UserRepository userRepository;
-	private final RoleRepository roleRepository;
 
-	public CustomUserDetailsService(UserRepository userRepository, RoleRepository roleRepository) {
-		this.userRepository = userRepository;
-		this.roleRepository = roleRepository;
-	}
 
 	@Override
 	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
diff --git a/src/main/java/io/gmss/infocad/security/JwtAuthenticationEntryPoint.java b/src/main/java/io/gmss/fiscad/security/JwtAuthenticationEntryPoint.java
similarity index 83%
rename from src/main/java/io/gmss/infocad/security/JwtAuthenticationEntryPoint.java
rename to src/main/java/io/gmss/fiscad/security/JwtAuthenticationEntryPoint.java
index 684fd09..b75d802 100755
--- a/src/main/java/io/gmss/infocad/security/JwtAuthenticationEntryPoint.java
+++ b/src/main/java/io/gmss/fiscad/security/JwtAuthenticationEntryPoint.java
@@ -1,21 +1,21 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Component
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
 	private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);
-	
+
 	@Override
 	public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException authExcp)
 			throws IOException, ServletException {
diff --git a/src/main/java/io/gmss/infocad/security/JwtAuthenticationFilter.java b/src/main/java/io/gmss/fiscad/security/JwtAuthenticationFilter.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/security/JwtAuthenticationFilter.java
rename to src/main/java/io/gmss/fiscad/security/JwtAuthenticationFilter.java
index b993970..c2eb8e8 100755
--- a/src/main/java/io/gmss/infocad/security/JwtAuthenticationFilter.java
+++ b/src/main/java/io/gmss/fiscad/security/JwtAuthenticationFilter.java
@@ -1,5 +1,9 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -8,10 +12,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
diff --git a/src/main/java/io/gmss/infocad/security/TokenAuthentificationProvider.java b/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java
similarity index 93%
rename from src/main/java/io/gmss/infocad/security/TokenAuthentificationProvider.java
rename to src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java
index ff30661..4a847b2 100755
--- a/src/main/java/io/gmss/infocad/security/TokenAuthentificationProvider.java
+++ b/src/main/java/io/gmss/fiscad/security/TokenAuthentificationProvider.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
-import io.gmss.infocad.entities.user.User;
-import io.gmss.infocad.paylaods.JwtAuthenticationResponse;
-import io.gmss.infocad.paylaods.UserResponse;
-import io.gmss.infocad.repositories.user.UserRepository;
+import io.gmss.fiscad.entities.user.User;
+import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
+import io.gmss.fiscad.paylaods.UserResponse;
+import io.gmss.fiscad.repositories.user.UserRepository;
 import io.jsonwebtoken.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/gmss/infocad/security/UserPrincipal.java b/src/main/java/io/gmss/fiscad/security/UserPrincipal.java
similarity index 96%
rename from src/main/java/io/gmss/infocad/security/UserPrincipal.java
rename to src/main/java/io/gmss/fiscad/security/UserPrincipal.java
index 1f92ad3..e9e0491 100755
--- a/src/main/java/io/gmss/infocad/security/UserPrincipal.java
+++ b/src/main/java/io/gmss/fiscad/security/UserPrincipal.java
@@ -1,6 +1,6 @@
-package io.gmss.infocad.security;
+package io.gmss.fiscad.security;
 
-import io.gmss.infocad.entities.user.User;
+import io.gmss.fiscad.entities.user.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
diff --git a/src/main/java/io/gmss/infocad/service/FileStorageService.java b/src/main/java/io/gmss/fiscad/service/FileStorageService.java
similarity index 93%
rename from src/main/java/io/gmss/infocad/service/FileStorageService.java
rename to src/main/java/io/gmss/fiscad/service/FileStorageService.java
index c6587b8..b6f855e 100644
--- a/src/main/java/io/gmss/infocad/service/FileStorageService.java
+++ b/src/main/java/io/gmss/fiscad/service/FileStorageService.java
@@ -1,9 +1,9 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
-import io.gmss.infocad.exceptions.FileStorageException;
-import io.gmss.infocad.exceptions.MyFileNotFoundException;
-import io.gmss.infocad.proprietes.FileStorageProperties;
-import io.gmss.infocad.utils.FileNameGenerator;
+import io.gmss.fiscad.exceptions.FileStorageException;
+import io.gmss.fiscad.exceptions.MyFileNotFoundException;
+import io.gmss.fiscad.proprietes.FileStorageProperties;
+import io.gmss.fiscad.utils.FileNameGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
diff --git a/src/main/java/io/gmss/infocad/service/GeometryService.java b/src/main/java/io/gmss/fiscad/service/GeometryService.java
similarity index 96%
rename from src/main/java/io/gmss/infocad/service/GeometryService.java
rename to src/main/java/io/gmss/fiscad/service/GeometryService.java
index 8fba8df..be55bbd 100644
--- a/src/main/java/io/gmss/infocad/service/GeometryService.java
+++ b/src/main/java/io/gmss/fiscad/service/GeometryService.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
 //import org.locationtech.jts.geom.GeometryFactory;
 //import org.locationtech.jts.geom.Point;
diff --git a/src/main/java/io/gmss/infocad/service/PasswordGenerator.java b/src/main/java/io/gmss/fiscad/service/PasswordGenerator.java
similarity index 95%
rename from src/main/java/io/gmss/infocad/service/PasswordGenerator.java
rename to src/main/java/io/gmss/fiscad/service/PasswordGenerator.java
index 98020b3..9c1d04a 100644
--- a/src/main/java/io/gmss/infocad/service/PasswordGenerator.java
+++ b/src/main/java/io/gmss/fiscad/service/PasswordGenerator.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/io/gmss/infocad/service/RandomEnumGenerator.java b/src/main/java/io/gmss/fiscad/service/RandomEnumGenerator.java
similarity index 91%
rename from src/main/java/io/gmss/infocad/service/RandomEnumGenerator.java
rename to src/main/java/io/gmss/fiscad/service/RandomEnumGenerator.java
index 7a8b932..2a3e902 100644
--- a/src/main/java/io/gmss/infocad/service/RandomEnumGenerator.java
+++ b/src/main/java/io/gmss/fiscad/service/RandomEnumGenerator.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
 import java.util.Random;
 
diff --git a/src/main/java/io/gmss/infocad/service/ReportService.java b/src/main/java/io/gmss/fiscad/service/ReportService.java
similarity index 90%
rename from src/main/java/io/gmss/infocad/service/ReportService.java
rename to src/main/java/io/gmss/fiscad/service/ReportService.java
index 3e11f69..5d79c5c 100644
--- a/src/main/java/io/gmss/infocad/service/ReportService.java
+++ b/src/main/java/io/gmss/fiscad/service/ReportService.java
@@ -1,21 +1,23 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
-import io.gmss.infocad.entities.decoupage.Arrondissement;
-import io.gmss.infocad.entities.decoupage.Commune;
-import io.gmss.infocad.entities.infocad.metier.EnqueteFiltreResponse;
-import io.gmss.infocad.entities.infocad.parametre.Bloc;
-import io.gmss.infocad.entities.infocad.parametre.Structure;
-import io.gmss.infocad.enums.FormatRapport;
-import io.gmss.infocad.enums.RoleActeur;
-import io.gmss.infocad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.infocad.paylaods.response.report.BlocsParStructureResponse;
-import io.gmss.infocad.paylaods.response.report.EnqueteParBlocResponse;
-import io.gmss.infocad.repositories.decoupage.ArrondissementRepository;
-import io.gmss.infocad.repositories.decoupage.CommuneRepository;
-import io.gmss.infocad.repositories.infocad.metier.EnqueteRepository;
-import io.gmss.infocad.repositories.infocad.parametre.BlocRepository;
-import io.gmss.infocad.repositories.infocad.parametre.StructureRepository;
+import io.gmss.fiscad.entities.decoupage.Arrondissement;
+import io.gmss.fiscad.entities.decoupage.Commune;
+import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
+import io.gmss.fiscad.entities.infocad.parametre.Bloc;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.enums.FormatRapport;
+import io.gmss.fiscad.enums.RoleActeur;
+import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
+import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
+import io.gmss.fiscad.paylaods.response.report.BlocsParStructureResponse;
+import io.gmss.fiscad.paylaods.response.report.EnqueteParBlocResponse;
+import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository;
+import io.gmss.fiscad.repositories.decoupage.CommuneRepository;
+import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
@@ -27,8 +29,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.sql.SQLException;
 import java.util.HashMap;
diff --git a/src/main/java/io/gmss/infocad/service/StringManager.java b/src/main/java/io/gmss/fiscad/service/StringManager.java
similarity index 94%
rename from src/main/java/io/gmss/infocad/service/StringManager.java
rename to src/main/java/io/gmss/fiscad/service/StringManager.java
index 48a6ae7..72a01f4 100644
--- a/src/main/java/io/gmss/infocad/service/StringManager.java
+++ b/src/main/java/io/gmss/fiscad/service/StringManager.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/io/gmss/infocad/service/StringService.java b/src/main/java/io/gmss/fiscad/service/StringService.java
similarity index 96%
rename from src/main/java/io/gmss/infocad/service/StringService.java
rename to src/main/java/io/gmss/fiscad/service/StringService.java
index 9e0ce5a..4b6028f 100644
--- a/src/main/java/io/gmss/infocad/service/StringService.java
+++ b/src/main/java/io/gmss/fiscad/service/StringService.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.service;
+package io.gmss.fiscad.service;
 
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/io/gmss/infocad/utils/FileNameGenerator.java b/src/main/java/io/gmss/fiscad/utils/FileNameGenerator.java
similarity index 88%
rename from src/main/java/io/gmss/infocad/utils/FileNameGenerator.java
rename to src/main/java/io/gmss/fiscad/utils/FileNameGenerator.java
index 5c9492b..784d009 100644
--- a/src/main/java/io/gmss/infocad/utils/FileNameGenerator.java
+++ b/src/main/java/io/gmss/fiscad/utils/FileNameGenerator.java
@@ -1,4 +1,4 @@
-package io.gmss.infocad.utils;
+package io.gmss.fiscad.utils;
 
 import java.util.UUID;
 
diff --git a/src/main/java/io/gmss/infocad/configuration/SpringSecurityConfig.java b/src/main/java/io/gmss/infocad/configuration/SpringSecurityConfig.java
deleted file mode 100755
index 005e7c7..0000000
--- a/src/main/java/io/gmss/infocad/configuration/SpringSecurityConfig.java
+++ /dev/null
@@ -1,208 +0,0 @@
-//package io.artcreativity.ifudistribution.config;
-//
-//import io.artcreativity.ifudistribution.security.CustomUserDetailsService;
-//import io.artcreativity.ifudistribution.security.JwtAuthenticationEntryPoint;
-//import io.artcreativity.ifudistribution.security.JwtAuthenticationFilter;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.http.HttpMethod;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.config.BeanIds;
-//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-//import org.springframework.security.config.http.SessionCreationPolicy;
-//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-//import org.springframework.security.crypto.password.PasswordEncoder;
-//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-//
-//@EnableWebSecurity
-//@Configuration
-//public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
-//
-//    private final CustomUserDetailsService customUserDetailsService;
-//    private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
-//
-//    public SpringSecurityConfig(CustomUserDetailsService customUserDetailsService, JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint) {
-//        this.customUserDetailsService = customUserDetailsService;
-//        this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint;
-//    }
-//
-//    @Override
-//    public void configure(AuthenticationManagerBuilder auth) throws Exception {
-////        auth.userDetailsService(customUserDetailsService)
-////                .passwordEncoder(getPasswordEncoder());
-//
-//        auth
-//                .ldapAuthentication()
-//                .userDnPatterns("uid={0},ou=people")
-//                .groupSearchBase("ou=groups")
-//                .contextSource()
-//                .url("ldap://localhost:5645/dc=artcreativity,dc=io")
-//                .and()
-//                .passwordCompare()
-//                .passwordEncoder(getPasswordEncoder())
-//            .passwordAttribute("userPassword");
-//    }
-//
-//    @Bean(BeanIds.AUTHENTICATION_MANAGER)
-//    @Override
-//    public AuthenticationManager authenticationManagerBean() throws Exception{
-//        return super.authenticationManagerBean();
-//    }
-//
-//    @Bean
-//    public PasswordEncoder getPasswordEncoder(){
-//        return new BCryptPasswordEncoder();
-//    }
-//
-//    @Bean
-//    JwtAuthenticationFilter jwtAuthenticationFilter(){
-//        return new JwtAuthenticationFilter();
-//    }
-//
-//    private static final String[] AUTH_WHITELIST = {
-//
-//            // -- swagger ui
-//            "/swagger-resources/**",
-//            "/swagger-ui.html",
-//            "/swagger-ui/**",
-//            "/springfox/**",
-//            "/v3/api-docs",
-//            "/v2/api-docs",
-//            "/webjars/**",
-//            "/api/auth/**",
-//            "/api/contribuable/**",
-//            "/api/auth/login"
-//    };
-//
-//    @Override
-//    protected void configure(HttpSecurity http) throws Exception {
-//        http
-//                .cors()
-//                .and()
-//                .csrf()
-//                .disable()
-//                .exceptionHandling()
-//                .authenticationEntryPoint(jwtAuthenticationEntryPoint)
-//                .and()
-////                .sessionManagement()
-////                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-////                .and()
-//                .authorizeRequests()
-//                .antMatchers("/",
-//                        "/favicon.ico",
-//                        "/**/*.png",
-//                        "/**/*.gif",
-//                        "/**/*.svg",
-//                        "/**/*.jpg",
-//                        "/**/*.html",
-//                        "/**/*.css",
-//                        "/**/*.js")
-//                .permitAll()
-//                .antMatchers(AUTH_WHITELIST).permitAll()
-//                .antMatchers(HttpMethod.GET, "/api/polls/**", "/api/users/**")
-//                .permitAll()
-//                .anyRequest()
-//                .authenticated();
-//
-//        http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
-//    }
-//
-//}
-
-package io.gmss.infocad.configuration;
-
-import io.gmss.infocad.security.CustomUserDetailsService;
-import io.gmss.infocad.security.JwtAuthenticationEntryPoint;
-import io.gmss.infocad.security.JwtAuthenticationFilter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.BeanIds;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-@EnableWebSecurity
-@Configuration
-@EnableGlobalMethodSecurity(securedEnabled = true, jsr250Enabled = true, prePostEnabled = true)
-public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    private final CustomUserDetailsService customUserDetailsService;
-    private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
-
-
-    public SpringSecurityConfig(CustomUserDetailsService customUserDetailsService,
-                                JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint) {
-        this.customUserDetailsService = customUserDetailsService;
-        this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint;
-    }
-
-    @Override
-    public void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(customUserDetailsService)
-                .passwordEncoder(getPasswordEncoder());
-    }
-
-    @Bean
-    public PasswordEncoder getPasswordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-    @Bean
-    public JwtAuthenticationFilter jwtAuthenticationFilter() {
-        return new JwtAuthenticationFilter();
-    }
-
-    @Bean(BeanIds.AUTHENTICATION_MANAGER)
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
-
-
-    private static final String[] AUTH_WHITELIST = {
-
-            // -- CSS and JS
-            "/","/favicon.ico","/**/*.png","/**/*.gif","/**/*.svg","/**/*.jpg","/**/*.html","/**/*.css","/**/*.js",
-
-            // -- swagger ui
-            "/v2/api-docs", "/configuration/**", "/swagger-resources/**",  "/swagger-ui.html", "/swagger-ui/**", "/webjars/**", "/api-docs/**", "/springfox/**", "/v3/api-docs",
-
-            // -- Login
-            "/api/**"
-            //"/api/auth/**"
-    };
-
-    @Override
-    public void configure(HttpSecurity http) throws Exception {
-
-        http
-                .cors()
-                .and()
-                .csrf()
-                .disable()
-                .exceptionHandling()
-                .authenticationEntryPoint(jwtAuthenticationEntryPoint)
-                .and()
-                .sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .authorizeRequests()
-                .antMatchers(AUTH_WHITELIST)
-                .permitAll()
-                .anyRequest()
-                .authenticated();
-
-
-        http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
-    }
-}
diff --git a/src/main/java/io/gmss/infocad/configuration/SwaggerConfig.java b/src/main/java/io/gmss/infocad/configuration/SwaggerConfig.java
deleted file mode 100755
index 5434b3e..0000000
--- a/src/main/java/io/gmss/infocad/configuration/SwaggerConfig.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.gmss.infocad.configuration;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger.web.*;
-
-@Configuration
-//@Import(SpringDataRestConfiguration.class)
-public class SwaggerConfig {
-    @Bean
-    public Docket api() {
-        return new Docket(DocumentationType.OAS_30)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("io.gmss.infocad.controllers")).paths(PathSelectors.any()).build().apiInfo(this.getApiInfo());
-//                .securitySchemes(this.securitySchemes())
-//                .securityContexts(Arrays.asList(this.securityContext()));
-    }
-
-
-
-//    public SecurityContext securityContext() {
-//        AuthorizationScope[] scopes = { new AuthorizationScope("read", "for read operation"),
-//                new AuthorizationScope("write", "for write operation") };
-//        List<SecurityReference> securityReferences = Arrays.asList(new SecurityReference("basicAuth", scopes),
-//                new SecurityReference("Key", scopes), new SecurityReference("Authorization", scopes));
-//        return SecurityContext.builder().securityReferences(securityReferences)
-//                .forPaths(PathSelectors.any())
-//                .build();
-//    }
-
-//    public List<SecurityScheme> securitySchemes() {
-//        // SecurityScheme basicAuth = new BasicAuth("basicAuth");
-//        SecurityScheme userAuthToken = new ApiKey("Authorization", "Authorization", "header");
-//        //  SecurityScheme keyAuth = new ApiKey("Key", "Key", "header");
-//        return Arrays.asList(
-//                // keyAuth,
-//                userAuthToken
-//                //, basicAuth
-//        );
-//    }
-
-    @Bean
-    public UiConfiguration uiConfig() {
-        return UiConfigurationBuilder.builder()
-                .deepLinking(true)
-                .displayOperationId(false)
-                .defaultModelsExpandDepth(1)
-                .defaultModelExpandDepth(1)
-                .displayRequestDuration(false)
-                .docExpansion(DocExpansion.LIST) // Use 'LIST', 'FULL', or 'NONE'
-                .filter(false)
-                .maxDisplayedTags(100) // Set the maximum number of tags to display
-                .operationsSorter(OperationsSorter.ALPHA) // Use 'ALPHA' or 'METHOD'
-                .showExtensions(false)
-                .tagsSorter(TagsSorter.ALPHA) // Use 'ALPHA'
-                .validatorUrl(null)
-                .build();
-    }
-
-    private ApiInfo getApiInfo() {
-    Contact contact = new Contact("INFOCAD", "https://gmss.com/", "contact@gmss.com");
-        return new ApiInfoBuilder()
-                .title("LIST OF API")
-                .description("This page show all ressources that you could handle to communicate with database via REST API.")
-                .version("1.0")
-                .license("INFOCAD v.1.0")
-                .licenseUrl("https://www.apache.org/licenses/LICENSE-3.0")
-                .contact(contact)
-                .build();
-    }
-}
diff --git a/src/main/java/io/gmss/infocad/configuration/WebConfig.java b/src/main/java/io/gmss/infocad/configuration/WebConfig.java
deleted file mode 100644
index 24857f0..0000000
--- a/src/main/java/io/gmss/infocad/configuration/WebConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.gmss.infocad.configuration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-@EnableWebMvc
-public class WebConfig implements WebMvcConfigurer {
-
-    private final long MAX_AGE_SECS = 3600;
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE")
-                .maxAge(MAX_AGE_SECS);
-    }
-}
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/EnquetePayLoadResponse.java b/src/main/java/io/gmss/infocad/paylaods/response/EnquetePayLoadResponse.java
deleted file mode 100644
index a80c972..0000000
--- a/src/main/java/io/gmss/infocad/paylaods/response/EnquetePayLoadResponse.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.gmss.infocad.paylaods.response;
-
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-
-public class EnquetePayLoadResponse {
-    private Enquete enquete;
-
-}
-
diff --git a/src/main/java/io/gmss/infocad/paylaods/response/FicheEnqueteResponse.java b/src/main/java/io/gmss/infocad/paylaods/response/FicheEnqueteResponse.java
deleted file mode 100644
index 8730a6f..0000000
--- a/src/main/java/io/gmss/infocad/paylaods/response/FicheEnqueteResponse.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.gmss.infocad.paylaods.response;
-
-import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FicheEnqueteResponse {
-    private Enquete enquete ;
-    private List<ActeurConcerne> acteurConcernes;
-}
-
diff --git a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java b/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java
deleted file mode 100755
index 610049a..0000000
--- a/src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.gmss.infocad.repositories.rfu.metier;
-
-import io.gmss.infocad.entities.infocad.metier.Enquete;
-import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-
-public interface CaracteristiqueParcelleRepository extends JpaRepository<CaracteristiqueParcelle, Long> {
-
-    void deleteAllByEnquete(Enquete enquete);
-}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2cdfab7..838bb60 100755
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 spring.jpa.properties.hibernate.id.new_generator_mappings=false
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.datasource.url=jdbc:postgresql://vmi792116.contaboserver.net:5599/abomey_db
 spring.datasource.username=infocad_user
 spring.datasource.password=W5fwD({9*q53
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-
+spring.jpa.open-in-view=false
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
 jwt.jwtSecret=ImThEVeryB@dS@lt@302839_
 jwt.jwtExpirationInMs=7776000000
 spring.application.name=infocad
-logging.file.name=infocad.log
+logging.file.name=fiscad.log
 logging.level.org.springframework.security=DEBUG
 app.sourcemind.env.defaultpassword=1234567890
 app.sourcemind.env.resetlink=http://localhost:4200/reset-password/
@@ -49,3 +49,7 @@ server.port=8282
 spring.mvc.contentnegotiation.favor-parameter=false
 spring.mvc.contentnegotiation.parameter-name=mediaType
 spring.mvc.contentnegotiation.ignore-unknown-path-extensions=true
+
+
+springdoc.swagger-ui.defaultModelsExpandDepth=-1
+springdoc.swagger-ui.docExpansion=none
\ No newline at end of file
diff --git a/src/test/java/io/gmss/infocad/IfuDistributionApplicationTests.java b/src/test/java/io/gmss/fiscad/IfuDistributionApplicationTests.java
similarity index 100%
rename from src/test/java/io/gmss/infocad/IfuDistributionApplicationTests.java
rename to src/test/java/io/gmss/fiscad/IfuDistributionApplicationTests.java