IncomeCalculator - Back End Set Up For Deployment

.classpath

@@ -18,7 +18,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>iRecruit</name>
+	<name>incomeCalc</name>
 	<comment></comment>
 	<projects>
 	</projects>

.settings/org.eclipse.wst.common.component

 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="iRecruit-0.0.1-SNAPSHOT">
+    <wb-module deploy-name="ic-0.0.1-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="iRecruit"/>
         <property name="java-output-path" value="/iRecruit/target/classes"/>
         <property name="component.exclusion.patterns"/>
+        <property name="context-root" value="ic"/>
     </wb-module>
 </project-modules>

pom.xml

-
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -9,14 +9,14 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com</groupId>
-	<artifactId>iRecruit</artifactId>
+	<artifactId>ic</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>iRecruit</name>
+	<name>incomeCalc</name>
 	<description>Demo project for Spring Boot</description>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 
     <properties>
-		<!--<start-class>com.iRecruit.IRecruitApplication</start-class>
+		<!--<start-class>com.incomeCalc.incomeCalcApplication</start-class>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
 		<maven.test.skip>true</maven.test.skip>
@@ -29,9 +29,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-	
-
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>
@@ -42,14 +39,6 @@
 		   <version>3.1.0</version>
 		   <scope>provided</scope> 
 		</dependency>
-		
-<dependency>
-    <groupId>org.projectlombok</groupId>
-    <artifactId>lombok</artifactId>
-    <version>1.16.18</version>
-    <scope>provided</scope>
-</dependency>
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -61,12 +50,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
+			<exclusions>
+			   <exclusion>
+			      <groupId>org.springframework.boot</groupId>
+			      <artifactId>spring-boot-starter-tomcat</artifactId>
+			   </exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -100,7 +89,13 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
+		<!-- Add Log4j2 Dependency -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
 
+		<!-- Needed for Async Logging with Log4j 2 -->
 		<dependency>
 			<groupId>com.lmax</groupId>
 			<artifactId>disruptor</artifactId>
@@ -214,6 +209,8 @@
 	      <version>9.1.6</version>
 	      <scope>compile</scope>
 	   </dependency>
+	  
+	                
 	</dependencies>
 	
 	<repositories>
@@ -260,16 +257,13 @@
 	<build>  
 		<directory>target</directory>
 		<plugins>
-		
-	   
-  
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>             
 				<configuration>    
-					<outputDirectory>spring</outputDirectory>
+				<outputDirectory>E:\Streebo\Tata_Aia\Income_Calculator\wlp\usr\servers\incomeCalc\dropins\spring</outputDirectory>
 				<skipTests>true</skipTests>
-					<mainClass>com.iRecruit.IRecruitApplication</mainClass>
+					<mainClass>com.ic.IncomeCalcApplication</mainClass>
 				</configuration>
 			</plugin>
 		</plugins>

src/main/java/com/iRecruit/modules/auth/service/L1slabsMappingService.java

-package com.iRecruit.modules.auth.service;
-
-import java.util.List;
-
-import com.iRecruit.modules.auth.model.FycMapping;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-
-
-public interface L1slabsMappingService {
-	 public L1slabsMapping save(L1slabsDto l1slabsmapping,Boolean isCreate);
-	public List<L1slabsMapping> findAll();
-}

src/main/java/com/iRecruit/IRecruitApplication.java → src/main/java/com/ic/IncomeCalcApplication.java

-package com.iRecruit;
+package com.ic;
 
 import java.util.TimeZone;
 
@@ -18,15 +18,19 @@ import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import com.iRecruit.audit.SpringSecurityAuditorAware;
-import com.iRecruit.constant.DBConfig;
-import com.iRecruit.constant.TemplateConfig;
+import com.ic.audit.SpringSecurityAuditorAware;
+import com.ic.constant.DBConfig;
+import com.ic.constant.TemplateConfig;
 
 //@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, MultipartAutoConfiguration.class })
 @SpringBootApplication
 @EnableCaching
 @EnableJpaAuditing(auditorAwareRef = "auditorAware")
