diff --git a/pom.xml b/pom.xml
index 5f4bf553..12744a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
 			<releases>
 	            <enabled>true</enabled>
 	            <updatePolicy>always</updatePolicy>
-	            <checksumPolicy>warn</checksumPolicy>
+	            <checksumPolicy>ignore</checksumPolicy>
           </releases>
 		</repository>
 			
@@ -703,7 +703,7 @@
 						<configuration>
 							<source>
 							<![CDATA[
-								def puMap = ['pun-jpa' : 'fr.univlorraine.ecandidat.entities']
+								def puMap = ['pun-jpa-ecandidat' : 'fr.univlorraine.ecandidat.entities.ecandidat', 'pun-jpa-apogee' : 'fr.univlorraine.ecandidat.entities.siscol.apogee']
 
 								println '[INFO] Generating file persistence.xml'
 								def directory = new File(project.build.directory + '/generated-persistenceinfo/META-INF')
diff --git a/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigApogee.java b/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigApogee.java
new file mode 100644
index 00000000..a183d8cc
--- /dev/null
+++ b/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigApogee.java
@@ -0,0 +1,158 @@
+/**
+ *  ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
+ *
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package fr.univlorraine.ecandidat.config;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.AdviceMode;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.EclipseLinkJpaDialect;
+import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import fr.univlorraine.ecandidat.entities.siscol.apogee.AnneeUni;
+import fr.univlorraine.ecandidat.utils.JpaConfigApogeeCondition;
+
+/**
+ * Configuration JPA
+ * @author Kevin Hergalant
+ */
+@Configuration
+@EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
+@Conditional(JpaConfigApogeeCondition.class)
+public class JpaConfigApogee {
+
+	public final static String PERSISTENCE_UNIT_NAME = "pun-jpa-apogee";
+
+	private final Logger logger = LoggerFactory.getLogger(JpaConfigApogee.class);
+
+	@Value("${showSql:false}")
+	private transient Boolean showSql;
+
+	@Value("${datasource.apogee.url:}")
+	private transient String dataSourceUrl;
+
+	@Value("${datasource.apogee.username:}")
+	private transient String dataSourceUserName;
+
+	@Value("${datasource.apogee.password:}")
+	private transient String dataSourcePassword;
+
+	@Value("${datasource.apogee.driver-class-name:}")
+	private transient String driverClassName;
+
+	@Value("${datasource.apogee.properties.max-pool-size:}")
+	private transient String maximumPoolSize;
+
+	@Value("${datasource.apogee.properties.test-query:}")
+	private transient String connectionTestQuery;
+
+	/**
+	 * @return Source de données
+	 */
+	@Bean(name = "dataSourceApogee")
+	public DataSource dataSourceApogee() {
+		if (StringUtils.isNotBlank(dataSourceUrl)) {
+			logger.info("Manually datasource configuration...");
+			final HikariConfig hikariConfig = new HikariConfig();
+			hikariConfig.setPoolName("poolHikariApogee");
+			hikariConfig.setJdbcUrl(dataSourceUrl);
+			hikariConfig.setUsername(dataSourceUserName);
+			hikariConfig.setPassword(dataSourcePassword);
+
+			/* Driver */
+			if (StringUtils.isNotBlank(driverClassName)) {
+				hikariConfig.setDriverClassName(driverClassName);
+			} else {
+				hikariConfig.setDriverClassName("oracle.jdbc.OracleDriver");
+			}
+
+			/* Gestion des properties */
+
+			/* Max pool Size */
+			if (StringUtils.isNotBlank(maximumPoolSize)) {
+				try {
+					hikariConfig.setMaximumPoolSize(Integer.parseInt(maximumPoolSize));
+				} catch (final Exception e) {
+				}
+			}
+			/* Test Query */
+			if (StringUtils.isNotBlank(connectionTestQuery)) {
+				hikariConfig.setConnectionTestQuery(connectionTestQuery);
+			}
+			return new HikariDataSource(hikariConfig);
+		} else {
+			logger.info("Automatic datasource Apogee configuration...");
+			final JndiDataSourceLookup dsLookup = new JndiDataSourceLookup();
+			return dsLookup.getDataSource("java:/comp/env/jdbc/dbSiScol");
+		}
+	}
+
+	/**
+	 * @return EntityManager Factory
+	 */
+	@Bean(name = "entityManagerFactoryApogee")
+	public LocalContainerEntityManagerFactoryBean entityManagerFactoryApogee() {
+		final DataSource ds = dataSourceApogee();
+
+		final LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
+		localContainerEntityManagerFactoryBean.setPersistenceUnitName(PERSISTENCE_UNIT_NAME);
+		localContainerEntityManagerFactoryBean.setPackagesToScan(AnneeUni.class.getPackage().getName());
+		localContainerEntityManagerFactoryBean.setDataSource(ds);
+		localContainerEntityManagerFactoryBean.setJpaDialect(new EclipseLinkJpaDialect());
+
+		final Properties jpaProperties = new Properties();
+		/* Active le static weaving d'EclipseLink */
+		jpaProperties.put(PersistenceUnitProperties.WEAVING, "static");
+		/* Désactive le cache partagé */
+		jpaProperties.put(PersistenceUnitProperties.CACHE_SHARED_DEFAULT, String.valueOf(false));
+		localContainerEntityManagerFactoryBean.setJpaProperties(jpaProperties);
+
+		final EclipseLinkJpaVendorAdapter jpaVendorAdapter = new EclipseLinkJpaVendorAdapter();
+		jpaVendorAdapter.setGenerateDdl(false);
+		jpaVendorAdapter.setShowSql(showSql);
+		localContainerEntityManagerFactoryBean.setJpaVendorAdapter(jpaVendorAdapter);
+
+		return localContainerEntityManagerFactoryBean;
+	}
+
+	/**
+	 * @return Transaction Manager
+	 */
+	@Bean(name = "transactionManagerApogee")
+	@Primary
+	public JpaTransactionManager transactionManagerApogee(final EntityManagerFactory entityManagerFactoryApogee) {
+		return new JpaTransactionManager(entityManagerFactoryApogee);
+	}
+}
diff --git a/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigEcandidat.java b/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigEcandidat.java
index e87f3960..7ad10d25 100644
--- a/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigEcandidat.java
+++ b/src/main/java/fr/univlorraine/ecandidat/config/JpaConfigEcandidat.java
@@ -43,7 +43,7 @@
 import com.zaxxer.hikari.HikariDataSource;
 
 import fr.univlorraine.ecandidat.entities.ecandidat.Candidat;
-import fr.univlorraine.ecandidat.entities.tools.LocalTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalTimePersistenceConverter;
 import fr.univlorraine.ecandidat.repositories.CandidatRepository;
 import fr.univlorraine.ecandidat.utils.ConstanteUtils;
 import fr.univlorraine.ecandidat.utils.migration.FlywayCallbackMigration;
@@ -73,23 +73,49 @@ public class JpaConfigEcandidat {
 	@Value("${datasource.ecandidat.password:}")
 	private transient String dataSourcePassword;
 
+	@Value("${datasource.ecandidat.driver-class-name:}")
+	private transient String driverClassName;
+
+	@Value("${datasource.ecandidat.properties.max-pool-size:}")
+	private transient String maximumPoolSize;
+
+	@Value("${datasource.ecandidat.properties.test-query:}")
+	private transient String connectionTestQuery;
+
 	/**
 	 * @return Source de données
 	 */
 	@Bean
+	@Primary
 	public DataSource dataSourceEcandidat() {
 		if (StringUtils.isNotBlank(dataSourceUrl)) {
 			logger.info("Manually datasource configuration...");
 			final HikariConfig hikariConfig = new HikariConfig();
-			hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver");
+			hikariConfig.setPoolName("poolHikariEcandidat");
 			hikariConfig.setJdbcUrl(dataSourceUrl);
 			hikariConfig.setUsername(dataSourceUserName);
 			hikariConfig.setPassword(dataSourcePassword);
 
-			hikariConfig.setMaximumPoolSize(5);
-			hikariConfig.setConnectionTestQuery("SELECT 1");
-			hikariConfig.setPoolName("springHikariCP");
-
+			/* Driver */
+			if (StringUtils.isNotBlank(driverClassName)) {
+				hikariConfig.setDriverClassName(driverClassName);
+			} else {
+				hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver");
+			}
+
+			/* Gestion des properties */
+
+			/* Max pool Size */
+			if (StringUtils.isNotBlank(maximumPoolSize)) {
+				try {
+					hikariConfig.setMaximumPoolSize(Integer.parseInt(maximumPoolSize));
+				} catch (final Exception e) {
+				}
+			}
+			/* Test Query */
+			if (StringUtils.isNotBlank(connectionTestQuery)) {
+				hikariConfig.setConnectionTestQuery(connectionTestQuery);
+			}
 			return new HikariDataSource(hikariConfig);
 		} else {
 			logger.info("Automatic datasource configuration...");
@@ -123,6 +149,7 @@ private void initFlyway(final DataSource ds) {
 	 * @return EntityManager Factory
 	 */
 	@Bean(name = "entityManagerFactoryEcandidat")
+	@Primary
 	public LocalContainerEntityManagerFactoryBean entityManagerFactoryEcandidat() {
 		final DataSource ds = dataSourceEcandidat();
 		/* Si l'appli s'initialise, il faut lancer Flyway */
diff --git a/src/main/java/fr/univlorraine/ecandidat/controllers/TestController.java b/src/main/java/fr/univlorraine/ecandidat/controllers/TestController.java
index 93fe29fd..be067f1b 100644
--- a/src/main/java/fr/univlorraine/ecandidat/controllers/TestController.java
+++ b/src/main/java/fr/univlorraine/ecandidat/controllers/TestController.java
@@ -16,8 +16,6 @@
  */
 package fr.univlorraine.ecandidat.controllers;
 
-import java.util.List;
-
 import javax.annotation.Resource;
 
 import org.slf4j.Logger;
@@ -25,7 +23,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import fr.univlorraine.ecandidat.entities.ecandidat.SiScolEtablissement;
 import fr.univlorraine.ecandidat.repositories.SiScolEtablissementRepository;
 import fr.univlorraine.ecandidat.services.siscol.SiScolException;
 import fr.univlorraine.ecandidat.services.siscol.SiScolGenericService;
@@ -59,21 +56,11 @@ public void testMethode() {
 		logger.debug("EnableTestMode : " + enableTestMode);
 		logger.debug("Début des tests");
 		try {
-			final List<SiScolEtablissement> listeSiScol = siScolService.getListSiScolEtablissement();
-			if (listeSiScol == null) {
-				return;
-			}
-			listeSiScol.forEach(etablissement -> {
-				try {
-					siScolEtablissementRepository.saveAndFlush(etablissement);
-				} catch (final Exception e) {
-					System.out.println(etablissement.getId().getCodEtb() + " / " + etablissement.getLibEtb());
-				}
-
-			});
-		} catch (final SiScolException ex) {
+			siScolService.deleteOpiPJ("1628", "DIDEN");
+			siScolService.getListSiScolAnneeUni().forEach(e -> System.out.println(e));
+		} catch (final SiScolException e) {
 			// TODO Auto-generated catch block
-			ex.printStackTrace();
+			e.printStackTrace();
 		}
 		logger.debug("Fin des tests");
 	}
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/AlertSva.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/AlertSva.java
index 68b5124b..1961af35 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/AlertSva.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/AlertSva.java
@@ -28,7 +28,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Batch.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Batch.java
index 38698b52..1a03e3e8 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Batch.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Batch.java
@@ -32,9 +32,9 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchHisto.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchHisto.java
index 8fad8bba..365607da 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchHisto.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchHisto.java
@@ -32,7 +32,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchRun.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchRun.java
index 455fb9fe..0cdecc22 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchRun.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/BatchRun.java
@@ -27,8 +27,8 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Campagne.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Campagne.java
index c27bbfd6..34d7c11c 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Campagne.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Campagne.java
@@ -36,9 +36,9 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidat.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidat.java
index ddc0fcf9..e5f1931d 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidat.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidat.java
@@ -37,7 +37,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
 import fr.univlorraine.ecandidat.utils.bean.export.ExportListCandidatureAdresse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidature.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidature.java
index fe82e3c4..0e251e5b 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidature.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Candidature.java
@@ -46,9 +46,9 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import fr.univlorraine.ecandidat.utils.ConstanteUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CentreCandidature.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CentreCandidature.java
index 5fb2b1f4..538e98cb 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CentreCandidature.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CentreCandidature.java
@@ -38,9 +38,9 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Commission.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Commission.java
index b23b50e3..f912b99e 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Commission.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Commission.java
@@ -40,8 +40,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CompteMinima.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CompteMinima.java
index bf95392f..dc144a24 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CompteMinima.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/CompteMinima.java
@@ -35,7 +35,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfil.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfil.java
index 67b4fb3d..e2043595 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfil.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfil.java
@@ -36,8 +36,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import fr.univlorraine.ecandidat.utils.NomenclatureUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfilInd.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfilInd.java
index 0cd9ef85..f6e53f0c 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfilInd.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/DroitProfilInd.java
@@ -31,7 +31,7 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Faq.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Faq.java
index d76a04e1..921ff1c3 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Faq.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Faq.java
@@ -31,7 +31,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Fichier.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Fichier.java
index 046b4e4f..2ac477b0 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Fichier.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Fichier.java
@@ -32,7 +32,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FichierFiabilisation.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FichierFiabilisation.java
index ab8e5238..dbf250dc 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FichierFiabilisation.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FichierFiabilisation.java
@@ -30,7 +30,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formation.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formation.java
index 7371dc89..7fade429 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formation.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formation.java
@@ -43,10 +43,10 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formulaire.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formulaire.java
index 890856a7..e70f6510 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formulaire.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Formulaire.java
@@ -38,8 +38,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCand.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCand.java
index c1371e48..d8c97640 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCand.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCand.java
@@ -31,7 +31,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidat.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidat.java
index a2d3e89c..be70101b 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidat.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidat.java
@@ -31,7 +31,7 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidature.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidature.java
index 9b5818d8..0b534fdf 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidature.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/FormulaireCandidature.java
@@ -31,7 +31,7 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Langue.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Langue.java
index b688ba07..e2a52a98 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Langue.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Langue.java
@@ -31,7 +31,7 @@
 
 import com.vaadin.server.ThemeResource;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LoadBalancingReloadRunPK.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LoadBalancingReloadRunPK.java
index a209fc8c..894da9d4 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LoadBalancingReloadRunPK.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LoadBalancingReloadRunPK.java
@@ -24,7 +24,7 @@
 import javax.persistence.Embeddable;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LockCandidat.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LockCandidat.java
index c3e462cd..8c709b0b 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LockCandidat.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/LockCandidat.java
@@ -27,7 +27,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Mail.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Mail.java
index ac0db9a5..398f1601 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Mail.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Mail.java
@@ -37,8 +37,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Message.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Message.java
index 36e64185..1310e1bf 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Message.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Message.java
@@ -31,8 +31,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/MotivationAvis.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/MotivationAvis.java
index 53a00398..86a475b1 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/MotivationAvis.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/MotivationAvis.java
@@ -37,8 +37,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Opi.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Opi.java
index 018ab54f..80f76bf6 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Opi.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Opi.java
@@ -30,7 +30,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Parametre.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Parametre.java
index f866dd55..6978654f 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Parametre.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Parametre.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PieceJustif.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PieceJustif.java
index 931306dc..a5d45273 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PieceJustif.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PieceJustif.java
@@ -39,8 +39,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCand.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCand.java
index 6e7ef617..86145207 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCand.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCand.java
@@ -31,7 +31,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCandidat.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCandidat.java
index f8340bb1..52469eed 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCandidat.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjCandidat.java
@@ -30,7 +30,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjOpi.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjOpi.java
index f4af8815..56309404 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjOpi.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PjOpi.java
@@ -28,7 +28,7 @@
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PostIt.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PostIt.java
index 1dcc8003..4b99d741 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PostIt.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/PostIt.java
@@ -32,7 +32,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Question.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Question.java
index 37127e35..8ecf5a73 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Question.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Question.java
@@ -38,8 +38,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/QuestionCand.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/QuestionCand.java
index 6f6db3ad..90684575 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/QuestionCand.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/QuestionCand.java
@@ -31,7 +31,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/SchemaVersion.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/SchemaVersion.java
index 8528b598..98b065bb 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/SchemaVersion.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/SchemaVersion.java
@@ -26,7 +26,7 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import fr.univlorraine.ecandidat.utils.migration.RealeaseVersion;
 import lombok.Data;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Tag.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Tag.java
index 1e010cfb..0dfbf316 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Tag.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Tag.java
@@ -33,7 +33,7 @@
 
 import com.vaadin.server.StreamResource;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecision.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecision.java
index 248f6bb6..46a5c260 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecision.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecision.java
@@ -37,8 +37,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecisionCandidature.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecisionCandidature.java
index 5888c815..a7b46821 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecisionCandidature.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeDecisionCandidature.java
@@ -36,9 +36,9 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDatePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
-import fr.univlorraine.ecandidat.entities.tools.LocalTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDatePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeFormation.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeFormation.java
index 6045b58e..507ce0e2 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeFormation.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeFormation.java
@@ -34,8 +34,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatut.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatut.java
index 72aea311..114f1a50 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatut.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatut.java
@@ -33,8 +33,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatutPiece.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatutPiece.java
index facf1b24..75e293ca 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatutPiece.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeStatutPiece.java
@@ -33,8 +33,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeTraitement.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeTraitement.java
index 707abd93..0afb534d 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeTraitement.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/TypeTraitement.java
@@ -33,8 +33,8 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.EntityPushEntityListener;
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.EntityPushEntityListener;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Version.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Version.java
index e76c2858..3637bc3e 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Version.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/Version.java
@@ -29,7 +29,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import fr.univlorraine.ecandidat.entities.tools.LocalDateTimePersistenceConverter;
+import fr.univlorraine.ecandidat.entities.ecandidat.tools.LocalDateTimePersistenceConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/tools/EntityPushEntityListener.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/EntityPushEntityListener.java
similarity index 97%
rename from src/main/java/fr/univlorraine/ecandidat/entities/tools/EntityPushEntityListener.java
rename to src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/EntityPushEntityListener.java
index 21564065..78b46dab 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/tools/EntityPushEntityListener.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/EntityPushEntityListener.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package fr.univlorraine.ecandidat.entities.tools;
+package fr.univlorraine.ecandidat.entities.ecandidat.tools;
 
 import javax.annotation.Resource;
 import javax.persistence.PostPersist;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDatePersistenceConverter.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDatePersistenceConverter.java
similarity index 95%
rename from src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDatePersistenceConverter.java
rename to src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDatePersistenceConverter.java
index b184f8ca..13f7c0ce 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDatePersistenceConverter.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDatePersistenceConverter.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package fr.univlorraine.ecandidat.entities.tools;
+package fr.univlorraine.ecandidat.entities.ecandidat.tools;
 
 import java.sql.Date;
 import java.time.LocalDate;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDateTimePersistenceConverter.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDateTimePersistenceConverter.java
similarity index 95%
rename from src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDateTimePersistenceConverter.java
rename to src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDateTimePersistenceConverter.java
index 5a6659f3..764a056d 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalDateTimePersistenceConverter.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalDateTimePersistenceConverter.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package fr.univlorraine.ecandidat.entities.tools;
+package fr.univlorraine.ecandidat.entities.ecandidat.tools;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
diff --git a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalTimePersistenceConverter.java b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalTimePersistenceConverter.java
similarity index 95%
rename from src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalTimePersistenceConverter.java
rename to src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalTimePersistenceConverter.java
index 0317a8a3..e85a7139 100644
--- a/src/main/java/fr/univlorraine/ecandidat/entities/tools/LocalTimePersistenceConverter.java
+++ b/src/main/java/fr/univlorraine/ecandidat/entities/ecandidat/tools/LocalTimePersistenceConverter.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package fr.univlorraine.ecandidat.entities.tools;
+package fr.univlorraine.ecandidat.entities.ecandidat.tools;
 
 import java.sql.Time;
 import java.time.LocalTime;
diff --git a/src/main/java/fr/univlorraine/ecandidat/services/siscol/SiScolApogeeWSServiceImpl.java b/src/main/java/fr/univlorraine/ecandidat/services/siscol/SiScolApogeeWSServiceImpl.java
index cac88d4f..704ab5ba 100644
--- a/src/main/java/fr/univlorraine/ecandidat/services/siscol/SiScolApogeeWSServiceImpl.java
+++ b/src/main/java/fr/univlorraine/ecandidat/services/siscol/SiScolApogeeWSServiceImpl.java
@@ -32,7 +32,6 @@
 import javax.annotation.Resource;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
 import javax.persistence.Query;
 
 import org.slf4j.Logger;
@@ -167,6 +166,9 @@ public class SiScolApogeeWSServiceImpl implements SiScolGenericService, Serializ
 	/** proxy pour faire appel aux infos PjOPI du WS . */
 	private PjOpiMetierServiceInterface pjOpiService;
 
+	@Resource
+	private transient EntityManagerFactory entityManagerFactoryApogee;
+
 	/** service pour faire appel aux services Rest generiques */
 	@Resource
 	private transient SiScolRestServiceInterface siScolRestServiceInterface;
@@ -229,8 +231,7 @@ public Boolean isImplementationApogee() {
 	 */
 	private <T> List<T> executeQueryListEntity(final Class<T> className) throws SiScolException {
 		try {
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
+			final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 			final Query query = em.createQuery("Select a from " + className.getName() + " a", className);
 			final List<T> listeSiScol = query.getResultList();
 			em.close();
@@ -614,8 +615,7 @@ public String checkBacSpecialiteOption(final CandidatBacOuEqu bac) {
 			return null;
 		}
 
-		final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-		final EntityManager em = emf.createEntityManager();
+		final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 		final String queryString = "select PKB_BAC.VERIFIER_SPECIALITES_ET_OPTIONS_BAC(?,?,?,?,?,?,?,?,?) from dual";
 		final Query query = em.createNativeQuery(queryString);
 		query.setParameter(1, bac.getAnneeObtBac());
@@ -629,6 +629,7 @@ public String checkBacSpecialiteOption(final CandidatBacOuEqu bac) {
 		query.setParameter(9, Optional.ofNullable(bac.getSiScolOpt4Bac()).map(e -> e.getId().getCodOptBac()).orElse(null));
 
 		final Object res = query.getSingleResult();
+		em.close();
 		return (ConstanteUtils.APO_CHECK_BAC_VALIDE.equals(res) || ConstanteUtils.APO_CHECK_BAC_NO_VERIF.equals(res)) ? null : (String) res;
 	}
 
@@ -641,8 +642,7 @@ public Boolean hasSpecialiteRequired() {
 	@Override
 	public Version getVersion() throws SiScolException {
 		try {
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
+			final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 			final Query query = em.createQuery("Select a from VersionApo a where a.datCre is not null order by a.datCre desc", VersionApo.class).setMaxResults(1);
 			final List<VersionApo> listeVersionApo = query.getResultList();
 			em.close();
@@ -663,9 +663,8 @@ public Version getVersion() throws SiScolException {
 	 */
 	@Override
 	public List<Vet> getListFormationApogee(final String codeCge, String search) throws SiScolException {
+		final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 		try {
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
 			if (search != null && search.length() > 0) {
 				search = "%" + search.toLowerCase() + "%";
 			}
@@ -704,6 +703,8 @@ public List<Vet> getListFormationApogee(final String codeCge, String search) thr
 		} catch (final Exception e) {
 			logger.error("erreur", e);
 			throw new SiScolException("SiScol database error on getListFormationApogee", e.getCause());
+		} finally {
+			em.close();
 		}
 	}
 
@@ -712,10 +713,8 @@ public List<Vet> getListFormationApogee(final String codeCge, String search) thr
 	 */
 	@Override
 	public List<Diplome> getListDiplome(final String codEtpVet, final String codVrsVet) throws SiScolException {
+		final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 		try {
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
-
 			final String sqlString =
 				"select distinct vdi_fractionner_vet.cod_dip, vdi_fractionner_vet.cod_vrs_vdi, diplome.lib_dip from vdi_fractionner_vet, diplome\r\n"
 					+ "where vdi_fractionner_vet.cod_dip = diplome.cod_dip\r\n"
@@ -730,6 +729,8 @@ public List<Diplome> getListDiplome(final String codEtpVet, final String codVrsV
 		} catch (final Exception e) {
 			logger.error("erreur", e);
 			throw new SiScolException("SiScol database error on getListDiplome", e.getCause());
+		} finally {
+			em.close();
 		}
 	}
 
@@ -1286,17 +1287,18 @@ else if (listIndOpi.size() == 1) {
 	 * @throws SiScolException
 	 */
 	private List<VoeuxIns> getVoeuxApogee(final IndOpi indOpi) throws SiScolException {
+		final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 		try {
 			final String queryString = "Select a from VoeuxIns a where a.id.codIndOpi = " + indOpi.getCodIndOpi();
 			logger.debug("Vérification des voeux " + queryString);
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
 			final Query query = em.createQuery(queryString, VoeuxIns.class);
 			final List<VoeuxIns> listeSiScol = query.getResultList();
 			em.close();
 			return listeSiScol;
 		} catch (final Exception e) {
 			throw new SiScolException("SiScol database error on getVoeuxApogee", e);
+		} finally {
+			em.close();
 		}
 
 	}
@@ -1310,8 +1312,7 @@ private List<VoeuxIns> getVoeuxApogee(final IndOpi indOpi) throws SiScolExceptio
 	 */
 	public List<IndOpi>
 		findNneIndOpiByCodOpiIntEpo(final String codOpiIntEpo, final Integer codEtuOpi, final MAJEtatCivilDTO2 etatCivil, final LocalDate dateNaissance) {
-		final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-		final EntityManager em = emf.createEntityManager();
+		final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 
 		/* Verification par codOpiIntEpo ou codEtuOpi ou INE */
 		String requete = "Select a from IndOpi a where a.codOpiIntEpo='" + codOpiIntEpo + "'";
@@ -1703,8 +1704,7 @@ public void deleteOpiPJ(final String codIndOpi, final String codTpj) throws SiSc
 			if (codIndOpi == null || codTpj == null) {
 				return;
 			}
-			final EntityManagerFactory emf = Persistence.createEntityManagerFactory("pun-jpa-siscol");
-			final EntityManager em = emf.createEntityManager();
+			final EntityManager em = entityManagerFactoryApogee.createEntityManager();
 			em.getTransaction().begin();
 			final Query query = em.createNativeQuery("DELETE FROM OPI_PJ WHERE COD_IND_OPI = " + codIndOpi + " AND COD_TPJ = '" + codTpj + "'");
 			query.executeUpdate();
diff --git a/src/main/java/fr/univlorraine/ecandidat/utils/JpaConfigApogeeCondition.java b/src/main/java/fr/univlorraine/ecandidat/utils/JpaConfigApogeeCondition.java
new file mode 100644
index 00000000..683b2f8e
--- /dev/null
+++ b/src/main/java/fr/univlorraine/ecandidat/utils/JpaConfigApogeeCondition.java
@@ -0,0 +1,21 @@
+package fr.univlorraine.ecandidat.utils;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup;
+
+public class JpaConfigApogeeCondition implements Condition {
+
+	@Override
+	public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
+		try {
+			return StringUtils.isNotBlank(context.getEnvironment().getProperty("datasource.apogee.url"))
+				||
+				new JndiDataSourceLookup().getDataSource("java:/comp/env/jdbc/dbSiScol") != null;
+		} catch (final Exception e) {
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 3d52a62d..00000000
--- a/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-     ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
-
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-	version="1.0">
-	<persistence-unit name="pun-jpa-siscol">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<non-jta-data-source>java:/comp/env/jdbc/dbSiScol</non-jta-data-source>
-		<exclude-unlisted-classes>false</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.query.timeout" value="1000" />
-            <property name="eclipselink.weaving" value="static"/>
-            <property name="eclipselink.logging.level" value="SEVERE" />
-            <property name="eclipselink.cache.shared.default" value="false"/>
-            <property name="eclipselink.session.customizer" value="fr.univlorraine.ecandidat.utils.SiScolSessionCustomizer"/>
-		</properties>
-	</persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/src/main/resources/configuration/template/refus-specifique-diplome/lettre_refus_export_template CE.docx b/src/main/resources/configuration/template/refus-specifique-diplome/lettre_refus_export_template CE.docx
new file mode 100644
index 00000000..453b64aa
Binary files /dev/null and b/src/main/resources/configuration/template/refus-specifique-diplome/lettre_refus_export_template CE.docx differ