-public class IRecruitApplication {
+@EntityScan(basePackageClasses = { 
+		IncomeCalcApplication.class,
+		Jsr310JpaConverters.class 
+})
+public class IncomeCalcApplication extends SpringBootServletInitializer {
 
 	
 	@PostConstruct
@@ -48,12 +52,17 @@ public class IRecruitApplication {
 
 	/*@Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(IRecruitApplication.class);
+        return application.sources(IncomeCalcApplication.class);
     }*/
 	
+	@Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(IncomeCalcApplication.class);
+    }
+
 	public static void main(String[] args) {
 	
-		SpringApplication.run(IRecruitApplication.class, args);
+		SpringApplication.run(IncomeCalcApplication.class, args);
 		
 	}
 	

src/main/java/com/iRecruit/annotation/AuditLogs.java → src/main/java/com/ic/annotation/AuditLogs.java

-package com.iRecruit.annotation;
+package com.ic.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/iRecruit/aspect/ServiceVersionAspect.java → src/main/java/com/ic/aspect/ServiceVersionAspect.java

-package com.iRecruit.aspect;
+package com.ic.aspect;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -28,13 +28,13 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.modules.auth.payload.AuditLogsDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.payload.request.LoginRequest;
-import com.iRecruit.modules.auth.service.AuditLogsService;
-import com.iRecruit.security.UserPrincipal;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.StatusCode;
+import com.ic.modules.auth.payload.AuditLogsDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.payload.request.LoginRequest;
+import com.ic.modules.auth.service.AuditLogsService;
+import com.ic.security.UserPrincipal;
 
 @Aspect
 @Component
@@ -43,7 +43,7 @@ public class ServiceVersionAspect {
 	@Autowired
 	AuditLogsService auditLogsService;
 	
-	@Around("@annotation(com.iRecruit.annotation.AuditLogs)")
+	@Around("@annotation(com.ic.annotation.AuditLogs)")
 	public ResponseEntity<?> auditLog(ProceedingJoinPoint joinPoint) throws Throwable {
 		
 		long startTime = System.currentTimeMillis();
@@ -106,7 +106,7 @@ public class ServiceVersionAspect {
 			AuditLogs name = method.getAnnotation(AuditLogs.class);
 		    Timestamp timestamp = new Timestamp(System.currentTimeMillis());
 		    
-		    com.iRecruit.modules.auth.model.AuditLogs auditLogs = new com.iRecruit.modules.auth.model.AuditLogs(null, name.service(), remoteAddr,
+		    com.ic.modules.auth.model.AuditLogs auditLogs = new com.ic.modules.auth.model.AuditLogs(null, name.service(), remoteAddr,
 		    		userPrincipal.getDeviceInfo(), userPrincipal.getBrowserInfo(), userPrincipal.getUsername(), userPrincipal.getOS(), 
 		    		ar.getCode(), ar.getMessage(), timeTaken, joinPoint.getArgs().length>0?joinPoint.getArgs()[0].toString():null , ar.getMessage(),new Date());
 		    

src/main/java/com/iRecruit/audit/SpringSecurityAuditorAware.java → src/main/java/com/ic/audit/SpringSecurityAuditorAware.java

-package com.iRecruit.audit;
+package com.ic.audit;
 
 import java.util.Optional;
 
@@ -7,7 +7,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import com.iRecruit.security.UserPrincipal;
+import com.ic.security.UserPrincipal;
 
 public class SpringSecurityAuditorAware implements AuditorAware<String> {
 

src/main/java/com/iRecruit/config/APIExceptionHandler.java → src/main/java/com/ic/config/APIExceptionHandler.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.util.Date;
 
@@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import com.iRecruit.modules.auth.model.AuditLogs;
-import com.iRecruit.modules.auth.payload.AuditLogsDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.AuditLogsService;
-import com.iRecruit.security.UserPrincipal;
+import com.ic.modules.auth.model.AuditLogs;
+import com.ic.modules.auth.payload.AuditLogsDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.AuditLogsService;
+import com.ic.security.UserPrincipal;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/iRecruit/config/CommonRoutingDataSource.java → src/main/java/com/ic/config/CommonRoutingDataSource.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.util.HashMap;
 

src/main/java/com/iRecruit/config/CustomPhysicalNamingStrategy.java → src/main/java/com/ic/config/CustomPhysicalNamingStrategy.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;

src/main/java/com/iRecruit/config/DataSourceContextHolder.java → src/main/java/com/ic/config/DataSourceContextHolder.java

-package com.iRecruit.config;
+package com.ic.config;
 
 public class DataSourceContextHolder {
 

src/main/java/com/iRecruit/config/IRecruitSchemaConfig.java → src/main/java/com/ic/config/IRecruitSchemaConfig.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.util.HashMap;
 
+import javax.annotation.Resource;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+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.HibernateJpaVendorAdapter;
@@ -29,7 +31,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 	entityManagerFactoryRef = "iRecruitSchemaEntityManagerFactory", 
 	transactionManagerRef = "iRecruitSchemaTransactionManager", 
 	basePackages = {
-		"com.iRecruit.modules.auth.repository",
+		"com.ic.modules.auth.repository"
 	})
 //@Resource(name="jdbc/", type=javax.sql.DataSource.class, lookup="jdbc/fileUploadDS")
 public class IRecruitSchemaConfig {
@@ -43,25 +45,18 @@ public class IRecruitSchemaConfig {
 	 private static final String JNDI_NAME = "jdbc/irecruit";
 	@Primary
 	@Bean(name = "iRecruitSchemaDataSource")
-	//@ConfigurationProperties(prefix = "irecruit.datasource")
-	//@Resource(name = JNDI_NAME)
+	@ConfigurationProperties(prefix = "irecruit.datasource")
+	@Resource(name = JNDI_NAME)
 	public DataSource iRecruitSchemaDataSource() {
 		//HikariDataSource dataSource = new HikariDataSource();
 		
-		DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
-        dataSourceBuilder.driverClassName(environment.getProperty("irecruit.datasource.driver-class-name"));
-        dataSourceBuilder.url(environment.getProperty("spring.datasource.url"));
-        dataSourceBuilder.username(environment.getProperty("irecruit.datasource.username"));
-        dataSourceBuilder.password(environment.getProperty("irecruit.datasource.password"));
-        return dataSourceBuilder.build();
-        
 		//dataSource.setDataSourceJNDI(environment.getProperty("irecruit.datasource.jndi-name"));
 		/*dataSource.setDriverClassName(environment.getProperty("irecruit.datasource.driver-class-name"));
-        dataSource.setJdbcUrl(environment.getProperty("spring.datasource.url"));
+        dataSource.setJdbcUrl(environment.getProperty("irecruit.datasource.url"));
         dataSource.setUsername(environment.getProperty("irecruit.datasource.username"));
         dataSource.setPassword(environment.getProperty("irecruit.datasource.password"));
         dataSource.setCatalog("irecruitCat");
-        
+        */
         /*dataSource.setConnectionTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.connectionTimeout")));
         dataSource.setValidationTimeout(Long.parseLong(environment.getProperty("spring.datasource.hikari.validationTimeout")));
         dataSource.setMaximumPoolSize(Integer.parseInt(environment.getProperty("spring.datasource.hikari.maximumPoolSize")));
@@ -72,10 +67,10 @@ public class IRecruitSchemaConfig {
         return dataSource;*/
 		
 
-	        /*JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup();
+	        JndiDataSourceLookup jndiDataSourceLookup = new JndiDataSourceLookup();
 	        jndiDataSourceLookup.setResourceRef(true);
 	        return jndiDataSourceLookup.getDataSource(JNDI_NAME);
-*/
+
 	    
 		//return DataSourceBuilder.create().build();
 	}
@@ -86,7 +81,7 @@ public class IRecruitSchemaConfig {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(iRecruitSchemaDataSource());
         em.setPersistenceUnitName("iRecruitSchema");
-        em.setPackagesToScan(new String[] { "com.iRecruit.modules.auth.model",
+        em.setPackagesToScan(new String[] { "com.ic.modules.auth.model"
 		});
         HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);

src/main/java/com/iRecruit/config/IdGenerator.java → src/main/java/com/ic/config/IdGenerator.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.io.Serializable;
 import java.util.Properties;

src/main/java/com/iRecruit/config/JavaImageConverter.java → src/main/java/com/ic/config/JavaImageConverter.java

 
-package com.iRecruit.config;
+package com.ic.config;
 
 
 import java.awt.Color;

src/main/java/com/iRecruit/config/QuerySpecification.java → src/main/java/com/ic/config/QuerySpecification.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
 
 import org.springframework.data.jpa.domain.Specification;
 
-import com.iRecruit.modules.auth.payload.request.Condition;
+import com.ic.modules.auth.payload.request.Condition;
 
 public class QuerySpecification {
 	  

src/main/java/com/iRecruit/config/SecurityConfig.java → src/main/java/com/ic/config/SecurityConfig.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.util.Arrays;
 
@@ -21,10 +21,10 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import com.iRecruit.security.AuthProvider;
-import com.iRecruit.security.CustomUserDetailsService;
-import com.iRecruit.security.JwtAuthenticationEntryPoint;
-import com.iRecruit.security.JwtAuthenticationFilter;
+import com.ic.security.AuthProvider;
+import com.ic.security.CustomUserDetailsService;
+import com.ic.security.JwtAuthenticationEntryPoint;
+import com.ic.security.JwtAuthenticationFilter;
 
 @Configuration
 @EnableWebSecurity

src/main/java/com/iRecruit/config/SwaggerConfig.java → src/main/java/com/ic/config/SwaggerConfig.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import static springfox.documentation.builders.PathSelectors.regex;
 
@@ -28,7 +28,7 @@ public class SwaggerConfig {
 	@Bean
 	public Docket productApi() {
 		return new Docket(DocumentationType.SWAGGER_2).select()
-				.apis(RequestHandlerSelectors.basePackage("com.iRecruit")).paths(regex("/api.*"))
+				.apis(RequestHandlerSelectors.basePackage("com.ic")).paths(regex("/api.*"))
 				.build().apiInfo(apiInfo()).securitySchemes(Lists.newArrayList(apiKey()))
 				.securityContexts(Lists.newArrayList(securityContext()));
 	}

src/main/java/com/iRecruit/config/Utility.java → src/main/java/com/ic/config/Utility.java

-package com.iRecruit.config;
+package com.ic.config;
 
 import java.net.URI;
 import java.util.Enumeration;

src/main/java/com/iRecruit/config/WebMvcConfig.java → src/main/java/com/ic/config/WebMvcConfig.java

-package com.iRecruit.config;
+package com.ic.config;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/com/iRecruit/constant/BooleanType.java → src/main/java/com/ic/constant/BooleanType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum BooleanType {
 	Y,N

src/main/java/com/iRecruit/constant/DBConfig.java → src/main/java/com/ic/constant/DBConfig.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 import java.util.List;
 
@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.service.ConfigurationsService;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.service.ConfigurationsService;
 
 import groovy.util.logging.Log;
 
@@ -35,7 +35,7 @@ public class DBConfig {
 		for(Configurations configuration : configurations) {
 			System.out.println("configurations");
 			System.out.println(configurations);
-			configs.put(configuration.getConfig(), configuration.getValue());
+			configs.put(configuration.getKey(), configuration.getValue());
 			
 			System.out.println("configs");
 			System.out.println(configs);

src/main/java/com/iRecruit/constant/GlobalConstants.java → src/main/java/com/ic/constant/GlobalConstants.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public class GlobalConstants {
 

src/main/java/com/iRecruit/constant/LeaderCalcConfig.java → src/main/java/com/ic/constant/LeaderCalcConfig.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 import java.util.List;
 
@@ -11,20 +11,20 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iRecruit.modules.auth.model.FycMapping;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.L2slabsMapping;
-import com.iRecruit.modules.auth.model.MDBMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.model.MsaMapping;
-import com.iRecruit.modules.auth.model.Templates;
-import com.iRecruit.modules.auth.service.FycMappingService;
-import com.iRecruit.modules.auth.service.L1slabsMappingService;
-import com.iRecruit.modules.auth.service.L2slabsMappingService;
-import com.iRecruit.modules.auth.service.MDBMappingService;
-import com.iRecruit.modules.auth.service.MpbMappingService;
-import com.iRecruit.modules.auth.service.MsaMappingService;
-import com.iRecruit.modules.auth.service.TemplatesService;
+import com.ic.modules.auth.model.FycMapping;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.L2slabsMapping;
+import com.ic.modules.auth.model.MDBMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.model.MsaMapping;
+import com.ic.modules.auth.model.Templates;
+import com.ic.modules.auth.service.FycMappingService;
+import com.ic.modules.auth.service.L1slabsMappingService;
+import com.ic.modules.auth.service.L2slabsMappingService;
+import com.ic.modules.auth.service.MDBMappingService;
+import com.ic.modules.auth.service.MpbMappingService;
+import com.ic.modules.auth.service.MsaMappingService;
+import com.ic.modules.auth.service.TemplatesService;
 
 @Service
 public class LeaderCalcConfig {

src/main/java/com/iRecruit/constant/PaymentMode.java → src/main/java/com/ic/constant/PaymentMode.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum PaymentMode {
 	CREDIT,DEBIT,DISCOUNT

src/main/java/com/iRecruit/constant/PaymentType.java → src/main/java/com/ic/constant/PaymentType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum PaymentType {
 	CASH,CHECK,ONLINE,PAYTM,PHONEPAY,DD

src/main/java/com/iRecruit/constant/PenaltyType.java → src/main/java/com/ic/constant/PenaltyType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum PenaltyType {
 	FixedAmount,FixedRate

src/main/java/com/iRecruit/constant/QuestionType.java → src/main/java/com/ic/constant/QuestionType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum QuestionType {
 	RADIO,CHECKBOX,TEXT,DROPDOWN

src/main/java/com/iRecruit/constant/RequestType.java → src/main/java/com/ic/constant/RequestType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum RequestType {
 	BOOKING,MEETING,PROBLEM,GENERAL

src/main/java/com/iRecruit/constant/RolesConstant.java → src/main/java/com/ic/constant/RolesConstant.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum RolesConstant {
 	LEADER,PANALIST,FINAL_INTERVIEWER,REMO,BRANCH_MANAGER

src/main/java/com/iRecruit/constant/SchedulerType.java → src/main/java/com/ic/constant/SchedulerType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum SchedulerType {
 	HOURLY,DAILY,WEEKLY,MONTHLY,YEARLY,ONETIME

src/main/java/com/iRecruit/constant/Stages.java → src/main/java/com/ic/constant/Stages.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum Stages {
 

src/main/java/com/iRecruit/constant/Status.java → src/main/java/com/ic/constant/Status.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum Status {
 	INIT,LOCK,DISABLED,ACTIVE,INACTIVE,DELETED,SENT,SUCCESS

src/main/java/com/iRecruit/constant/StatusCode.java → src/main/java/com/ic/constant/StatusCode.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public class StatusCode {
 	public static final int INVALID_USER = 100;

src/main/java/com/iRecruit/constant/TemplateConfig.java → src/main/java/com/ic/constant/TemplateConfig.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 import java.util.List;
 
@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iRecruit.modules.auth.model.Templates;
-import com.iRecruit.modules.auth.service.TemplatesService;
+import com.ic.modules.auth.model.Templates;
+import com.ic.modules.auth.service.TemplatesService;
 
 @Service
 public class TemplateConfig {
@@ -30,7 +30,7 @@ public class TemplateConfig {
 		List<Templates> templates = templatesService.findAll();
 		configs = new JSONObject();
 		for(Templates configuration : templates) {
-			configs.put(configuration.getConfig(), configuration.getValue());
+			configs.put(configuration.getKey(), configuration.getValue());
 		}
 	}
 	public String getValue(String key) {

src/main/java/com/iRecruit/constant/TemplateType.java → src/main/java/com/ic/constant/TemplateType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum TemplateType {
 	MAIL,PDF,SMS,NOTIFICATION

src/main/java/com/iRecruit/constant/VehicalType.java → src/main/java/com/ic/constant/VehicalType.java

-package com.iRecruit.constant;
+package com.ic.constant;
 
 public enum VehicalType {
 	CAR,BYKE,SCOOTER,BYCYCLE

src/main/java/com/iRecruit/exception/AppException.java → src/main/java/com/ic/exception/AppException.java

-package com.iRecruit.exception;
+package com.ic.exception;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 

src/main/java/com/iRecruit/exception/FileNotFoundException.java → src/main/java/com/ic/exception/FileNotFoundException.java

-package com.iRecruit.exception;
+package com.ic.exception;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 

src/main/java/com/iRecruit/exception/FileStorageException.java → src/main/java/com/ic/exception/FileStorageException.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 
 public class FileStorageException extends RuntimeException {

src/main/java/com/iRecruit/exception/InvalidArgument.java → src/main/java/com/ic/exception/InvalidArgument.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/iRecruit/exception/InvalidOTPOrRef.java → src/main/java/com/ic/exception/InvalidOTPOrRef.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/iRecruit/exception/OTPExpire.java → src/main/java/com/ic/exception/OTPExpire.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/iRecruit/exception/ResourceAlreadyExist.java → src/main/java/com/ic/exception/ResourceAlreadyExist.java

-package com.iRecruit.exception;
+package com.ic.exception;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 

src/main/java/com/iRecruit/exception/ResourceNotFoundException.java → src/main/java/com/ic/exception/ResourceNotFoundException.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/iRecruit/exception/TenantNotSelectedException.java → src/main/java/com/ic/exception/TenantNotSelectedException.java

-package com.iRecruit.exception;
+package com.ic.exception;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 

src/main/java/com/iRecruit/exception/WrongUsernamePassword.java → src/main/java/com/ic/exception/WrongUsernamePassword.java

-package com.iRecruit.exception;
+package com.ic.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/com/iRecruit/firebase/FCMInitializer.java → src/main/java/com/ic/firebase/FCMInitializer.java

-package com.iRecruit.firebase;
+package com.ic.firebase;
 
 import java.io.IOException;
 

src/main/java/com/iRecruit/firebase/FCMService.java → src/main/java/com/ic/firebase/FCMService.java

-package com.iRecruit.firebase;
+package com.ic.firebase;
 
 import java.time.Duration;
 import java.util.Map;
@@ -15,7 +15,7 @@ import com.google.firebase.messaging.Aps;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.Message;
 import com.google.firebase.messaging.Notification;
-import com.iRecruit.modules.auth.model.PushNotificationRequest;
+import com.ic.modules.auth.model.PushNotificationRequest;
 
 @Service
 public class FCMService {

src/main/java/com/iRecruit/firebase/NotificationParameter.java → src/main/java/com/ic/firebase/NotificationParameter.java

-package com.iRecruit.firebase;
+package com.ic.firebase;
 
 
 public enum NotificationParameter {

src/main/java/com/iRecruit/modules/auth/controller/AuthController.java → src/main/java/com/ic/modules/auth/controller/AuthController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.User;
-import com.iRecruit.modules.auth.payload.P100LoginResponse;
-import com.iRecruit.modules.auth.payload.UserDto;
-import com.iRecruit.modules.auth.payload.UserOTPDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.payload.request.JwtAuthenticationResponse;
-import com.iRecruit.modules.auth.payload.request.LoginRequest;
-import com.iRecruit.modules.auth.payload.request.OTPRequest;
-import com.iRecruit.modules.auth.payload.request.OTPValidateRequest;
-import com.iRecruit.modules.auth.payload.request.P100LoginRequest;
-
-import com.iRecruit.modules.auth.service.UserService;
-import com.iRecruit.security.AuthProvider;
-import com.iRecruit.security.JwtTokenProvider;
-import com.iRecruit.security.UserPrincipal;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.User;
+import com.ic.modules.auth.payload.P100LoginResponse;
+import com.ic.modules.auth.payload.UserDto;
+import com.ic.modules.auth.payload.UserOTPDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.payload.request.JwtAuthenticationResponse;
+import com.ic.modules.auth.payload.request.LoginRequest;
+import com.ic.modules.auth.payload.request.OTPRequest;
+import com.ic.modules.auth.payload.request.OTPValidateRequest;
+import com.ic.modules.auth.payload.request.P100LoginRequest;
+
+import com.ic.modules.auth.service.UserService;
+import com.ic.security.AuthProvider;
+import com.ic.security.JwtTokenProvider;
+import com.ic.security.UserPrincipal;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/ConfigurationsController.java → src/main/java/com/ic/modules/auth/controller/ConfigurationsController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.DBConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.payload.ConfigurationsDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.ConfigurationsService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.DBConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.payload.ConfigurationsDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.ConfigurationsService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/FycMappingController.java → src/main/java/com/ic/modules/auth/controller/FycMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.DBConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.model.FycMapping;
-import com.iRecruit.modules.auth.payload.ConfigurationsDto;
-import com.iRecruit.modules.auth.payload.fycDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.ConfigurationsService;
-import com.iRecruit.modules.auth.service.FycMappingService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.DBConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.FycMapping;
+import com.ic.modules.auth.payload.ConfigurationsDto;
+import com.ic.modules.auth.payload.fycDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.ConfigurationsService;
+import com.ic.modules.auth.service.FycMappingService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/L1slabsMappingController.java → src/main/java/com/ic/modules/auth/controller/L1slabsMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.L1slabsMappingService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.L1slabsMappingService;
 
 
 import io.swagger.annotations.Api;

src/main/java/com/iRecruit/modules/auth/controller/L2slabsMappingController.java → src/main/java/com/ic/modules/auth/controller/L2slabsMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.L2slabsMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.L2slabsDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.L2slabsMappingService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.L2slabsMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.L2slabsDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.L2slabsMappingService;
 
 
 import io.swagger.annotations.Api;

src/main/java/com/iRecruit/modules/auth/controller/LeaderCalc.java → src/main/java/com/ic/modules/auth/controller/LeaderCalc.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import java.util.Map;
 
@@ -24,18 +24,18 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.payload.request.Apiresponse1;
-import com.iRecruit.modules.auth.service.L1slabsMappingService;
-import com.iRecruit.modules.auth.service.LeaderCalcService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.payload.request.Apiresponse1;
+import com.ic.modules.auth.service.L1slabsMappingService;
+import com.ic.modules.auth.service.LeaderCalcService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/MDBMappingController.java → src/main/java/com/ic/modules/auth/controller/MDBMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.L2slabsMapping;
-import com.iRecruit.modules.auth.model.MDBMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.L2slabsDto;
-import com.iRecruit.modules.auth.payload.MDBDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-
-import com.iRecruit.modules.auth.service.MDBMappingService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.L2slabsMapping;
+import com.ic.modules.auth.model.MDBMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.L2slabsDto;
+import com.ic.modules.auth.payload.MDBDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+
+import com.ic.modules.auth.service.MDBMappingService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/MpbMappingController.java → src/main/java/com/ic/modules/auth/controller/MpbMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.payload.fycDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.FycMappingService;
-import com.iRecruit.modules.auth.service.MpbMappingService;
-import com.iRecruit.modules.auth.model.FycMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.payload.fycDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.FycMappingService;
+import com.ic.modules.auth.service.MpbMappingService;
+import com.ic.modules.auth.model.FycMapping;
+import com.ic.modules.auth.model.MpbMapping;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/MsaMappingController.java → src/main/java/com/ic/modules/auth/controller/MsaMappingController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,24 +17,24 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.L2slabsMapping;
-import com.iRecruit.modules.auth.model.MDBMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.model.MsaMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.L2slabsDto;
-import com.iRecruit.modules.auth.payload.MDBDto;
-import com.iRecruit.modules.auth.payload.MsaDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.L2slabsMapping;
+import com.ic.modules.auth.model.MDBMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.model.MsaMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.L2slabsDto;
+import com.ic.modules.auth.payload.MDBDto;
+import com.ic.modules.auth.payload.MsaDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
 
-import com.iRecruit.modules.auth.service.MDBMappingService;
-import com.iRecruit.modules.auth.service.MsaMappingService;
+import com.ic.modules.auth.service.MDBMappingService;
+import com.ic.modules.auth.service.MsaMappingService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/NGPACalc.java → src/main/java/com/ic/modules/auth/controller/NGPACalc.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,18 +25,18 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.L1slabsMappingService;
-import com.iRecruit.modules.auth.service.LeaderCalcService;
-import com.iRecruit.modules.auth.service.NGPACalcService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.L1slabsMappingService;
+import com.ic.modules.auth.service.LeaderCalcService;
+import com.ic.modules.auth.service.NGPACalcService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/NGPAtoNGPLCalc.java → src/main/java/com/ic/modules/auth/controller/NGPAtoNGPLCalc.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,18 +25,18 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.LeaderCalcConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.payload.L1slabsDto;
-import com.iRecruit.modules.auth.payload.mpbDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.L1slabsMappingService;
-import com.iRecruit.modules.auth.service.LeaderCalcService;
-import com.iRecruit.modules.auth.service.NGPAtoNGPLCalcService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.payload.L1slabsDto;
+import com.ic.modules.auth.payload.mpbDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.L1slabsMappingService;
+import com.ic.modules.auth.service.LeaderCalcService;
+import com.ic.modules.auth.service.NGPAtoNGPLCalcService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/TemplatesController.java → src/main/java/com/ic/modules/auth/controller/TemplatesController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.DBConfig;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.Templates;
-import com.iRecruit.modules.auth.payload.TemplatesDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.TemplatesService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.DBConfig;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.Templates;
+import com.ic.modules.auth.payload.TemplatesDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.TemplatesService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/controller/UserController.java → src/main/java/com/ic/modules/auth/controller/UserController.java

-package com.iRecruit.modules.auth.controller;
+package com.ic.modules.auth.controller;
 
 import javax.validation.Valid;
 
@@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iRecruit.annotation.AuditLogs;
-import com.iRecruit.constant.StatusCode;
-import com.iRecruit.exception.ResourceNotFoundException;
-import com.iRecruit.modules.auth.model.User;
-import com.iRecruit.modules.auth.payload.UserDto;
-import com.iRecruit.modules.auth.payload.request.ApiResponse;
-import com.iRecruit.modules.auth.service.UserService;
+import com.ic.annotation.AuditLogs;
+import com.ic.constant.StatusCode;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.User;
+import com.ic.modules.auth.payload.UserDto;
+import com.ic.modules.auth.payload.request.ApiResponse;
+import com.ic.modules.auth.service.UserService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/iRecruit/modules/auth/model/AuditLogs.java → src/main/java/com/ic/modules/auth/model/AuditLogs.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import java.util.Date;
 
@@ -9,7 +9,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 
-import com.iRecruit.modules.auth.payload.AuditLogsDto;
+import com.ic.modules.auth.payload.AuditLogsDto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/iRecruit/modules/auth/model/Auditable.java → src/main/java/com/ic/modules/auth/model/Auditable.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import static javax.persistence.TemporalType.TIMESTAMP;
 

src/main/java/com/iRecruit/modules/auth/model/Configurations.java → src/main/java/com/ic/modules/auth/model/Configurations.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,7 +26,7 @@ public class Configurations{
    
     @NotBlank
     @Column(length=50)
-    private String  config;
+    private String  key;
     
     @NotBlank
     @Column(length=500)
@@ -34,5 +34,7 @@ public class Configurations{
 
     private String  description;
     
+    private String isFrontEnd;
+    
 }
 

src/main/java/com/iRecruit/modules/auth/model/FycMapping.java → src/main/java/com/ic/modules/auth/model/FycMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/L1slabsMapping.java → src/main/java/com/ic/modules/auth/model/L1slabsMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/L2slabsMapping.java → src/main/java/com/ic/modules/auth/model/L2slabsMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/MDBMapping.java → src/main/java/com/ic/modules/auth/model/MDBMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/MpbMapping.java → src/main/java/com/ic/modules/auth/model/MpbMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/MsaMapping.java → src/main/java/com/ic/modules/auth/model/MsaMapping.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/com/iRecruit/modules/auth/model/PushNotificationRequest.java → src/main/java/com/ic/modules/auth/model/PushNotificationRequest.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 public class PushNotificationRequest {
 

src/main/java/com/iRecruit/modules/auth/model/PushNotificationResponse.java → src/main/java/com/ic/modules/auth/model/PushNotificationResponse.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 public class PushNotificationResponse {
 

src/main/java/com/iRecruit/modules/auth/model/Templates.java → src/main/java/com/ic/modules/auth/model/Templates.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
@@ -12,9 +11,7 @@ import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import com.iRecruit.constant.TemplateType;
+import com.ic.constant.TemplateType;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -30,7 +27,7 @@ public class Templates{
    
     @NotBlank
     @Column(length=50)
-    private String  config;
+    private String  key;
     
     @NotBlank
     @Lob

src/main/java/com/iRecruit/modules/auth/model/User.java → src/main/java/com/ic/modules/auth/model/User.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import java.sql.Timestamp;
 
@@ -12,8 +12,7 @@ import javax.persistence.Table;
 
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
+import com.ic.constant.Status;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -25,12 +24,8 @@ import lombok.Setter;
 @EntityListeners(AuditingEntityListener.class)
 public class User {
 	
-	//@Id
-	//@Column(length=10)
-	//private String id;
-	
-	@Id
 	@Column(length=11)
+	@Id
     private String userId;
     @Column(length=200)
     private String firstName;
@@ -55,11 +50,11 @@ public class User {
 	@Column(length=8)
     private Timestamp modifiedDate;
 	@Column(length=11)
-    private String level1NtId;
+    private String level1_NtId;
 	@Column(length=11)
-    private String level5NtId;
+    private String level5_NtId;
 	@Column(length=3)
-    private String level1DesignationCode;
+    private String level1_DesignationCode;
 	@Column(length=5)
     private String branchCode;
 	@Column(length=100)
@@ -71,58 +66,37 @@ public class User {
 	@Column(length=63)
     private String userRole2;
 	@Column(length=30)
-    private String level2DesignationC0de;
+    private String level2_DesignationC0de;
 	@Column(length=30)
     private String branchCdLevel2;
 	@Column(length=63)
     private String userRole3;
 	@Column(length=30)
-    private String level3DesignationC0de;
+    private String level3_DesignationC0de;
 	@Column(length=30)
     private String branchCdLevel3;
 	@Column(length=63)
     private String userRole4;
 	@Column(length=30)
-    private String level4DesignationC0de;
+    private String level4_DesignationC0de;
 	@Column(length=30)
     private String branchCdLevel4;
 	@Column(length=63)
     private String userRole5;
 	@Column(length=30)
-    private String level5DesignationC0de;
+    private String level5_DesignationC0de;
 	@Column(length=30)
     private String branchCdLevel5;
 	@Column(length=10)
     private String baType;
     private Long baRank;
-    
-    @Column(length=1)
-    private String gender;
-    
-    @Column(length=20)
-    private String dob;
-    
-    @Column(length=50)
-    private String branchName;
-    
-    @Column(length=20)
-    private String middleName;
-    
-    @Column(length=5)
-    private String designation;
-    
     @Column(length=10)
-    private String pan;
-    
-    @Column(length=1)
-    private String agentStatus;
+    private String employeeId;
     
     @Enumerated(EnumType.STRING)
     protected Status status = Status.ACTIVE;
     
-    @Enumerated(EnumType.STRING)
-    private RolesConstant role = RolesConstant.LEADER; 
-    
+    @Column(length=10)
     private String notificationId; 
     
     private int failedAttemptLogin = 0;

src/main/java/com/iRecruit/modules/auth/model/UserOTP.java → src/main/java/com/ic/modules/auth/model/UserOTP.java

-package com.iRecruit.modules.auth.model;
+package com.ic.modules.auth.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -16,8 +16,8 @@ import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import com.iRecruit.config.IdGenerator;
-import com.iRecruit.constant.Status;
+import com.ic.config.IdGenerator;
+import com.ic.constant.Status;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -33,7 +33,7 @@ public class UserOTP  extends Auditable<Long>{
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_otp_seq")
 	@GenericGenerator( 
 	        name = "user_otp_seq", 
-	        strategy = "com.iRecruit.config.IdGenerator", 
+	        strategy = "com.ic.config.IdGenerator", 
 	        parameters = {
 	            @Parameter(name = IdGenerator.INCREMENT_PARAM, value = "1"),
 	            @Parameter(name = IdGenerator.VALUE_PREFIX_PARAMETER, value = "UO"),

src/main/java/com/iRecruit/modules/auth/payload/AuditLogsDto.java → src/main/java/com/ic/modules/auth/payload/AuditLogsDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
-import com.iRecruit.modules.auth.model.AuditLogs;
+import com.ic.modules.auth.model.AuditLogs;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/iRecruit/modules/auth/payload/ConfigurationsDto.java → src/main/java/com/ic/modules/auth/payload/ConfigurationsDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import javax.validation.constraints.NotBlank;
 
-import com.iRecruit.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.Configurations;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25,10 +25,13 @@ public class ConfigurationsDto{
 
     private String  description;
     
+    private String isFrontEnd;
+    
     public ConfigurationsDto(Configurations configurations) {
-    	this.key = configurations.getConfig();
+    	this.key = configurations.getKey();
     	this.value = configurations.getValue();
     	this.description = configurations.getDescription();
+    	this.isFrontEnd = configurations.getIsFrontEnd();
     }
 }
 

src/main/java/com/iRecruit/modules/auth/payload/IdDto.java → src/main/java/com/ic/modules/auth/payload/IdDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/iRecruit/modules/auth/payload/L1slabsDto.java → src/main/java/com/ic/modules/auth/payload/L1slabsDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import javax.validation.constraints.NotBlank;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.model.FycMapping;
+import com.ic.constant.RolesConstant;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.FycMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,7 +19,7 @@ import lombok.ToString;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.model.MpbMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -30,7 +30,7 @@ import lombok.ToString;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.modules.auth.model.L1slabsMapping;
+import com.ic.modules.auth.model.L1slabsMapping;
 
 
 import lombok.AllArgsConstructor;

src/main/java/com/iRecruit/modules/auth/payload/L2slabsDto.java → src/main/java/com/ic/modules/auth/payload/L2slabsDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-import com.iRecruit.modules.auth.model.L2slabsMapping;
+import com.ic.modules.auth.model.L2slabsMapping;
 
 
 import lombok.AllArgsConstructor;

src/main/java/com/iRecruit/modules/auth/payload/MDBDto.java → src/main/java/com/ic/modules/auth/payload/MDBDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-import com.iRecruit.modules.auth.model.MDBMapping;
+import com.ic.modules.auth.model.MDBMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/iRecruit/modules/auth/payload/MsaDto.java → src/main/java/com/ic/modules/auth/payload/MsaDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 
 import javax.validation.constraints.NotBlank;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.model.FycMapping;
+import com.ic.constant.RolesConstant;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.FycMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,8 +20,8 @@ import lombok.ToString;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.modules.auth.model.MpbMapping;
-import com.iRecruit.modules.auth.model.MsaMapping;
+import com.ic.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.model.MsaMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/iRecruit/modules/auth/payload/OTPResponse.java → src/main/java/com/ic/modules/auth/payload/OTPResponse.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/iRecruit/modules/auth/payload/P100LoginResponse.java → src/main/java/com/ic/modules/auth/payload/P100LoginResponse.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/iRecruit/modules/auth/payload/RoleDto.java → src/main/java/com/ic/modules/auth/payload/RoleDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/iRecruit/modules/auth/payload/TemplatesDto.java → src/main/java/com/ic/modules/auth/payload/TemplatesDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import javax.validation.constraints.NotBlank;
 
-import com.iRecruit.constant.TemplateType;
-import com.iRecruit.modules.auth.model.Templates;
+import com.ic.constant.TemplateType;
+import com.ic.modules.auth.model.Templates;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -28,7 +28,7 @@ public class TemplatesDto{
     private TemplateType  type;
     
     public TemplatesDto(Templates template) {
-    	this.key = template.getConfig();
+    	this.key = template.getKey();
     	this.value = template.getValue();
     	this.type = template.getType();
     }

src/main/java/com/iRecruit/modules/auth/payload/UserDto.java → src/main/java/com/ic/modules/auth/payload/UserDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -8,9 +8,9 @@ import javax.validation.constraints.Pattern;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.User;
+import com.ic.constant.RolesConstant;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.User;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -59,7 +59,7 @@ public class UserDto {
     	this.email = user.getEmailId();
     	this.notificationId = user.getNotificationId();
     	this.failedAttemptLogin = user.getFailedAttemptLogin();
-    	this.role = user.getRole();
+    	//this.role = user.getRole();
     }
 
 }
\ No newline at end of file

src/main/java/com/iRecruit/modules/auth/payload/UserOTPDto.java → src/main/java/com/ic/modules/auth/payload/UserOTPDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.UserOTP;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.UserOTP;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/iRecruit/modules/auth/payload/fycDto.java → src/main/java/com/ic/modules/auth/payload/fycDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 import javax.validation.constraints.NotBlank;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.model.FycMapping;
+import com.ic.constant.RolesConstant;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.FycMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/iRecruit/modules/auth/payload/mpbDto.java → src/main/java/com/ic/modules/auth/payload/mpbDto.java

-package com.iRecruit.modules.auth.payload;
+package com.ic.modules.auth.payload;
 
 
 import javax.validation.constraints.NotBlank;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.constant.RolesConstant;
-import com.iRecruit.constant.Status;
-import com.iRecruit.modules.auth.model.Configurations;
-import com.iRecruit.modules.auth.model.FycMapping;
+import com.ic.constant.RolesConstant;
+import com.ic.constant.Status;
+import com.ic.modules.auth.model.Configurations;
+import com.ic.modules.auth.model.FycMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,7 +20,7 @@ import lombok.ToString;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.iRecruit.modules.auth.model.MpbMapping;
+import com.ic.modules.auth.model.MpbMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/iRecruit/modules/auth/payload/request/ApiResponse.java → src/main/java/com/ic/modules/auth/payload/request/ApiResponse.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
-import com.iRecruit.modules.auth.model.FycMapping;
+import com.ic.modules.auth.model.FycMapping;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/iRecruit/modules/auth/payload/request/Apiresponse1.java → src/main/java/com/ic/modules/auth/payload/request/Apiresponse1.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
 import org.json.JSONObject;
 

src/main/java/com/iRecruit/modules/auth/payload/request/Condition.java → src/main/java/com/ic/modules/auth/payload/request/Condition.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
 import java.util.List;
 

src/main/java/com/iRecruit/modules/auth/payload/request/JwtAuthenticationResponse.java → src/main/java/com/ic/modules/auth/payload/request/JwtAuthenticationResponse.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/iRecruit/modules/auth/payload/request/JwtCustomPayload.java → src/main/java/com/ic/modules/auth/payload/request/JwtCustomPayload.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 /*
- * package com.iRecruit.payload;
+ * package com.ic.payload;
  * 
  * import java.util.Set;
  * 

src/main/java/com/iRecruit/modules/auth/payload/request/LoginRequest.java → src/main/java/com/ic/modules/auth/payload/request/LoginRequest.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
 import javax.validation.constraints.NotBlank;
 

src/main/java/com/iRecruit/modules/auth/payload/request/OTPRequest.java → src/main/java/com/ic/modules/auth/payload/request/OTPRequest.java

-package com.iRecruit.modules.auth.payload.request;
+package com.ic.modules.auth.payload.request;
 
 import lombok.Getter;
 import lombok.Setter;