diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..c5f3f6b9c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index be7508be5..49c9b6d03 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,26 +1,39 @@
-pipeline {
+
+ pipeline {
     
 	agent any
-/*	
+	
 	tools {
-        maven "maven3"
+        maven "MAVEN3"
     }
-*/	
+	
     environment {
+        NEXUS_USER = 'admin'
+        NEXUS_PASS ='1010'
+        RELEASE_REPO = 'vprofile-release24'
+        CENTRAL_REPO ='vpro-maven-central-24'
+        NEXUS_LOGIN = 'nexuslogin'
+        NEXUSIP ='10.0.12.178'
+        NEXUSPORT = '8081'
+        NEXUS_GRP_REPO = 'vpro-maven-group-24'
         NEXUS_VERSION = "nexus3"
         NEXUS_PROTOCOL = "http"
-        NEXUS_URL = "172.31.40.209:8081"
-        NEXUS_REPOSITORY = "vprofile-release"
-	NEXUS_REPO_ID    = "vprofile-release"
+        NEXUS_URL = "10.0.12.178:8081"
+        NEXUS_REPOSITORY = "vprofile-release24"
+	    NEXUS_REPOGRP_ID   = "vprofile-grp-repo"
         NEXUS_CREDENTIAL_ID = "nexuslogin"
         ARTVERSION = "${env.BUILD_ID}"
+        SONARSERVER = "sonarserver"
+        SONERSCANNER = "sonarscanner"
+        /* NEXUSPASS = credentials('nexuspass') */
     }
 	
     stages{
         
         stage('BUILD'){
             steps {
-                sh 'mvn clean install -DskipTests'
+               /* sh 'mvn clean install -DskipTests' */
+                sh 'mvn -s settings.xml -DskipTests install'
             }
             post {
                 success {
@@ -56,11 +69,11 @@ pipeline {
         stage('CODE ANALYSIS with SONARQUBE') {
           
 		  environment {
-             scannerHome = tool 'sonarscanner4'
+             scannerHome = tool "${SONERSCANNER}"
           }
 
           steps {
-            withSonarQubeEnv('sonar-pro') {
+            withSonarQubeEnv("${SONARSCANNER}") {
                sh '''${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=vprofile \
                    -Dsonar.projectName=vprofile-repo \
                    -Dsonar.projectVersion=1.0 \
@@ -91,7 +104,7 @@ pipeline {
                             nexusVersion: NEXUS_VERSION,
                             protocol: NEXUS_PROTOCOL,
                             nexusUrl: NEXUS_URL,
-                            groupId: pom.groupId,
+                            groupId: NEXUS_REPOGRP_ID,
                             version: ARTVERSION,
                             repository: NEXUS_REPOSITORY,
                             credentialsId: NEXUS_CREDENTIAL_ID,
@@ -114,8 +127,31 @@ pipeline {
             }
         }
 
-
+    stage('Ansible Deploy to staging'){
+        steps {
+            ansiblePlaybook([
+            inventory   : 'ansible/stage.inventory',
+            playbook    : 'ansible/site.yml',
+            installation: 'ansible',
+            colorized   : true,
+            credentialsId: 'applogin',
+            disableHostKeyChecking: true,
+            extraVars  : [
+                USER: "admin",
+                PASS: "${NEXUSPASS}",
+                nexusip: "10.0.12.178",
+                reponame: "vprofile-release24",
+                groupid: "QA",
+                time: "${env.BUILD_TIMESTAMP}",
+                build: "${env.BUILD_ID}",
+                artifactid: "vproapp",
+                vprofile_version: "vproapp-${env.BUILD_ID}-${env.BUILD_TIMESTAMP}.war"
+            ]
+            ])
+        }
+    }
+    
     }
+}     
 
 
-}
diff --git a/Jenkinsfile1 b/Jenkinsfile1
new file mode 100644
index 000000000..8212c9b91
--- /dev/null
+++ b/Jenkinsfile1
@@ -0,0 +1,137 @@
+/*def COLOR_MAP = [
+    'SUCCESS': 'good', 
+    'FAILURE': 'danger',
+] */
+pipeline {
+    agent any
+    tools {
+        maven "MAVEN3"
+       /* jdk "OracleJDK8" */
+    }
+    
+    environment {
+        SNAP_REPO = 'vprofile-snapshot-24'
+		NEXUS_USER = 'admin'
+		NEXUS_PASS = '1010'
+		RELEASE_REPO = 'vprofile-release24'
+		CENTRAL_REPO = 'vpro-maven-central-24'
+		NEXUSIP = '10.0.12.178'
+		NEXUSPORT = '8081'
+		NEXUS_GRP_REPO = 'vpro-maven-group-24'
+        NEXUS_LOGIN = 'nexuslogin'
+        SONARSERVER = 'sonarserver'
+        SONARSCANNER = 'sonarscanner'
+        NEXUSPASS = credentials('nexuslogin')
+    }
+
+    stages {
+        stage('Build'){
+            steps {
+                sh 'mvn -s settings.xml -DskipTests install'
+            }
+            post {
+                success {
+                    echo "Now Archiving."
+                    archiveArtifacts artifacts: '**/*.war'
+                }
+            }
+        }
+
+        stage('Test'){
+            steps {
+                sh 'mvn -s settings.xml test'
+            }
+
+        }
+
+        stage('Checkstyle Analysis'){
+            steps {
+                sh 'mvn -s settings.xml checkstyle:checkstyle'
+            }
+        }
+
+        stage('Sonar Analysis') {
+            environment {
+                scannerHome = tool "${SONARSCANNER}"
+            }
+            steps {
+               withSonarQubeEnv("${SONARSERVER}") {
+                   sh '''${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=vprofile \
+                   -Dsonar.projectName=vprofile \
+                   -Dsonar.projectVersion=1.0 \
+                   -Dsonar.sources=src/ \
+                   -Dsonar.java.binaries=target/test-classes/com/visualpathit/account/controllerTest/ \
+                   -Dsonar.junit.reportsPath=target/surefire-reports/ \
+                   -Dsonar.jacoco.reportsPath=target/jacoco.exec \
+                   -Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml'''
+              }
+            }
+        }
+/*
+        stage("Quality Gate") {
+            steps {
+                timeout(time: 3, unit: 'MINUTES') {
+                    // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails
+                    // true = set pipeline to UNSTABLE, false = don't
+                    waitForQualityGate abortPipeline: false 
+                }
+            }
+        }
+*/ 
+        stage("UploadArtifact"){
+            steps{
+                nexusArtifactUploader(
+                  nexusVersion: 'nexus3',
+                  protocol: 'http',
+                  nexusUrl: "${NEXUSIP}:${NEXUSPORT}",
+                  groupId: 'QA',
+                  version: "${env.BUILD_ID}-${env.BUILD_TIMESTAMP}",
+                  repository: "${RELEASE_REPO}",
+                  credentialsId: "${NEXUS_LOGIN}",
+                  artifacts: [
+                    [artifactId: 'vproapp',
+                     classifier: '',
+                     file: 'target/vprofile-v2.war',
+                     type: 'war']
+                  ]
+                )
+            }
+        }
+
+        stage('Ansible Deploy to staging'){
+            steps {
+                ansiblePlaybook([
+                inventory   : 'ansible/stage.inventory',
+                playbook    : 'ansible/site.yml',
+                installation: 'ansible',
+                colorized   : true,
+			    credentialsId: 'applogin',
+			    disableHostKeyChecking: true,
+                extraVars   : [
+                   	USER: "admin",
+                    /*PASS: "${NEXUSPASS}",*/
+                    PASS: "1010",
+			        nexusip: "10.0.12.178",
+			        reponame: "vprofile-release24",
+			        groupid: "QA",
+			        time: "${env.BUILD_TIMESTAMP}",
+			        build: "${env.BUILD_ID}",
+                    artifactid: "vproapp",
+			        vprofile_version: "vproapp-${env.BUILD_ID}-${env.BUILD_TIMESTAMP}.war"
+                   // vprofile_version: "vproapp-${env.BUILD_ID}.war"
+                    
+                ]
+             ])
+            }
+        }
+
+    }
+    post {
+        always {
+            echo 'Slack Notifications.'
+            slackSend channel: '#jenkinscicd',
+                color: COLOR_MAP[currentBuild.currentResult],
+                message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} \n More info at: ${env.BUILD_URL}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/Jenkinsfile2 b/Jenkinsfile2
new file mode 100644
index 000000000..62769d194
--- /dev/null
+++ b/Jenkinsfile2
@@ -0,0 +1,153 @@
+/*def COLOR_MAP = [
+    'SUCCESS': 'good', 
+    'FAILURE': 'danger',
+] */
+pipeline {
+    agent any
+    tools {
+        maven "MAVEN3"
+        jdk "OracleJDK8" 
+    }
+    
+    environment {
+        SNAP_REPO = 'vprofile-snapshot-24'
+		NEXUS_USER = 'admin'
+		NEXUS_PASS = '1010'
+		RELEASE_REPO = 'vprofile-release24'
+		CENTRAL_REPO = 'vpro-maven-central-24'
+		NEXUSIP = '10.0.12.178'
+		NEXUSPORT = '8081'
+		NEXUS_GRP_REPO = 'vpro-maven-group-24'
+        NEXUS_LOGIN = 'nexuslogin'
+        SONARSERVER = 'sonarserver'
+        SONARSCANNER = 'sonarscanner'
+        NEXUSPASS = credentials('nexuslogin')
+        CURRENT_TIME = ''
+    }
+
+    stages {
+        stage('Build'){
+            steps {
+                sh 'mvn -s settings.xml -DskipTests install'
+            }
+            post {
+                success {
+                    echo "Now Archiving."
+                    archiveArtifacts artifacts: '**/*.war'
+                }
+            }
+        }
+
+        stage('Test'){
+            steps {
+                sh 'mvn -s settings.xml test'
+            }
+
+        }
+
+        stage('Checkstyle Analysis'){
+            steps {
+                sh 'mvn -s settings.xml checkstyle:checkstyle'
+            }
+        }
+
+        stage('Sonar Analysis') {
+            environment {
+                scannerHome = tool "${SONARSCANNER}"
+            }
+            steps {
+               withSonarQubeEnv("${SONARSERVER}") {
+                   sh '''${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=vprofile \
+                   -Dsonar.projectName=vprofile \
+                   -Dsonar.projectVersion=1.0 \
+                   -Dsonar.sources=src/ \
+                   -Dsonar.java.binaries=target/test-classes/com/visualpathit/account/controllerTest/ \
+                   -Dsonar.junit.reportsPath=target/surefire-reports/ \
+                   -Dsonar.jacoco.reportsPath=target/jacoco.exec \
+                   -Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml'''
+              }
+            }
+        }
+/*
+        stage("Quality Gate") {
+            steps {
+                timeout(time: 3, unit: 'MINUTES') {
+                    // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails
+                    // true = set pipeline to UNSTABLE, false = don't
+                    waitForQualityGate abortPipeline: false 
+                }
+            }
+        }
+*/ 
+        stage("Set Time") {
+            steps {
+                script {
+                    // Get the current date and time
+                    def currentTime = new Date()
+                    def formattedTime = currentTime.format("yyyy-MM-dd_HH-mm-ss")
+
+                    // Set the environment variable
+                    env.CURRENT_TIME = formattedTime
+
+                    // Print the current time
+                    echo "Current Time: ${env.CURRENT_TIME}"
+                }
+            }
+        }
+        stage("UploadArtifact"){
+            steps{
+                nexusArtifactUploader(
+                  nexusVersion: 'nexus3',
+                  protocol: 'http',
+                  nexusUrl: "${NEXUSIP}:${NEXUSPORT}",
+                  groupId: 'QA',
+                  version: "${env.BUILD_ID}-${env.CURRENT_TIME}",
+                  repository: "${RELEASE_REPO}",
+                  credentialsId: "${NEXUS_LOGIN}",
+                  artifacts: [
+                    [artifactId: 'vproapp',
+                     classifier: '',
+                     file: 'target/vprofile-v2.war',
+                     type: 'war']
+                  ]
+                )
+            }
+        }
+
+        stage('Ansible Deploy to staging'){
+            steps {
+                ansiblePlaybook([
+                inventory   : 'ansible/stage.inventory',
+                playbook    : 'ansible/site.yml',
+                installation: 'ansible',
+                colorized   : true,
+			    credentialsId: 'applogin',
+			    disableHostKeyChecking: true,
+                extraVars   : [
+                   	USER: "admin",
+                    /*PASS: "${NEXUSPASS}",*/
+                    PASS: "1010",
+			        nexusip: "10.0.12.178",
+			        reponame: "vprofile-release24",
+			        groupid: "QA",
+			        time: "${env.CURRENT_TIME}",
+			        build: "${env.BUILD_ID}",
+                    artifactid: "vproapp",
+			        vprofile_version: "vproapp-${env.BUILD_ID}-${env.CURRENT_TIME}.war"
+                   
+                    
+                ]
+             ])
+            }
+        }
+
+    }
+   /* post {
+        always {
+            echo 'Slack Notifications.'
+            slackSend channel: '#jenkinscicd',
+                color: COLOR_MAP[currentBuild.currentResult],
+                message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} \n More info at: ${env.BUILD_URL}"
+        }
+    } */
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 363dff34f..84ce5d07f 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
-# Prerequisites
-#
+####
+### Prerequisites
 - JDK 1.8 or later
 - Maven 3 or later
 - MySQL 5.6 or later
 
-# Technologies 
+### Technologies 
 - Spring MVC
 - Spring Security
 - Spring Data JPA
 - Maven
 - JSP
 - MySQL
-# Database
+### Database
 Here,we used Mysql DB 
 MSQL DB Installation Steps for Linux ubuntu 14.04:
 - $ sudo apt-get update
diff --git a/ansible/stage.inventory b/ansible/stage.inventory
new file mode 100644
index 000000000..714b0ac7e
--- /dev/null
+++ b/ansible/stage.inventory
@@ -0,0 +1,3 @@
+[appsrvgrp]
+# app01stg.donbarbies.com 
+10.0.12.182
\ No newline at end of file
diff --git a/ansible/vpro-app-setup.yml b/ansible/vpro-app-setup.yml
index 0c3f5d4a5..e59b96a02 100644
--- a/ansible/vpro-app-setup.yml
+++ b/ansible/vpro-app-setup.yml
@@ -3,12 +3,18 @@
   hosts: appsrvgrp
   become: yes
   vars:
-    timestamp: "{{ansible_date_time.date}}_{{ansible_date_time.hour}}_{{ansible_date_time.minute}}"
+  #  timestamp: "{{ ansible_date_time.date }}_{{ ansible_date_time.hour }}_{{ ansible_date_time.minute }}"
+  #  timestamp: "{{ ansible_date_time.date }}"
+    time: "{{ lookup('pipe', 'date +%Y-%m-%dT%H-%M-%S-UTC') }}"
   tasks:
     - name: Download latest VProfile.war from nexus
       get_url:
-        url: "http://{{USER}}:{{PASS}}@{{nexusip}}:8081/repository/{{reponame}}/{{groupid}}/{{time}}/{{build}}/{{vprofile_version}}"
-        dest: "/tmp/vproapp-{{vprofile_version}}"
+        url: "http://{{USER}}:{{PASS}}@{{nexusip}}:8081/repository/{{reponame}}/{{groupid}}/{{artifactid}}/{{build}}-{{time}}/{{vprofile_version}}"
+       # url: "http://{{ USER }}:{{ PASS }}@{{ nexusip }}:8081/repository/{{ reponame }}/{{ groupid }}/{{ artifactid }}/{{ build }}.war"
+      #  url: "http://{{USER}}:{{PASS}}@{{nexusip}}:8081/repository/{{reponame}}/{{groupid}}/{{artifactid}}/{{build}}/{{vprofile_version}}"
+        
+        dest: "/tmp/vproapp-{{ vprofile_version }}"
+       # dest: "/tmp/vproapp-2"
       register: wardeploy
       tags:
        - deploy
@@ -31,7 +37,8 @@
       - name: Archive ROOT dir with timestamp
         archive:
           path: /usr/local/tomcat8/webapps/ROOT
-          dest: "/opt/ROOT_{{timestamp}}.tgz"
+          #dest: "/opt/ROOT_{{timestamp}}.tgz"
+          dest: "/opt/ROOT_{{time}}.tgz"
         when: artifact_stat.stat.exists
         register: archive_info
         tags:
@@ -58,6 +65,8 @@
          - name: Deploy vprofile artifact
            copy:
              src: "/tmp/vproapp-{{vprofile_version}}"
+             #src: "/tmp/vproapp-2"
+             
              dest: /usr/local/tomcat8/webapps/ROOT.war
              remote_src: yes
            register: deploy_info
diff --git a/ansible/vprofile.yml b/ansible/vprofile.yml
new file mode 100644
index 000000000..c8d6de6df
--- /dev/null
+++ b/ansible/vprofile.yml
@@ -0,0 +1,39 @@
+---
+- hosts: tomcatservers
+  become: yes
+  gather_facts: False
+  tasks:
+
+  - name: Install EPEL-release
+    yum: name=epel-release state=present
+
+
+  - name: Install java_1.8
+    yum: name=java-1.8.0-openjdk.x86_64 state=present
+
+  - name: Install tomcat
+    yum: name=tomcat state=present
+
+
+  - name: Download latest VProfile.war file
+    get_url: url=http://{{nexusip}}:8081/nexus/content/repositories/VProfile-repo/{{groupid}}/{{time}}/{{build}}/{{vprofile_version}} dest=/tmp/ mode=755
+
+  - name: Stop tomcat service
+    service: name=tomcat state=stopped
+
+  - name: Copy artifact to tomcat folder
+    shell: cp /tmp/{{vprofile_version}} /var/lib/tomcat/webapps
+
+  - name: Delete link to existing vprofile version
+    file: path=/var/lib/tomcat/webapps/VProfile state=absent
+
+  - name: Start tomcat service
+    service: name=tomcat state=started
+  - wait_for: path=/var/lib/tomcat/webapps/{{time}}-{{build}}
+
+  - name: Link latest vprofile version
+    file: src=/var/lib/tomcat/webapps/{{time}}-{{build}} dest=/var/lib/tomcat/webapps/VProfile state=link
+
+  - name: Stop iptables
+    service: name=iptables state=stopped
+
diff --git a/jenks-edited-opt/Jenkinsfile b/jenks-edited-opt/Jenkinsfile
new file mode 100644
index 000000000..0eb27a7d1
--- /dev/null
+++ b/jenks-edited-opt/Jenkinsfile
@@ -0,0 +1,136 @@
+def COLOR_MAP = [
+    'SUCCESS': 'good', 
+    'FAILURE': 'danger',
+]
+pipeline {
+    agent any
+    tools {
+        maven "MAVEN3"
+        jdk "OracleJDK8"
+    }
+    
+    environment {
+        SNAP_REPO = 'vprofile-snapshot-24'
+		NEXUS_USER = 'admin'
+		NEXUS_PASS = '1010'
+		RELEASE_REPO = 'vprofile-release24'
+		CENTRAL_REPO = 'vpro-maven-central-24'
+		NEXUSIP = '10.0.12.178'
+		NEXUSPORT = '8081'
+		NEXUS_GRP_REPO = 'vpro-maven-group-24'
+        NEXUS_LOGIN = 'nexuslogin'
+        SONARSERVER = 'sonarserver'
+        SONARSCANNER = 'sonarscanner'
+        NEXUSPASS = credentials('nexuspass')
+    }
+
+    stages {
+        stage('Build'){
+            steps {
+                sh 'mvn -s settings.xml -DskipTests install'
+            }
+            post {
+                success {
+                    echo "Now Archiving."
+                    archiveArtifacts artifacts: '**/*.war'
+                }
+            }
+        }
+
+        stage('Test'){
+            steps {
+                sh 'mvn -s settings.xml test'
+            }
+
+        }
+
+        stage('Checkstyle Analysis'){
+            steps {
+                sh 'mvn -s settings.xml checkstyle:checkstyle'
+            }
+        }
+        /* edited sonarqube on jenkins */
+        stage('Sonar Analysis') {
+            environment {
+                scannerHome = tool "${SONARSCANNER}"
+            }
+            steps {
+               withSonarQubeEnv("${SONARSERVER}") {
+                   sh '''${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=vprofile \
+                   -Dsonar.projectName=vprofile \
+                   -Dsonar.projectVersion=1.0 \
+                   -Dsonar.sources=src/ \
+                   -Dsonar.java.binaries=target/test-classes/com/visualpathit/account/controllerTest/ \
+                   -Dsonar.junit.reportsPath=target/surefire-reports/ \
+                   -Dsonar.jacoco.reportsPath=target/jacoco.exec \
+                   -Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml'''
+              }
+            }
+        }
+
+        stage("Quality Gate") {
+            steps {
+                timeout(time: 1, unit: 'HOURS') {
+                    // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails
+                    // true = set pipeline to UNSTABLE, false = don't
+                    waitForQualityGate abortPipeline: true
+                }
+            }
+        }
+
+        stage("UploadArtifact"){
+            steps{
+                nexusArtifactUploader(
+                  nexusVersion: 'nexus3',
+                  protocol: 'http',
+                  nexusUrl: "${NEXUSIP}:${NEXUSPORT}",
+                  groupId: 'QA',
+                  version: "${env.BUILD_ID}-${env.BUILD_TIMESTAMP}",
+                  repository: "${RELEASE_REPO}",
+                  credentialsId: "${NEXUS_LOGIN}",
+                  artifacts: [
+                    [artifactId: 'vproapp',
+                     classifier: '',
+                     file: 'target/vprofile-v2.war',
+                     type: 'war']
+                  ]
+                )
+            }
+        }
+
+        stage('Ansible Deploy to staging'){
+            steps {
+                ansiblePlaybook([
+                inventory   : 'ansible/stage.inventory',
+                playbook    : 'ansible/site.yml',
+                installation: 'ansible',
+                colorized   : true,
+			    credentialsId: 'applogin',
+			    disableHostKeyChecking: true,
+                extraVars   : [
+                   	USER: "admin",
+                    PASS: "${NEXUSPASS}",
+			        nexusip: "10.0.12.178",
+			        reponame: "vprofile-release24",
+			        groupid: "QA",
+			        time: "${env.BUILD_TIMESTAMP}",
+			        build: "${env.BUILD_ID}",
+                    artifactid: "vproapp",
+			        vprofile_version: "vproapp-${env.BUILD_ID}-${env.BUILD_TIMESTAMP}.war"
+                ]
+             ])
+            }
+        }
+
+    }
+    post {
+        always {
+            echo 'Slack Notifications.'
+            slackSend channel: '#jenkinscicd',
+                color: COLOR_MAP[currentBuild.currentResult],
+                message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} \n More info at: ${env.BUILD_URL}"
+        }
+    }
+}
+
+   
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7671cef34..f5b3ead87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
             <artifactId>spring-web</artifactId>
             <version>${spring.version}</version>
         </dependency>
-	    
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
-	    
+
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
@@ -90,82 +90,36 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-	    <groupId>org.mockito</groupId>
-    	    <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-	</dependency>
-	<dependency>
-	     <groupId>org.springframework</groupId>
-	     <artifactId>spring-test</artifactId>
-	     <version>3.2.3.RELEASE</version>
-	     <scope>test</scope>
-	</dependency>
-	<dependency>
-	     <groupId>javax.servlet</groupId>
-	     <artifactId>javax.servlet-api</artifactId>
-	     <version>3.1.0</version>
-	     <scope>provided</scope>
-	</dependency>		
+    		<groupId>org.mockito</groupId>
+    		<artifactId>mockito-core</artifactId>
+    		<version>1.9.5</version>
+    		<scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework</groupId>
+		    <artifactId>spring-test</artifactId>
+		    <version>3.2.3.RELEASE</version>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		        <groupId>javax.servlet</groupId>
+			    <artifactId>javax.servlet-api</artifactId>
+			    <version>3.1.0</version>
+			    <scope>provided</scope>
+		</dependency>		
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
         </dependency>
         <dependency>
-    	    <groupId>org.hamcrest</groupId>
-    	    <artifactId>hamcrest-all</artifactId>
-    	    <version>1.3</version>
-    	    <scope>test</scope>
-		</dependency>
-	        <dependency>
-		    <groupId>commons-fileupload</groupId>
-		    <artifactId>commons-fileupload</artifactId>
-		    <version>1.3.1</version>
-		</dependency>
-		 <!-- Memcached Dependency -->
-		<dependency>
-		    <groupId>net.spy</groupId>
-		    <artifactId>spymemcached</artifactId>
-		    <version>2.12.3</version>
-		</dependency>				
-		<dependency>
-		    <groupId>commons-io</groupId>
-		    <artifactId>commons-io</artifactId>
-		    <version>2.4</version>
-	    </dependency>
-	    <!-- RabbitMQ Dependency -->
-	    <dependency>
-	            <groupId>org.springframework.amqp</groupId>
-	            <artifactId>spring-rabbit</artifactId>
-	            <version>1.7.1.RELEASE</version>
-	    </dependency>
-	
-	    <dependency>
-	            <groupId>com.rabbitmq</groupId>
-	            <artifactId>amqp-client</artifactId>
-	            <version>4.0.2</version>
-	   </dependency>
-	   <!-- Elasticsearch Dependency-->
-		<dependency>
-		    <groupId>org.elasticsearch</groupId>
-		    <artifactId>elasticsearch</artifactId>
-		    <version>5.6.4</version>
-		</dependency>
-		<!-- Transport Client-->
-		<dependency>
-		    <groupId>org.elasticsearch.client</groupId>
-		    <artifactId>transport</artifactId>
-		    <version>5.6.4</version>
-		</dependency>
-		<!--gson -->
-		<dependency>
-		    <groupId>com.google.code.gson</groupId>
-		    <artifactId>gson</artifactId>
-		    <version>2.8.2</version>
+    		<groupId>org.hamcrest</groupId>
+    		<artifactId>hamcrest-all</artifactId>
+    		<version>1.3</version>
+    		<scope>test</scope>
 		</dependency>
     </dependencies>
-     <build>
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
@@ -179,28 +133,38 @@
                 </configuration>
             </plugin>
 		<!-- CODE COVERAGE -->
+		    <plugin>
+                     <groupId>org.apache.maven.plugins</groupId>
+                     <artifactId>maven-war-plugin</artifactId>
+                     <version>3.2.2</version>
+                    </plugin>
  		    <plugin>
  		        <groupId>org.jacoco</groupId>
  		        <artifactId>jacoco-maven-plugin</artifactId>
- 		        <version>0.7.2.201409121644</version>
- 		        <executions>
- 		            <execution>
- 		                <id>jacoco-initialize</id>
- 		                <phase>process-resources</phase>
- 		                <goals>
- 		                    <goal>prepare-agent</goal>
- 		                </goals>
- 		            </execution>
- 		            <execution>
- 		                <id>jacoco-site</id>
- 		                <phase>post-integration-test</phase>
- 		                <goals>
- 		                    <goal>report</goal>
- 		                </goals>
- 		            </execution>
- 		        </executions>
- 		</plugin>
-		
+			<version>0.8.4</version>
+		        <executions>
+		            <execution>
+		                <id>jacoco-initialize</id>
+		                <phase>process-resources</phase>
+		                <goals>
+		                    <goal>prepare-agent</goal>
+		                </goals>
+		            </execution>
+		            <execution>
+		                <id>jacoco-site</id>
+		                <phase>post-integration-test</phase>
+		                <goals>
+		                    <goal>report</goal>
+		                </goals>
+		            </execution>
+		        </executions>
+		</plugin>
         </plugins>
     </build>
+	<repositories>
+    <repository>
+      <id>${NEXUS_GRP_REPO}</id>
+      <url>http://${NEXUSIP}:${NEXUSPORT}/repository/${NEXUS_GRP_REPO}/</url>
+    </repository>
+  </repositories>
 </project>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000..8e11c6e8c
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+
+  <servers>
+    <server>
+      <id>${SNAP_REPO}</id>
+      <username>${NEXUS_USER}</username>
+      <password>${NEXUS_PASS}</password>
+    </server>
+    <server>
+      <id>${RELEASE_REPO}</id>
+      <username>${NEXUS_USER}</username>
+      <password>${NEXUS_PASS}</password>
+    </server>
+        <server>
+        <id>${CENTRAL_REPO}</id>
+      <username>${NEXUS_USER}</username>
+      <password>${NEXUS_PASS}</password>
+    </server>
+    <server>
+        <id>${NEXUS_GRP_REPO}</id>
+      <username>${NEXUS_USER}</username>
+      <password>${NEXUS_PASS}</password>
+    </server>
+  </servers>
+
+  <mirrors>
+    <mirror>
+      <id>${CENTRAL_REPO}</id>
+      <name>${CENTRAL_REPO}</name>
+      <url>http://${NEXUSIP}:${NEXUSPORT}/repository/${NEXUS_GRP_REPO}/</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+
+</settings>
diff --git a/src/main/java/com/visualpathit/account/beans/Components.java b/src/main/java/com/visualpathit/account/beans/Components.java
deleted file mode 100644
index f58b21fa9..000000000
--- a/src/main/java/com/visualpathit/account/beans/Components.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.visualpathit.account.beans;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Components {
-	
-	@Value("${memcached.active.host}")
-    private String activeHost;
-	@Value("${memcached.active.port}")
-    private String activePort;
-	@Value("${memcached.standBy.host}")
-    private String standByHost;
-	@Value("${memcached.standBy.port}")
-    private String standByPort;
-	
-	@Value("${rabbitmq.address}")
-    private String rabbitMqHost;
-	@Value("${rabbitmq.port}")
-    private String rabbitMqPort;
-	@Value("${rabbitmq.username}")
-    private String rabbitMqUser;
-	@Value("${rabbitmq.password}")
-    private String rabbitMqPassword;
-	
-	@Value("${elasticsearch.host}")
-    private String elasticsearchHost;
-	@Value("${elasticsearch.port}")
-    private String elasticsearchPort;
-	@Value("${elasticsearch.cluster}")
-    private String elasticsearchCluster;
-	@Value("${elasticsearch.node}")
-    private String elasticsearchNode;
-	
-	
-	public String getActiveHost() {
-		return activeHost;
-	}
-	public String getActivePort() {
-		return activePort;
-	}
-	public String getStandByHost() {
-		return standByHost;
-	}
-	public String getStandByPort() {
-		return standByPort;
-	}
-	public void setActiveHost(String activeHost) {
-		this.activeHost = activeHost;
-	}
-	public void setActivePort(String activePort) {
-		this.activePort = activePort;
-	}
-	public void setStandByHost(String standByHost) {
-		this.standByHost = standByHost;
-	}
-	public void setStandByPort(String standByPort) {
-		this.standByPort = standByPort;
-	}
-	public String getRabbitMqHost() {
-		return rabbitMqHost;
-	}
-	public void setRabbitMqHost(String rabbitMqHost) {
-		this.rabbitMqHost = rabbitMqHost;
-	}
-	public String getRabbitMqPort() {
-		return rabbitMqPort;
-	}
-	public void setRabbitMqPort(String rabbitMqPort) {
-		this.rabbitMqPort = rabbitMqPort;
-	}
-	public String getRabbitMqUser() {
-		return rabbitMqUser;
-	}
-	public void setRabbitMqUser(String rabbitMqUser) {
-		this.rabbitMqUser = rabbitMqUser;
-	}
-	public String getRabbitMqPassword() {
-		return rabbitMqPassword;
-	}
-	public void setRabbitMqPassword(String rabbitMqPassword) {
-		this.rabbitMqPassword = rabbitMqPassword;
-	}
-	public String getElasticsearchHost() {
-		return elasticsearchHost;
-	}
-	public void setElasticsearchHost(String elasticsearchHost) {
-		this.elasticsearchHost = elasticsearchHost;
-	}
-	public String getElasticsearchPort() {
-		return elasticsearchPort;
-	}
-	public void setElasticsearchPort(String elasticsearchPort) {
-		this.elasticsearchPort = elasticsearchPort;
-	}
-	public String getElasticsearchCluster() {
-		return elasticsearchCluster;
-	}
-	public void setElasticsearchCluster(String elasticsearchCluster) {
-		this.elasticsearchCluster = elasticsearchCluster;
-	}
-	public String getElasticsearchNode() {
-		return elasticsearchNode;
-	}
-	public void setElasticsearchNode(String elasticsearchNode) {
-		this.elasticsearchNode = elasticsearchNode;
-	}
-	
-	
-}
diff --git a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java b/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java
deleted file mode 100644
index 6fe7f4104..000000000
--- a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.visualpathit.account.controller;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.google.gson.Gson;
-import com.visualpathit.account.model.User;
-import com.visualpathit.account.service.UserService;
-import com.visualpathit.account.utils.ElasticsearchUtil;
-
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-
-@Controller
-public class ElasticSearchController {
-	@Autowired
-    private UserService userService;
-    
-    @RequestMapping(value="/user/elasticsearch", method=RequestMethod.GET)
-    public String insert(final Model model) throws IOException {
-    	List<User> users = userService.getList();
-    	//contextMapping();
-    	
-    	/*	for (User user : users) {
-    		//IndexRequest indexRequest = new IndexRequest("users","user",  String.valueOf(user.getId()));
-    		//indexRequest.source(new Gson().toJson(user));
-    		//IndexResponse response = ElasticsearchUtil.trannsportClient().index(indexRequest).actionGet();
-     	   	System.out.println("User" +new Gson().toJson(user));
-		}*/
-    	String result ="";
-    	for (User user : users) {
-    	IndexResponse response = ElasticsearchUtil.trannsportClient().prepareIndex("users","user",  String.valueOf(user.getId()))
-                .setSource(jsonBuilder()
-                        .startObject()
-                        .field("name", user.getUsername())
-                        .field("DOB",user.getDateOfBirth())
-                        .field("fatherName",user.getFatherName())
-                        .field("motherName",user.getMotherName())
-                        .field("gender",user.getGender())
-                        .field("nationality",user.getNationality())
-                        .field("phoneNumber", user.getPhoneNumber())
-                        .endObject()
-                )
-                .get();
-        String res =response.getResult().toString();
-        System.out.println(res);
-        result="Users";
-    	}
-    	model.addAttribute(result);
-        return "elasticeSearchRes";
-        		
-    }
-
-    @RequestMapping(value="/rest/users/view/{id}", method=RequestMethod.GET)
-    public String  view(@PathVariable final String id,final Model model) {
-        GetResponse getResponse = ElasticsearchUtil.trannsportClient().prepareGet("users", "user", id).get();
-        System.out.println(getResponse.getSource());
-        
-        model.addAttribute("res", getResponse.getSource().get("name"));
-       
-        return "elasticeSearchRes";
-    }
-    /*@RequestMapping(value = "/get_user_list",  method = RequestMethod.GET)
-    public @ResponseBody List getTagList(@RequestParam("term") String query) {
-    	List<User> users = userService.getList();
-    	List tagList = null;
-    	for (User user : users) {
-	    	GetResponse getResponse = ElasticsearchUtil.trannsportClient().prepareGet("users", "user" ,String.valueOf(user.getId())).get();
-	        System.out.println(getResponse.getSource());
-	        
-	        tagList.add(getResponse.getSource());
-    	}
-        return tagList;
-    }*/
-
-    @RequestMapping(value="/rest/users/update/{id}", method=RequestMethod.GET)
-    public String update(@PathVariable final String id,final Model model) throws IOException {
-
-        UpdateRequest updateRequest = new UpdateRequest();
-        updateRequest.index("employee")
-                .type("id")
-                .id(id)
-                .doc(jsonBuilder()
-                        .startObject()
-                        .field("gender", "male")
-                        .endObject());
-        try {
-            UpdateResponse updateResponse = ElasticsearchUtil.trannsportClient().update(updateRequest).get();
-            System.out.println(updateResponse.status());
-            model.addAttribute("res", updateResponse.status());
-            return "elasticeSearchRes";
-        } catch (InterruptedException | ExecutionException e) {
-            System.out.println(e);
-        }
-        return "elasticeSearchRes";
-    }
-    @RequestMapping(value="/rest/users/delete/{id}", method=RequestMethod.GET)
-    public String delete(@PathVariable final String id,final Model model) {
-
-        DeleteResponse deleteResponse =ElasticsearchUtil.trannsportClient().prepareDelete("employee", "id", id).get();
-        System.out.println(deleteResponse.getResult().toString());
-        model.addAttribute("res", deleteResponse.getResult().toString());
-        return "elasticeSearchRes";
-    }
-    /*public void contextMapping() throws IOException{    	   	
-		String json ="{"
-				+ "\"mappings\":{"
-				+ "\"users\":\" {"
-				+ "\"properties\" : {"
-				+ "\"name\" : { \"type\" : \"string\" },"
-				+ " \"city\" : { \"type\" : \"string\" },"
-				+ "\"name_suggest\" : {"
-				+ "\"type\" :     \"completion\""
-				+ "}}"
-				+ "}";
-		IndexResponse response = ElasticsearchUtil.trannsportClient().prepareIndex("users", "data")
-								.setSource(json).execute().actionGet();
-		
-    }*/
-}
diff --git a/src/main/java/com/visualpathit/account/controller/FileUploadController.java b/src/main/java/com/visualpathit/account/controller/FileUploadController.java
deleted file mode 100644
index 0de040a2d..000000000
--- a/src/main/java/com/visualpathit/account/controller/FileUploadController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.visualpathit.account.controller;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.visualpathit.account.model.User;
-import com.visualpathit.account.service.UserService;
-
-@Controller
-public class FileUploadController {
-	 @Autowired
-	    private UserService userService;
-	private static final Logger logger = LoggerFactory
-			.getLogger(FileUploadController.class);
-
-	/**
-	 * Upload single file using Spring Controller
-	 */
-	@RequestMapping(value = { "/upload"} , method = RequestMethod.GET)
-    public final String upload(final Model model) {
-        return "upload";
-    }
-	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-	public @ResponseBody
-	String uploadFileHandler(@RequestParam("name") String name,@RequestParam("userName") String userName,
-			@RequestParam("file") MultipartFile file) {
-		
-		System.out.println("Called the upload file :::" );
-		if (!file.isEmpty()) {
-			try {
-				byte[] bytes = file.getBytes();
-
-				// Creating the directory to store file
-				String rootPath = System.getProperty("catalina.home");
-				System.out.println("Path ::::" +rootPath);
-				File dir = new File(rootPath + File.separator + "tmpFiles");
-				if (!dir.exists())
-					dir.mkdirs();
-
-				// Create the file on server
-				File serverFile = new File(dir.getAbsolutePath()
-						+ File.separator + name+".png");
-				//image saving 
-				User user = userService.findByUsername(userName);
-				user.setProfileImg(name +".png");
-				user.setProfileImgPath(serverFile.getAbsolutePath());
-				userService.save(user);
-				
-				BufferedOutputStream stream = new BufferedOutputStream(
-						new FileOutputStream(serverFile));
-				stream.write(bytes);
-				stream.close();
-
-				logger.info("Server File Location="
-						+ serverFile.getAbsolutePath());
-
-				return "You successfully uploaded file=" + name +".png";
-			} catch (Exception e) {
-				return "You failed to upload " + name +".png" + " => " + e.getMessage();
-			}
-		} else {
-			return "You failed to upload " + name +".png"
-					+ " because the file was empty.";
-		}
-	}
-
-}
diff --git a/src/main/java/com/visualpathit/account/controller/UserController.java b/src/main/java/com/visualpathit/account/controller/UserController.java
index a91a9aeca..48845e98d 100644
--- a/src/main/java/com/visualpathit/account/controller/UserController.java
+++ b/src/main/java/com/visualpathit/account/controller/UserController.java
@@ -1,21 +1,15 @@
 package com.visualpathit.account.controller;
 
 import com.visualpathit.account.model.User;
-import com.visualpathit.account.service.ProducerService;
 import com.visualpathit.account.service.SecurityService;
 import com.visualpathit.account.service.UserService;
-import com.visualpathit.account.utils.MemcachedUtils;
 import com.visualpathit.account.validator.UserValidator;
 
-import java.util.List;
-import java.util.UUID;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 /**{@author waheedk}*/
@@ -30,15 +24,13 @@ public class UserController {
     @Autowired
     private UserValidator userValidator;
     
-    @Autowired
-    private ProducerService producerService;
-    
     /** {@inheritDoc} */
     @RequestMapping(value = "/registration", method = RequestMethod.GET)
     public final String registration(final Model model) {
         model.addAttribute("userForm", new User());
-             	return "registration";
-      }
+
+        return "registration";
+    }
     /** {@inheritDoc} */
     @RequestMapping(value = "/registration", method = RequestMethod.POST)
     public final String registration(final @ModelAttribute("userForm") User userForm, 
@@ -58,8 +50,7 @@ public final String registration(final @ModelAttribute("userForm") User userForm
     /** {@inheritDoc} */
     @RequestMapping(value = "/login", method = RequestMethod.GET)
     public final String login(final Model model, final String error, final String logout) {
-        System.out.println("Model data"+model.toString());
-    	if (error != null){
+        if (error != null){
             model.addAttribute("error", "Your username and password is invalid.");
         }
         if (logout != null){
@@ -77,98 +68,4 @@ public final String welcome(final Model model) {
     public final String indexHome(final Model model) {
         return "index_home";
     }
-    @RequestMapping(value = "/users", method = RequestMethod.GET)
-    public String getAllUsers(Model model)
-    {	
-   
-        List<User> users = userService.getList();
-        //JSONObject jsonObject
-        System.out.println("All User Data:::" + users);
-        model.addAttribute("users", users);
-        return "userList";
-    }
-    
-    @RequestMapping(value = "/users/{id}", method = RequestMethod.GET)
-    public String getOneUser(@PathVariable(value="id") String id,Model model)
-    {	
-    	String Result ="";
-    	try{
-    		if( id != null && MemcachedUtils.memcachedGetData(id)!= null){    			
-    			User userData =  MemcachedUtils.memcachedGetData(id);
-    			Result ="Data is From Cache";
-    			System.out.println("--------------------------------------------");
-    			System.out.println("Data is From Cache !!");
-    			System.out.println("--------------------------------------------");
-    			System.out.println("Father ::: "+userData.getFatherName());
-    			model.addAttribute("user", userData);
-    			model.addAttribute("Result", Result);
-    		}
-    		else{
-	    		User user = userService.findById(Long.parseLong(id)); 
-	    		Result = MemcachedUtils.memcachedSetData(user,id);
-	    		if(Result == null ){
-	    			Result ="Memcached Connection Failure !!";
-	    		}
-	    		System.out.println("--------------------------------------------");
-    			System.out.println("Data is From Database");
-    			System.out.println("--------------------------------------------");
-		        System.out.println("Result ::: "+ Result);	       
-		        model.addAttribute("user", user);
-		        model.addAttribute("Result", Result);
-    		}
-    	} catch (Exception e) {    		
-    		System.out.println( e.getMessage() );
-		}
-        return "user";
-    }
-    
-    /** {@inheritDoc} */
-    @RequestMapping(value = { "/user/{username}"} , method = RequestMethod.GET)
-    public final String userUpdate(@PathVariable(value="username") String username,final Model model) {
-    	User user = userService.findByUsername(username); 
-    	System.out.println("User Data:::" + user);
-    	model.addAttribute("user", user);
-    	return "userUpdate";
-    }
-    @RequestMapping(value = { "/user/{username}"} , method = RequestMethod.POST)
-    public final String userUpdateProfile(@PathVariable(value="username") String username,final @ModelAttribute("user") User userForm,final Model model) {
-    	User user = userService.findByUsername(username);
-    	user.setUsername(userForm.getUsername());
-    	user.setUserEmail(userForm.getUserEmail());
-    	user.setDateOfBirth(userForm.getDateOfBirth());
-    	user.setFatherName(userForm.getFatherName());
-    	user.setMotherName(userForm.getMotherName());
-    	user.setGender(userForm.getGender());
-    	user.setLanguage(userForm.getLanguage());
-    	user.setMaritalStatus(userForm.getMaritalStatus());
-    	user.setNationality(userForm.getNationality());
-    	user.setPermanentAddress(userForm.getPermanentAddress());
-    	user.setTempAddress(userForm.getTempAddress());
-    	user.setPhoneNumber(userForm.getPhoneNumber());
-    	user.setSecondaryPhoneNumber(userForm.getSecondaryPhoneNumber());
-    	user.setPrimaryOccupation(userForm.getPrimaryOccupation());
-    	user.setSecondaryOccupation(userForm.getSecondaryOccupation());
-    	user.setSkills(userForm.getSkills());
-    	user.setWorkingExperience(userForm.getWorkingExperience());    	
-    	userService.save(user); 
-    	/*model.addAttribute("user", user);*/
-    	return "welcome";
-    }
-    
-    @RequestMapping(value={"/user/rabbit"}, method={RequestMethod.GET})
-    public String rabbitmqSetUp() { 
-    	System.out.println("Rabbit mq method is callled!!!");
-      for (int i = 0; i < 20; i++) {
-        producerService.produceMessage(generateString());
-      }
-      return "rabbitmq";
-    }
-    
-    private static String generateString() {
-      String uuid = UUID.randomUUID().toString();
-      return "uuid = " + uuid;
-    }
-    
-
-    
 }
diff --git a/src/main/java/com/visualpathit/account/model/Role.java b/src/main/java/com/visualpathit/account/model/Role.java
index 68730463f..3535cd851 100644
--- a/src/main/java/com/visualpathit/account/model/Role.java
+++ b/src/main/java/com/visualpathit/account/model/Role.java
@@ -22,7 +22,7 @@ public Long getId() {
         return id;
     }
     /** {@inheritDoc}} !*/
-    public  void setId(final Long id) {
+    public final void setId(final Long id) {
         this.id = id;
     }
     /**
@@ -32,17 +32,17 @@ public String getName() {
         return name;
     }
     /** {@inheritDoc}} !*/
-    public  void setName(final String name) {
+    public final void setName(final String name) {
         this.name = name;
     }
     /**
      * {@inheritDoc}} 
      !*/
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "roles",cascade = CascadeType.ALL)
+    @ManyToMany(mappedBy = "roles")
     /**
      * {@link Role#id}
      !*/
-    public Set <User> getUsers() {
+    public Set<User> getUsers() {
         return users;
     }
     /**
diff --git a/src/main/java/com/visualpathit/account/model/User.java b/src/main/java/com/visualpathit/account/model/User.java
index 47e131443..917c4c9b9 100644
--- a/src/main/java/com/visualpathit/account/model/User.java
+++ b/src/main/java/com/visualpathit/account/model/User.java
@@ -2,13 +2,11 @@
 
 
 import javax.persistence.*;
-
-import java.io.Serializable;
 import java.util.Set;
 /**{@author waheedk} !*/
 @Entity
 @Table(name = "user")
-public class User implements Serializable {
+public class User {
 	/** the id field !*/
     private Long id;
     /** the user name field !*/
@@ -19,27 +17,6 @@ public class User implements Serializable {
     private String userEmail;
     /** the passwordConfirm field !*/
     private String passwordConfirm;
-    /** the profileImg field !*/
-    private String profileImg;
-    /** the profileImgPath field !*/
-    private String profileImgPath;
-    private String dateOfBirth;
-    private String fatherName;
-    private String motherName;
-    private String gender;
-    private String maritalStatus;
-    private String permanentAddress;
-    private String tempAddress;
-    private String primaryOccupation;
-    private String secondaryOccupation;
-    private String skills;
-    private String phoneNumber;
-    private String secondaryPhoneNumber;
-    private String nationality;
-    private String language;
-    private String workingExperience;
-    
-    
     /** the roles field !*/
     private Set<Role> roles;
     /** {@inheritDoc}} !*/
@@ -50,7 +27,7 @@ public Long getId() {
         return id;
     }
     /** {@inheritDoc}} !*/
-    public  void setId(final Long id) {
+    public final void setId(final Long id) {
         this.id = id;
     }
     /**{@inheritDoc}} !*/
@@ -58,7 +35,7 @@ public String getUsername() {
         return username;
     }
     /** {@inheritDoc}} !*/
-    public  void setUsername(final String username) {
+    public final void setUsername(final String username) {
         this.username = username;
     }
     /**
@@ -71,7 +48,7 @@ public String getPassword() {
     /**
      * {@inheritDoc}} 
      !*/
-    public  void setPassword(final String password) {
+    public final void setPassword(final String password) {
         this.password = password;
     }
     /**
@@ -82,7 +59,7 @@ public String getUserEmail() {
 		return userEmail;
 	}
     /** {@inheritDoc}} !*/
-	public  void setUserEmail(final String userEmail) {
+	public final void setUserEmail(final String userEmail) {
 		this.userEmail = userEmail;
 	}
 
@@ -95,7 +72,7 @@ public String getPasswordConfirm() {
         return passwordConfirm;
     }
 	 /** {@inheritDoc}} !*/
-    public  void setPasswordConfirm(final String passwordConfirm) {
+    public final void setPasswordConfirm(final String passwordConfirm) {
         this.passwordConfirm = passwordConfirm;
     }
     /** {@inheritDoc}} !*/
@@ -105,111 +82,7 @@ public Set<Role> getRoles() {
         return roles;
     }
     /** {@inheritDoc}} !*/
-    public void setRoles(final Set<Role> roles) {
+    public final void setRoles(final Set<Role> roles) {
         this.roles = roles;
     }
-	public String getProfileImg() {
-		return profileImg;
-	}
-	public void setProfileImg(String profileImg) {
-		this.profileImg = profileImg;
-	}
-	public String getProfileImgPath() {
-		return profileImgPath;
-	}
-	public void setProfileImgPath(String profileImgPath) {
-		this.profileImgPath = profileImgPath;
-	}
-	public String getDateOfBirth() {
-		return dateOfBirth;
-	}
-	public void setDateOfBirth(String dateOfBirth) {
-		this.dateOfBirth = dateOfBirth;
-	}
-	public String getFatherName() {
-		return fatherName;
-	}
-	public void setFatherName(String fatherName) {
-		this.fatherName = fatherName;
-	}
-	public String getMotherName() {
-		return motherName;
-	}
-	public void setMotherName(String motherName) {
-		this.motherName = motherName;
-	}
-	public String getGender() {
-		return gender;
-	}
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-	public String getMaritalStatus() {
-		return maritalStatus;
-	}
-	public void setMaritalStatus(String maritalStatus) {
-		this.maritalStatus = maritalStatus;
-	}
-	public String getPermanentAddress() {
-		return permanentAddress;
-	}
-	public void setPermanentAddress(String permanentAddress) {
-		this.permanentAddress = permanentAddress;
-	}
-	public String getTempAddress() {
-		return tempAddress;
-	}
-	public void setTempAddress(String tempAddress) {
-		this.tempAddress = tempAddress;
-	}
-	public String getPrimaryOccupation() {
-		return primaryOccupation;
-	}
-	public void setPrimaryOccupation(String primaryOccupation) {
-		this.primaryOccupation = primaryOccupation;
-	}
-	public String getSecondaryOccupation() {
-		return secondaryOccupation;
-	}
-	public void setSecondaryOccupation(String secondaryOccupation) {
-		this.secondaryOccupation = secondaryOccupation;
-	}
-	public String getSkills() {
-		return skills;
-	}
-	public void setSkills(String skills) {
-		this.skills = skills;
-	}
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-	public String getSecondaryPhoneNumber() {
-		return secondaryPhoneNumber;
-	}
-	public void setSecondaryPhoneNumber(String secondaryPhoneNumber) {
-		this.secondaryPhoneNumber = secondaryPhoneNumber;
-	}
-	public String getNationality() {
-		return nationality;
-	}
-	public void setNationality(String nationality) {
-		this.nationality = nationality;
-	}
-	public String getLanguage() {
-		return language;
-	}
-	public void setLanguage(String language) {
-		this.language = language;
-	}
-	public String getWorkingExperience() {
-		return workingExperience;
-	}
-	public void setWorkingExperience(String workingExperience) {
-		this.workingExperience = workingExperience;
-	}
-	
-	
 }
diff --git a/src/main/java/com/visualpathit/account/repository/UserRepository.java b/src/main/java/com/visualpathit/account/repository/UserRepository.java
index 149b656cf..45f6df04d 100644
--- a/src/main/java/com/visualpathit/account/repository/UserRepository.java
+++ b/src/main/java/com/visualpathit/account/repository/UserRepository.java
@@ -1,14 +1,9 @@
 package com.visualpathit.account.repository;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.visualpathit.account.model.User;
 
 public interface UserRepository extends JpaRepository<User, Long> {
     User findByUsername(String username);
-    User findById(long id);
-    /*public void updateUser(User user)*/;
-    
 }
diff --git a/src/main/java/com/visualpathit/account/service/ConsumerService.java b/src/main/java/com/visualpathit/account/service/ConsumerService.java
deleted file mode 100644
index a638bf0d6..000000000
--- a/src/main/java/com/visualpathit/account/service/ConsumerService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.visualpathit.account.service;
-
-public interface ConsumerService {
-
-    void consumerMessage(byte[] data);
-}
diff --git a/src/main/java/com/visualpathit/account/service/ConsumerServiceImpl.java b/src/main/java/com/visualpathit/account/service/ConsumerServiceImpl.java
deleted file mode 100644
index ecbd1b6b1..000000000
--- a/src/main/java/com/visualpathit/account/service/ConsumerServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.visualpathit.account.service;
-
-import org.springframework.amqp.core.ExchangeTypes;
-import org.springframework.amqp.rabbit.annotation.Exchange;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.QueueBinding;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ConsumerServiceImpl implements ConsumerService {
-
-    /**
-        The name of the exchange.
-     */
-    private static final String EXCHANGE_NAME = "messages";
-
-    /**
-     *  The function that consumes messages from the broker(RabbitMQ)
-     * @param data
-     */
-    @Override
-    @RabbitListener(bindings = @QueueBinding( value = @Queue(),
-            exchange = @Exchange(value = EXCHANGE_NAME, type = ExchangeTypes.FANOUT)))
-    public void consumerMessage(byte[] data) {
-        String consumedMessage = new String(data);
-        System.out.println(" [x] Consumed  '" + consumedMessage + "'");
-    }
-}
diff --git a/src/main/java/com/visualpathit/account/service/ProducerService.java b/src/main/java/com/visualpathit/account/service/ProducerService.java
deleted file mode 100644
index ac89af238..000000000
--- a/src/main/java/com/visualpathit/account/service/ProducerService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.visualpathit.account.service;
-
-public interface ProducerService {
-
-    public String  produceMessage(String message);
-}
diff --git a/src/main/java/com/visualpathit/account/service/ProducerServiceImpl.java b/src/main/java/com/visualpathit/account/service/ProducerServiceImpl.java
deleted file mode 100644
index 46970e609..000000000
--- a/src/main/java/com/visualpathit/account/service/ProducerServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.visualpathit.account.service;
-
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.visualpathit.account.utils.RabbitMqUtil;
-
-import org.springframework.stereotype.Service;
-import com.rabbitmq.client.Channel;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-@Service
-public class ProducerServiceImpl implements ProducerService {
-
-    /**
-     *  The name of the Exchange
-     */
-    private static final String EXCHANGE_NAME = "messages";
-
-    /**
-     *  This method publishes a message
-     * @param message
-     */
-    @Override
-    public String produceMessage(String message) {
-        try {
-            ConnectionFactory factory = new ConnectionFactory();
-            /**
-            * System.out.println("Rabitmq host: ::" + RabbitMqUtil.getRabbitMqHost());
-            * System.out.println("Rabitmq port: ::" + RabbitMqUtil.getRabbitMqPort());
-            * System.out.println("Rabitmq user: ::" + RabbitMqUtil.getRabbitMqUser());
-            * System.out.println("Rabitmq password: ::" + RabbitMqUtil.getRabbitMqPassword());
-            **/
-            factory.setHost(RabbitMqUtil.getRabbitMqHost());
-            factory.setPort(Integer.parseInt(RabbitMqUtil.getRabbitMqPort()));
-            factory.setUsername(RabbitMqUtil.getRabbitMqUser());
-            factory.setPassword(RabbitMqUtil.getRabbitMqPassword());
-            Connection connection = factory.newConnection();
-            System.out.println("Connection open status"+connection.isOpen());
-            Channel channel = connection.createChannel();
-            channel.exchangeDeclare(EXCHANGE_NAME, "fanout");
-            channel.basicPublish(EXCHANGE_NAME, "", null, message.getBytes());
-            System.out.println(" [x] Sent '" + message + "'");
-            channel.close();
-            connection.close();
-        } catch (IOException io) {
-            System.out.println("IOException");
-            io.printStackTrace();
-        } catch (TimeoutException toe) {
-            System.out.println("TimeoutException : " + toe.getMessage());
-            toe.printStackTrace();
-        }
-        return "response";
-    }
-}
diff --git a/src/main/java/com/visualpathit/account/service/UserService.java b/src/main/java/com/visualpathit/account/service/UserService.java
index b4f55bb2e..6fc0cc937 100644
--- a/src/main/java/com/visualpathit/account/service/UserService.java
+++ b/src/main/java/com/visualpathit/account/service/UserService.java
@@ -1,7 +1,5 @@
 package com.visualpathit.account.service;
 
-import java.util.List;
-
 import com.visualpathit.account.model.User;
 
 /** {@author waheedk}!*/
@@ -10,7 +8,4 @@ public interface UserService {
     void save(User user);
     /** {@inheritDoc}} !*/
     User findByUsername(String username);
-    User findById(long id);
-    /*public void updateUser(User user);*/
-    public List <User> getList();
 }
diff --git a/src/main/java/com/visualpathit/account/service/UserServiceImpl.java b/src/main/java/com/visualpathit/account/service/UserServiceImpl.java
index 31e0a5374..bf63b5d40 100644
--- a/src/main/java/com/visualpathit/account/service/UserServiceImpl.java
+++ b/src/main/java/com/visualpathit/account/service/UserServiceImpl.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
-import java.util.List;
 
 /** {@author waheedk}!*/
 @Service
@@ -35,13 +34,4 @@ public void save(final User user) {
     public User findByUsername(final String username) {
         return userRepository.findByUsername(username);
     }
-    
-    @Override
-    public List<User> getList() {
-    	return userRepository.findAll();
-    }
-    @Override
-	public User findById(long id){
-    	return userRepository.findOne(id);
-    }
 }
diff --git a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java b/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java
deleted file mode 100644
index 838fa536e..000000000
--- a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.visualpathit.account.utils;
-
-import java.net.InetSocketAddress;
-
-import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.visualpathit.account.beans.Components;
-@Service
-public class ElasticsearchUtil {
-	
-	private static Components object;
-    @Autowired
-    public void setComponents(Components object){
-    	ElasticsearchUtil.object = object;    	
-    	
-    }
-    public static TransportClient trannsportClient() {
-    	System.out.println(" elasticsearch client");
-    	String elasticsearchHost =object.getElasticsearchHost();
-    	String elasticsearchPort =object.getElasticsearchPort(); 
-    	String elasticsearchCluster =object.getElasticsearchCluster();
-    	String elasticsearchNode =object.getElasticsearchNode();
-    	System.out.println(" elasticsearchHost ........"+ elasticsearchHost);
-    	System.out.println(" elasticsearchHost ........"+ elasticsearchPort);
-    	TransportClient client = null;
-    	try {    	
-    	Settings settings = Settings.builder()    			
-    			.put("cluster.name",elasticsearchCluster)
-    			.put("node.name",elasticsearchNode)
-    			.build();
-    	client = new PreBuiltTransportClient(settings)
-                .addTransportAddress(
-                new InetSocketTransportAddress(
-                		new InetSocketAddress(elasticsearchHost, Integer.parseInt(elasticsearchPort))));
-
-        
-    	}
-    	catch (Exception e) {
-			e.printStackTrace();
-		}
-    	return client;
-      }
-}
diff --git a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java b/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java
deleted file mode 100644
index 98e539154..000000000
--- a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.visualpathit.account.utils;
-
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.concurrent.Future;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.visualpathit.account.beans.Components;
-import com.visualpathit.account.model.User;
-
-import net.spy.memcached.MemcachedClient;
-@Service
-public class MemcachedUtils {
-	
-	private static Components object;
-    @Autowired
-    public void setComponents(Components object){
-    	MemcachedUtils.object = object;
-    }
-    public static String memcachedSetData(User user,String key){    	
-    	String Result = "";
-    	int expireTime =  900;
-    	try{
-    			MemcachedClient mactiveClient = memcachedConnection();
-    			System.out.println("--------------------------------------------");
-    			System.out.println("Client is ::"+ mactiveClient.getStats());
-    			System.out.println("--------------------------------------------");
-	            Future future = mactiveClient.set(key,expireTime, user);	        	         
-	     	    System.out.println("set status:" + future.get());
-	     	    Result =" Data is From DB and Data Inserted In Cache !!";
-	     	    mactiveClient.shutdown();             
-	           
-    		
-    	} catch (Exception e) {    		
-    		System.out.println( e.getMessage() );
-		}
-    	return Result;
-    }
-    public static User memcachedGetData(String key){
-    	String Result = "";
-    	User userData = null;
-    	try{
-    			MemcachedClient mclient = memcachedConnection();
-    			System.out.println("--------------------------------------------");
-    			System.out.println("Client Status :: "+mclient.getStats());
-    			System.out.println("--------------------------------------------");
-	            userData = (User) mclient.get(key);
-	     	    System.out.println("user value in cache - " + mclient.get(key));
-	     	    Result =" Data Retrieval From Cache !!";
-	     	    System.out.println(Result);
-	     	    mclient.shutdown();               
-	           
-    	} catch (Exception e) {    		
-    		System.out.println( e.getMessage() );
-		}
-    	return userData;
-    }
-    public static MemcachedClient memcachedConnection(){ 
-    	MemcachedClient mcconn = null;
-    	boolean active = true;
-    	String key="pid";
-    	String port = "";
-    	String activeHost =object.getActiveHost();
-    	String activePort =object.getActivePort();    	
-    	try{   		
-    		if(!activeHost.isEmpty() && !activePort.isEmpty() && active){
-	    		mcconn = new MemcachedClient(new InetSocketAddress(activeHost,Integer.parseInt(activePort)));
-	    		for(SocketAddress innerKey:mcconn.getStats().keySet()){
-	    			System.out.println("Connection  SocketAddress ::" + innerKey);
-	    			//System.out.println("Connection port ::" + mcconn.getStats().get(innerKey).get(key));
-	    			port = mcconn.getStats().get(innerKey).get(key);	    			
-	    		} 
-	    		if(port == null){
-    				System.out.println("Port::"+ port);
-    				mcconn.shutdown();
-    				System.out.println("--------------------------------------------");
-		       		System.out.println("Connection Failure By Active Host ::" + activeHost);
-		       		System.out.println("--------------------------------------------");
-		       		mcconn = null;
-		       		active =false;
-		       		return mcconn = standByMemcachedConn();
-    			}
-    			if(!port.isEmpty()){
-	    			System.out.println("--------------------------------------------");
-		    		System.out.println("Connection to server sucessfull for active Host ::"+activeHost);
-		            System.out.println("--------------------------------------------");
-		            active =true;
-		            return mcconn;
-	    		}
-	    	}else if(!activeHost.isEmpty() && !activePort.isEmpty() && !active){
-	    		return mcconn = standByMemcachedConn();
-	    	}else {
-	    		 System.out.println("--------------------------------------------");
-	    		 System.out.println("Connection to Failure Due to Incorrect or Empty Host:: ");
-	    		 System.out.println("--------------------------------------------");
-	    	}
-	    	}
-    	catch (Exception e) {
-    		System.out.println( e.getMessage() );
-		}
-    	return mcconn;
-    }   
-    public static MemcachedClient standByMemcachedConn(){
-    	MemcachedClient mcconn = null;
-    	String port = "";
-    	String key="pid";
-    	String standByHost = object.getStandByHost();
-    	String standByPort = object.getStandByPort();
-    	try{
-    	if(!standByHost.isEmpty() && !standByPort.isEmpty() && mcconn == null && port.isEmpty()){
-    		mcconn = new MemcachedClient(new InetSocketAddress(standByHost,Integer.parseInt(standByPort)));
-    		for(SocketAddress innerKey:mcconn.getStats().keySet()){
-    			port = mcconn.getStats().get(innerKey).get(key);    		
-    		}
-    		if(!port.isEmpty()){
-	    		System.out.println("--------------------------------------------");
-	    		System.out.println("Connection to server sucessful by StandBy Host::" + standByHost);
-	            System.out.println("--------------------------------------------");
-	            return mcconn;
-    		}else {
-	    		 mcconn.shutdown();
-	       		 System.out.println("--------------------------------------------");
-	       		 System.out.println("Connection Failure By StandBy Host ::" +standByHost);
-	       		 System.out.println("--------------------------------------------");
-    		}
-    	}
-    	}catch (Exception e) {
-    		System.out.println( e.getMessage() );
-		}
-    	return mcconn;
-    }    
-}
diff --git a/src/main/java/com/visualpathit/account/utils/RabbitMqUtil.java b/src/main/java/com/visualpathit/account/utils/RabbitMqUtil.java
deleted file mode 100644
index cbef39120..000000000
--- a/src/main/java/com/visualpathit/account/utils/RabbitMqUtil.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.visualpathit.account.utils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.visualpathit.account.beans.Components;
-
-@Service
-public class RabbitMqUtil {
-  private static Components object;
-  
-  public RabbitMqUtil() {}
-  
-  @Autowired
-  public void setComponents(Components object) {
-	  RabbitMqUtil.object = object;
-  }
-  
-  public static String getRabbitMqHost() { return object.getRabbitMqHost(); }
-  
-  public static String getRabbitMqPort() {
-    return object.getRabbitMqPort();
-  }
-  
-  public static String getRabbitMqUser() { return object.getRabbitMqUser(); }
-  
-  public static String getRabbitMqPassword() {
-    return object.getRabbitMqPassword();
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/db_backup.sql b/src/main/resources/accountsdb.sql
similarity index 54%
rename from src/main/resources/db_backup.sql
rename to src/main/resources/accountsdb.sql
index bdb779d23..d224d810f 100644
--- a/src/main/resources/db_backup.sql
+++ b/src/main/resources/accountsdb.sql
@@ -50,26 +50,9 @@ CREATE TABLE `user` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `username` varchar(255) DEFAULT NULL,
   `userEmail` varchar(255) DEFAULT NULL,
-  `profileImg` varchar(255) DEFAULT NULL,
-  `profileImgPath` varchar(255) DEFAULT NULL,
-  `dateOfBirth` varchar(255) DEFAULT NULL,
-  `fatherName` varchar(255) DEFAULT NULL,
-  `motherName` varchar(255) DEFAULT NULL,
-  `gender` varchar(255) DEFAULT NULL,
-  `maritalStatus` varchar(255) DEFAULT NULL,
-  `permanentAddress` varchar(255) DEFAULT NULL,
-  `tempAddress` varchar(255) DEFAULT NULL,
-  `primaryOccupation` varchar(255) DEFAULT NULL,
-  `secondaryOccupation` varchar(255) DEFAULT NULL,
-  `skills` varchar(255) DEFAULT NULL,
-  `phoneNumber` varchar(255) DEFAULT NULL,
-  `secondaryPhoneNumber` varchar(255) DEFAULT NULL,
-  `nationality` varchar(255) DEFAULT NULL,
-  `language` varchar(255) DEFAULT NULL,
-  `workingExperience` varchar(255) DEFAULT NULL,
   `password` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -78,7 +61,7 @@ CREATE TABLE `user` (
 
 LOCK TABLES `user` WRITE;
 /*!40000 ALTER TABLE `user` DISABLE KEYS */;
-INSERT INTO `user` VALUES (7,'admin_vp','admin@visualpathit.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'$2a$11$0a7VdTr4rfCQqtsvpng6GuJnzUmQ7gZiHXgzGPgm5hkRa3avXgBLK'),(8,'WahidKhan','wahid.khan74@gmail.com',NULL,NULL,'28/03/1994','M Khan','R Khan','male','unMarried','Ameerpet,Hyderabad','Ameerpet,Hyderabad','Software Engineer','Software Engineer','Java HTML CSS ','8888888888','8888888888','Indian','english','2 ','$2a$11$UgG9TkHcgl02LxlqxRHYhOf7Xv4CxFmFEgS0FpUdk42OeslI.6JAW'),(9,'Gayatri','gayatri@gmail.com',NULL,NULL,'20/06/1993','K','L','male','unMarried','Ameerpet,Hyderabad','Ameerpet,Hyderabad','Software Engineer','Software Engineer','Java HTML CSS ','9999999999','9999999999','India','english','5','$2a$11$gwvsvUrFU.YirMM1Yb7NweFudLUM91AzH5BDFnhkNzfzpjG.FplYO'),(10,'WahidKhan2','wahid.khan741@gmail.com',NULL,NULL,'28/03/1994','M Khan','R Khan','male','unMarried','Ameerpet,Hyderabad','Ameerpet,Hyderabad','Software Engineer','Software Engineer','Java HTML CSS ','7777777777','777777777','India','english','7','$2a$11$6oZEgfGGQAH23EaXLVZ2WOSKxcEJFnBSw2N2aghab0s2kcxSQwjhC'),(11,'KiranKumar','kiran@gmail.com',NULL,NULL,'8/12/1993','K K','RK','male','unMarried','California','James Street','Software Engineer','Software Engineer','Java HTML CSS ','1010101010','1010101010','India','english','10','$2a$11$EXwpna1MlFFlKW5ut1iVi.AoeIulkPPmcOHFO8pOoQt1IYU9COU0m'),(12,'Saikumar','sai@gmail.com',NULL,NULL,'20/06/1993','Sai RK','Sai AK','male','unMarried','California','US','Software Engineer','Software Engineer','Java HTML CSS AWS','8888888111','8888888111','India','english','8','$2a$11$pzWNzzR.HUkHzz2zhAgqOeCl0WaTgY33NxxJ7n0l.rnEqjB9JO7vy'),(13,'RamSai','ram@gmail.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'$2a$11$6BSmYPrT8I8b9yHmx.uTRu/QxnQM2vhZYQa8mR33aReWA4WFihyGK');
+INSERT INTO `user` VALUES (4,'admin_vp','admin@visualpathit.com','$2a$11$DSEIKJNrgPjG.iCYUwErvOkREtC67mqzQ.ogkZbc/KOW1OPOpZfY6');
 /*!40000 ALTER TABLE `user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -105,7 +88,7 @@ CREATE TABLE `user_role` (
 
 LOCK TABLES `user_role` WRITE;
 /*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
-INSERT INTO `user_role` VALUES (4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1);
+INSERT INTO `user_role` VALUES (4,1);
 /*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -118,4 +101,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-12-07 16:32:31
+-- Dump completed on 2017-08-28 10:50:51
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c04343d72..ef8b5a8fe 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,25 +1,4 @@
-#JDBC Configutation for Database Connection
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://db01:3306/accounts?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-jdbc.username=admin
-jdbc.password=admin123
-
-#Memcached Configuration For Active and StandBy Host
-#For Active Host
-memcached.active.host=mc01
-memcached.active.port=11211
-#For StandBy Host
-memcached.standBy.host=127.0.0.2
-memcached.standBy.port=11211
-
-#RabbitMq Configuration
-rabbitmq.address=rmq01
-rabbitmq.port=5672
-rabbitmq.username=test
-rabbitmq.password=test
-
-#Elasticesearch Configuration
-elasticsearch.host =192.168.1.85
-elasticsearch.port =9300
-elasticsearch.cluster=vprofile
-elasticsearch.node=vprofilenode
+jdbc.url=jdbc:mysql://localhost:3306/accounts?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+jdbc.username=newuser
+jdbc.password=password
diff --git a/src/main/webapp/WEB-INF/appconfig-mvc.xml b/src/main/webapp/WEB-INF/appconfig-mvc.xml
index 58f404dc5..7646030c1 100644
--- a/src/main/webapp/WEB-INF/appconfig-mvc.xml
+++ b/src/main/webapp/WEB-INF/appconfig-mvc.xml
@@ -23,10 +23,4 @@
             <value>.jsp</value>
         </property>
     </bean>
-    <bean id="multipartResolver"
-		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-		 <!-- setting maximum upload size -->
-		<property name="maxUploadSize" value="100000" />
-
-	</bean>
 </beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/appconfig-rabbitmq.xml b/src/main/webapp/WEB-INF/appconfig-rabbitmq.xml
deleted file mode 100644
index 989faec37..000000000
--- a/src/main/webapp/WEB-INF/appconfig-rabbitmq.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:beans="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
-       http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd">
-
-    <rabbit:annotation-driven/>
-
-    <rabbit:connection-factory id="connectionFactory" host="${rabbitmq.address}" port="${rabbitmq.port}" username="${rabbitmq.username}" password="${rabbitmq.password}"/>
-
-    <rabbit:admin connection-factory="connectionFactory"/>
-
-    <rabbit:template id="amqpTemplate" connection-factory="connectionFactory"/>
-
-
-    <bean id="rabbitListenerContainerFactory"
-          class="org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory">
-        <property name="connectionFactory" ref="connectionFactory"/>
-        <property name="concurrentConsumers" value="3"/>
-        <property name="maxConcurrentConsumers" value="10"/>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/appconfig-root.xml b/src/main/webapp/WEB-INF/appconfig-root.xml
index 064cc5e7a..091d3949c 100644
--- a/src/main/webapp/WEB-INF/appconfig-root.xml
+++ b/src/main/webapp/WEB-INF/appconfig-root.xml
@@ -9,7 +9,7 @@
     <import resource="appconfig-mvc.xml"/>
 
     <import resource="appconfig-data.xml"/>
-    <import resource="appconfig-rabbitmq.xml"/>
+
     <import resource="appconfig-security.xml"/>
 
     <!-- Scans within the base package of the application for @Component classes to configure as beans -->
diff --git a/src/main/webapp/WEB-INF/appconfig-security.xml b/src/main/webapp/WEB-INF/appconfig-security.xml
index 5e2acf137..f0a6abb90 100644
--- a/src/main/webapp/WEB-INF/appconfig-security.xml
+++ b/src/main/webapp/WEB-INF/appconfig-security.xml
@@ -5,14 +5,13 @@
              xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 		http://www.springframework.org/schema/security
-		http://www.springframework.org/schema/security/spring-security.xsd" >
+		http://www.springframework.org/schema/security/spring-security.xsd">
 
     <http auto-config="true">
         <intercept-url pattern="/" access="hasRole('ROLE_USER')"/>
         <intercept-url pattern="/welcome" access="hasRole('ROLE_USER')"/>
         <form-login login-page="/login" default-target-url="/welcome" authentication-failure-url="/login?error" username-parameter="username" password-parameter="password"/>
         <logout logout-success-url="/login?logout" />
-	<csrf disabled="true"/>
     </http>
 
     <authentication-manager alias="authenticationManager">
@@ -27,4 +26,4 @@
           class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder">
         <beans:constructor-arg name="strength" value="11"/>
     </beans:bean>
-</beans:beans>
+</beans:beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/elasticeSearchRes.jsp b/src/main/webapp/WEB-INF/views/elasticeSearchRes.jsp
deleted file mode 100644
index 7a3161618..000000000
--- a/src/main/webapp/WEB-INF/views/elasticeSearchRes.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-    <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>vp-elasticsearch</title>
-</head>
-<body>
-<h1>Data  is ${result} into Elasticsearch</h1>
-<h2>Please go to elastic search dash board and verify link ip:9200/users/user/id  </h2>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index_home.jsp b/src/main/webapp/WEB-INF/views/index_home.jsp
index 4579f61fe..998c32993 100644
--- a/src/main/webapp/WEB-INF/views/index_home.jsp
+++ b/src/main/webapp/WEB-INF/views/index_home.jsp
@@ -7,7 +7,7 @@
     <link href="${contextPath}/resources/css/profile.css" rel="stylesheet">
   	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 	<link rel="stylesheet" href="https://bootswatch.com/cosmo/bootstrap.min.css">
-	<link rel="stylesheet" href="${contextPath}/resources/css/w3.css">
+	<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
 </head>
 <body>
 <div class="mainbody container-fluid">
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 16372b5ed..60e2e5693 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -75,7 +75,8 @@
 		<img  class="logo" src="${contextPath}/resources/Images/visualpathlogo3.png" />
         <div class="form-group ${error != null ? 'has-error' : ''}">
             <span>${message}</span>
-            <input name="username" type="text" class="form-control" placeholder="Username"/>
+            <input name="username" type="text" class="form-control" placeholder="Username"
+                   autofocus="true"/>
             <input name="password" type="password" class="form-control" placeholder="Password"/>
             <span>${error}</span>
             <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
diff --git a/src/main/webapp/WEB-INF/views/rabbitmq.jsp b/src/main/webapp/WEB-INF/views/rabbitmq.jsp
deleted file mode 100644
index 2220694d4..000000000
--- a/src/main/webapp/WEB-INF/views/rabbitmq.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Rabbitmq</title>
-</head>
-<body>
-	<h1>Rabbitmq initiated</h1>
-	<h3>Generated 2 Connections</h3>
-	<h3>6 Chanels 1 Exchage and 2 Que</h3>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/upload.jsp b/src/main/webapp/WEB-INF/views/upload.jsp
deleted file mode 100644
index 3e52f833a..000000000
--- a/src/main/webapp/WEB-INF/views/upload.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page session="false" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-<html>
-<head>
-<title>Upload File Request Page</title>
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<style>
-.panel {
-    position: absolute;
-    padding-top: 1cm;
-    padding-bottom: 1cm;
-    padding-right: 2cm;
-    padding-left: 2cm;
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%) translateY(-50%);
-}
-.align-center {
-    text-align:center;
-}
-</style>
-</head>
-<body>
-<div class="container">  
-  <div class="panel panel-default">
-  <h2 align="center">Upload Image </h2>
-    <form action="./uploadFile?${_csrf.parameterName}=${_csrf.token}" method="post" enctype="multipart/form-data">
-		<span>${pageContext.request.userPrincipal.name}</span> <br/>
-		<div class="form-group">
-	      <label for="file">Image Upload</label>
-	      <input type="file" name="file" class="form-control" id="file">
-    	</div>
- 		<div class="form-group">
-	      <label for="name">Image Name:</label>
-	      <input type="text"  name="name" class="form-control" id="name">
-    	</div>
-		<div class="align-center">
- 			<input type="hidden"  name="${_csrf.parameterName}"   value="${_csrf.token}"/>
- 			<input type="hidden"  name="userName"   value="${pageContext.request.userPrincipal.name}"/> 
-			<input type="submit" class="btn btn-info" value="Upload">
-		</div>
-	</form>	
-  </div>
-</div>
-	
-</body>
-<!-- /container -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-<script src="${contextPath}/resources/js/bootstrap.min.js"></script>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/user.jsp b/src/main/webapp/WEB-INF/views/user.jsp
deleted file mode 100644
index 480bf6e24..000000000
--- a/src/main/webapp/WEB-INF/views/user.jsp
+++ /dev/null
@@ -1,163 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-    <%@ taglib  uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-    <c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>UserData</title>
-  <link href="${contextPath}/resources/css/bootstrap.min.css" rel="stylesheet">
-    <link href="${contextPath}/resources/css/profile.css" rel="stylesheet">
-  	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-	<link rel="stylesheet" href="https://bootswatch.com/cosmo/bootstrap.min.css">
-	<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-</head>
-<style>
-body{  
-  padding-top: 2cm;
-  background-image: url("${contextPath}/resources/Images/background.png");
-  background-color: #cccccc;
-}
-.container {
-  border-style: solid;
-  background-color:#ffffff;
-  width: 80%;
-  position: relative;
-}
-</style>
-<body>
-	<div class="mainbody container-fluid">
-    <div class="row">
-        <div class="navbar-wrapper">
-            <div class="container-fluid">
-                <div class="navbar navbar-custom navbar-static-top" role="navigation">
-                    <div class="container-fluid">
-                        <div class="navbar-header">
-                            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                                <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span
-                                    class="icon-bar"></span><span class="icon-bar"></span>
-                            </button>
-                            <a class="navbar-brand" href="${contextPath}/index">VISUAL PATH</a>
-                            <i class="brand_network"><small><small>VProfile</small></small></i>
-                        </div>
-                        <div class="navbar-collapse collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="#technologies">TECHNOLOGIES</a></li>
-                                <li><a href="#about">ABOUT</a></li>
-                                <li><a href="#contact">CONTACT</a></li>
-                                <li><a href="#">BLOG</a></li>
-                            </ul>
-                            <div class="navbar-collapse navbar-right collapse">
-	                            <ul class="nav navbar-nav">
-	                        	 <li><a href="${contextPath}/login">LOGIN</a></li>
-	                        	 <li><a href="${contextPath}/registration">SIGN UP</a></li>
-	                       	 	</ul>
-                            </div>
-                            
-                         </div>
-                         
-                    </div>
-                </div>
-            </div>
- 		</div>
-	</div>
-</div>
-<!-- Header -->
-   
-	<div class="container">
-	<div class="table-responsive">
-	<h2 align="center" style="color: red">${{Result}} <a href="${contextPath}/users" class="btn btn-danger" > Back</a> </h2> 
-	<h2 align="center">User Primary Details</h2>	
-    <table class="table table-bordered">
-        <tr>
-            <th>Id</th>
-            <th>Name</th>
-            <th>Father's Name</th>
-            <th>Mother's Name</th> 
-            <th>Email</th>                       
-            <th>Phone Number</th>
-        </tr>         
-      	<tr>
-      	  <td>
-              <c:out value="${user.id}"/> 
-          </td>
-          <td>
-              <c:out value="${user.username}"/>
-          </td>
-          <td>
-              <c:out value="${user.fatherName}" />
-          </td>
-           <td>
-              <c:out value="${user.motherName}" />
-          </td>
-          <td>
-              <c:out value="${user.userEmail}" />
-          </td>
-          <td>
-              <c:out value="${user.phoneNumber}" />
-          </td>         
-     	</tr>     	
-    </table>
-    <h2 align="center">User Extra Details</h2>
-    <table class="table table-bordered">
-        <tr>
-            <th>Date Of Birth</th>
-            <th>Gender</th>
-            <th>Marital Status</th>
-            <th>Permanent Address</th>            
-            <th>Temporary  Address</th>
-            <th>Primary Occupation</th>
-            <th>Secondary Occupation</th>
-            <th>Skills</th>
-            <th>Secondary PhoneNumber</th>
-            <th>Nationality</th>
-            <th>Language</th>
-            <th>Working Experience</th>
-        </tr>         
-      	<tr>
-      	  <td>
-              <c:out value="${user.dateOfBirth}"/> 
-          </td>
-          <td>
-              <c:out value="${user.gender}"/>
-          </td>
-          <td>
-              <c:out value="${user.maritalStatus}" />
-          </td>
-          <td>
-              <c:out value="${user.permanentAddress}" />
-          </td>
-          <td>
-              <c:out value="${user.tempAddress}" />
-          </td>
-          <td>
-              <c:out value="${user.primaryOccupation}" />
-          </td>
-          <td>
-              <c:out value="${user.secondaryOccupation}" />
-          </td>
-          <td>
-              <c:out value="${user.skills}" />
-          </td>
-          <td>
-              <c:out value="${user.secondaryPhoneNumber}" />
-          </td>
-          <td>
-              <c:out value="${user.nationality}" />
-          </td>
-          <td>
-              <c:out value="${user.language}" />
-          </td>
-          <td>
-              <c:out value="${user.workingExperience}" />
-          </td>
-     	</tr>     	
-    </table>
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/userList.jsp b/src/main/webapp/WEB-INF/views/userList.jsp
deleted file mode 100644
index 1973e91be..000000000
--- a/src/main/webapp/WEB-INF/views/userList.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ taglib  uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <title>allUser</title>
-  <link href="${contextPath}/resources/css/bootstrap.min.css" rel="stylesheet">
-  <link href="${contextPath}/resources/css/profile.css" rel="stylesheet">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="https://bootswatch.com/cosmo/bootstrap.min.css">
-  <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-</head>
-
-<style>
-body{  
-  padding-top: 2cm;
-  background-image: url("${contextPath}/resources/Images/background.png");
-  background-color: #cccccc;
-}
-.container {
-  border-style: solid;
-  width: 80%;
-  background-color:#ffffff;
-  position: relative;
-}
-</style>
-<body>
-	<div class="mainbody container-fluid">
-    <div class="row">
-        <div class="navbar-wrapper">
-            <div class="container-fluid">
-                <div class="navbar navbar-custom navbar-static-top" role="navigation">
-                    <div class="container-fluid">
-                        <div class="navbar-header">
-                            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                                <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span
-                                    class="icon-bar"></span><span class="icon-bar"></span>
-                            </button>
-                            <a class="navbar-brand" href="${contextPath}/index">VISUAL PATH</a>
-                            <i class="brand_network"><small><small>VProfile</small></small></i>
-                        </div>
-                        <div class="navbar-collapse collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="#technologies">TECHNOLOGIES</a></li>
-                                <li><a href="#about">ABOUT</a></li>
-                                <li><a href="#contact">CONTACT</a></li>
-                                <li><a href="#">BLOG</a></li>
-                            </ul>
-                            <div class="navbar-collapse navbar-right collapse">
-	                            <ul class="nav navbar-nav">
-	                        	 <li><a href="${contextPath}/login">LOGIN</a></li>
-	                        	 <li><a href="${contextPath}/registration">SIGN UP</a></li>
-	                       	 	</ul>
-                            </div>
-                            
-                         </div>
-                         
-                    </div>
-                </div>
-            </div>
- 		</div>
-	</div>
-</div>
-<!-- Header -->    
-	<div class="container">
-	<div class="table-responsive">
-	<h2 align="center"> Users List</h2> 
-    <table class="table table-bordered">
-        <tr>
-            <th>User Name</th>
-            <th>User Id</th>
-        </tr>
-        <c:forEach items="${users}" var="user">
-      	<tr>
-      	  <td>
-              <c:out value="${user.username}"/>
-          </td>
-      	  <td>
-              <a href="users/${user.id}" class="btn btn-info" role="button"><c:out value="${user.id}"/> </a>
-          </td> 
-     	</tr>
-		</c:forEach>
-		
-    </table>
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/userUpdate.jsp b/src/main/webapp/WEB-INF/views/userUpdate.jsp
deleted file mode 100644
index 7ae381668..000000000
--- a/src/main/webapp/WEB-INF/views/userUpdate.jsp
+++ /dev/null
@@ -1,314 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <title>update user</title>
-
-    <link href="${contextPath}/resources/css/bootstrap.min.css" rel="stylesheet">
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-	<link rel="stylesheet" href="https://bootswatch.com/cosmo/bootstrap.min.css">
-    <style>
-    .container {
-	 margin-top:19px;
-	 border: 2px solid #b38b0d;
-	 margin: 0 auto;
-	width: 60%; 
-	padding: 10px 10px 10px 10px;
-	}
-    </style>
-   </head>
-
-<body>
-<h2 class="form-signin-heading" align="center">Update User Profile</h2>
-<div class="container">
-	<div class="row">
-	<div class="col-md-12 ">
-    <form:form method="POST" modelAttribute="user" class="form-horizontal">
-        <fieldset>      
-      
-		 <div class="form-group">
-        	<spring:bind path="username">        
-	           <form:label class="col-md-4 control-label" path="username">Name :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="username" class="form-control" placeholder="Username"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-        <div class="form-group">
-        	<spring:bind path="userEmail">        
-	           <form:label class="col-md-4 control-label" path="userEmail">Email :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="userEmail" class="form-control" placeholder="userEmail"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-        <div class="form-group">
-        	<spring:bind path="dateOfBirth">        
-	           <form:label class="col-md-4 control-label" path="dateOfBirth">Date Of Birth :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-birthday-cake"></i>
-			     </div>            	
-	                <form:input type="text" path="dateOfBirth" class="form-control" placeholder="eg:01/01/1998"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div> 
-        <div class="form-group">
-        	<spring:bind path="fatherName">        
-	           <form:label class="col-md-4 control-label" path="fatherName">Father's Name :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-male" style="font-size: 20px;"></i>
-			     </div>            	
-	                <form:input type="text" path="fatherName" class="form-control" placeholder="Father's Name"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-         <div class="form-group">
-        	<spring:bind path="motherName">        
-	           <form:label class="col-md-4 control-label" path="motherName">Mother's Name :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-female" style="font-size: 20px;"></i>
-			     </div>            	
-	                <form:input type="text" path="motherName" class="form-control" placeholder="Mother's Name"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-       <div class="form-group">
-       <spring:bind path="gender">
-		  <form:label class="col-md-4 control-label" path="gender">Gender</form:label>
-		  <div class="col-md-4"> 
-		    <form:label class="radio-inline" path="gender">
-		      <form:radiobutton  path="gender"  value="male" checked="checked" />
-		      Male
-		    </form:label> 
-		    <form:label class="radio-inline" path="gender">
-		      <form:radiobutton path="gender"  value="female" />
-		      Female
-		    </form:label> 
-		    <form:label class="radio-inline" path="gender">
-		      <form:radiobutton path="gender"  value="other" />
-		      Other
-		    </form:label>
-		  </div>
-		  </spring:bind>
-		</div>
-		<div class="form-group">
-       <spring:bind path="maritalStatus">
-		  <form:label class="col-md-4 control-label" path="maritalStatus">Marital Status:</form:label>
-		  <div class="col-md-4"> 
-		    <form:label class="radio-inline" path="maritalStatus">
-		      <form:radiobutton  path="maritalStatus"  value="unMarried"  />
-		      Married
-		    </form:label> 
-		    <form:label class="radio-inline" path="gender">
-		      <form:radiobutton path="maritalStatus"  value="unMarried" checked="checked" />
-		       Unmarried
-		    </form:label>		    
-		  </div>
-		  </spring:bind>
-		</div>
-       
-         <div class="form-group">
-        	<spring:bind path="permanentAddress">        
-	           <form:label class="col-md-4 control-label" path="permanentAddress">Permanent Address :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="permanentAddress" class="form-control" placeholder="Area,Street,Dist "
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-         <div class="form-group">
-        	<spring:bind path="tempAddress">        
-	           <form:label class="col-md-4 control-label" path="tempAddress">Temporary Address :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="tempAddress" class="form-control" placeholder="Area,Street,Dist"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-         <div class="form-group">
-        	<spring:bind path="primaryOccupation">        
-	           <form:label class="col-md-4 control-label" path="primaryOccupation">Primary Occupation :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="primaryOccupation" class="form-control" placeholder="Primary Occupation"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-         <div class="form-group">
-        	<spring:bind path="secondaryOccupation">        
-	           <form:label class="col-md-4 control-label" path="secondaryOccupation">Secondary Occupation :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="secondaryOccupation" class="form-control" placeholder="Secondary Occupation"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-           <div class="form-group">
-        	<spring:bind path="skills">        
-	           <form:label class="col-md-4 control-label" path="skills">Skills :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="skills" class="form-control" placeholder="Skills"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-           <div class="form-group">
-        	<spring:bind path="phoneNumber">        
-	           <form:label class="col-md-4 control-label" path="phoneNumber">Phone Number :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="phoneNumber" class="form-control" placeholder="Phone Number"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-           <div class="form-group">
-        	<spring:bind path="secondaryPhoneNumber">        
-	           <form:label class="col-md-4 control-label" path="secondaryPhoneNumber">Secondary PhoneNumber :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="secondaryPhoneNumber" class="form-control" placeholder="Secondary PhoneNumber"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-           <div class="form-group">
-        	<spring:bind path="nationality">        
-	           <form:label class="col-md-4 control-label" path="nationality">Nationality :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="nationality" class="form-control" placeholder="Nationality"
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-       <div class="form-group">
-       <spring:bind path="language">
-		  <form:label class="col-md-4 control-label" path="language">Mother Tongue</form:label>
-		  <div class="col-md-4"> 
-		    <form:label class="radio-inline" path="language">
-		      <form:radiobutton  path="language"  value="english" checked="checked" />
-		     English
-		    </form:label> 
-		    <form:label class="radio-inline" path="language">
-		      <form:radiobutton path="language"  value="spanish" />
-		      Spanish
-		    </form:label> 
-		    <form:label class="radio-inline" path="language">
-		      <form:radiobutton path="language"  value="german" />
-		      German 
-		    </form:label>
-		     <form:label class="radio-inline" path="language">
-		      <form:radiobutton path="language"  value="hindi" />
-		      Hindi
-		    </form:label>
-		     <form:label class="radio-inline" path="language">
-		      <form:radiobutton path="language"  value="other" />
-		      Other
-		    </form:label>
-		  </div>
-		  </spring:bind>
-		</div>
-           <div class="form-group">
-        	<spring:bind path="workingExperience">        
-	           <form:label class="col-md-4 control-label" path="workingExperience">Work Experience :</form:label>
-	            <div class="col-md-4">
-	           	 <div class="input-group">
-	           	 <div class="input-group-addon">
-			        <i class="fa fa-user"></i>
-			     </div>            	
-	                <form:input type="text" path="workingExperience" class="form-control" placeholder="Work Experience "
-	                            autofocus="true"></form:input>
-	            </div> 
-	           </div>                   
-        	</spring:bind>
-       </div>
-       <div class="form-group">
-		  <label class="col-md-4 control-label" ></label>  
-		  <div class="col-md-4">        
-        <button class="btn btn-success" type="submit">Update</button>
-        <a href="${contextPath}/welcome" class="btn btn-danger" > Cancel</a>
-        </div>
-        </div>
-    </fieldset>
-    </form:form>
-</div>
-</div>
-</div>
-<!-- /container -->
-<script src="${contextPath}/resources/js/bootstrap.min.js"></script>
-</body>
-</html>
diff --git a/src/main/webapp/WEB-INF/views/welcome.jsp b/src/main/webapp/WEB-INF/views/welcome.jsp
index d35eb2d5d..ca611d66f 100644
--- a/src/main/webapp/WEB-INF/views/welcome.jsp
+++ b/src/main/webapp/WEB-INF/views/welcome.jsp
@@ -7,10 +7,10 @@
 <html lang="en">
 <head>
     <title>Welcome</title>
-    <link rel="stylesheet" href="${contextPath}/resources/css/bootstrap.min.css">
+    <link href="${contextPath}/resources/css/bootstrap.min.css" rel="stylesheet">
     <link href="${contextPath}/resources/css/profile.css" rel="stylesheet">
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-
+	<link rel="stylesheet" href="https://bootswatch.com/cosmo/bootstrap.min.css">
 </head>
 <body>
 
@@ -26,7 +26,7 @@
                                     class="icon-bar"></span><span class="icon-bar"></span>
                             </button>
                             <a class="navbar-brand" href="#" style="margin-right:-8px; margin-top:-5px;">
-                                <img alt="Brand" src="${contextPath}/resources/Images/user/logo.png" width="30px" height="30px">
+                                <img alt="Brand" src="https://lut.im/7trApsDX08/GeilMRp1FIm4f2p7.png" width="30px" height="30px">
                             </a>
                             <a class="navbar-brand" href="#">VisualPath</a>
                             <i class="brand_network"><small><small>VP* Network</small></small></i>
@@ -41,7 +41,7 @@
                             <ul class="nav navbar-nav navbar-right">
                                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">
                                     <span class="user-avatar pull-left" style="margin-right:8px; margin-top:-5px;">
-                                    <img src="${contextPath}/resources/Images/user/user.png" class="img-responsive img-circle" title="John Doe" alt="John Doe" width="30px" height="30px">
+                                        <img src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" class="img-responsive img-circle" title="John Doe" alt="John Doe" width="30px" height="30px">
                                     </span>
                                     <span class="user-name">
                                         ${pageContext.request.userPrincipal.name}
@@ -52,17 +52,17 @@
                                             <div class="navbar-content">
                                                 <div class="row">
                                                     <div class="col-md-5">
-                                                        <img src="${contextPath}/resources/Images/user/user.png" alt="Alternate Text" class="img-responsive" width="120px" height="120px" />
+                                                        <img src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" alt="Alternate Text" class="img-responsive" width="120px" height="120px" />
                                                         <p class="text-center small">
-                                                            <a href="${contextPath}/upload">Change Photo</a></p>
+                                                            <a href="./3X6zm">Change Photo</a></p>
                                                     </div>
                                                     <div class="col-md-7">
-                                                        <span> ${pageContext.request.userPrincipal.name}</span> <br/>
+                                                        <span>${pageContext.request.userPrincipal.name}</span> <br/>
                                                         <p class="text-muted small">
                                                             ${pageContext.request.userPrincipal.name}@visualpath.co.in</p>
                                                         <div class="divider">
                                                         </div>
-                                                        <a href="${contextPath}/user/${pageContext.request.userPrincipal.name}" class="btn btn-default btn-xs"><i class="fa fa-user-o" aria-hidden="true"></i> UpdateProfile </a>
+                                                        <a href="./56ExR" class="btn btn-default btn-xs"><i class="fa fa-user-o" aria-hidden="true"></i> Profile</a>
                                                         <a href="#" class="btn btn-default btn-xs"><i class="fa fa-address-card-o" aria-hidden="true"></i> Contacts</a>
                                                         <a href="#" class="btn btn-default btn-xs"><i class="fa fa-cogs" aria-hidden="true"></i> Settings</a>
                                                         <a href="#" class="btn btn-default btn-xs"><i class="fa fa-question-circle-o" aria-hidden="true"></i> Help!</a>
@@ -96,7 +96,7 @@
                 <div class="panel-body">
                     <div class="media">
                         <div align="center">
-                            <img class="thumbnail img-responsive" src="${contextPath}/resources/Images/user/user.png" width="300px" height="300px">
+                            <img class="thumbnail img-responsive" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="300px" height="300px">
                         </div>
                         <div class="media-body">
                             <hr>
@@ -122,7 +122,6 @@
                     <span>
                         <h1 class="panel-title pull-left" style="font-size:30px;">${pageContext.request.userPrincipal.name} &nbsp; <small>${pageContext.request.userPrincipal.name}@visualpath.co.in</small> <i class="fa fa-check text-success" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title=" sharing with you"></i></h1>
                         <div class="dropdown pull-right">
-						
                             <button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                                 Friends
                                 <span class="caret"></span>
@@ -138,15 +137,6 @@
                     </span>
                     <br><br>
                     <i class="fa fa-tags" aria-hidden="true"></i> <a href="#" class="tag">#DevOps</a> <a href="#" class="tag"> #Continuous Integration</a> <a href="#" class="tag"> #Continuous Delivery </a><a href="#" class="tag"> #Automation</a>
-                     <c:if test="${pageContext.request.userPrincipal.name =='admin_vp'}">
-					     <a href="${contextPath}/users" class="btn btn-success" >All Users</a>
-					 </c:if>
-					  <c:if test="${pageContext.request.userPrincipal.name =='admin_vp'}">
-					     <a href="${contextPath}/user/rabbit" class="btn btn-success" >RabbitMq</a>
-					 </c:if>
-					 <c:if test="${pageContext.request.userPrincipal.name =='admin_vp'}">
-					     <a href="${contextPath}/user/elasticsearch" class="btn btn-success" >Elasticsearch</a>
-					 </c:if>
                     <br><br><hr>
                     <span class="pull-left">
                         <a href="#" class="btn btn-link" style="text-decoration:none;"><i class="fa fa-fw fa-files-o" aria-hidden="true"></i> Posts</a>
@@ -166,7 +156,7 @@
                 <div class="panel-body">
                     <div class="pull-left">
                         <a href="#">
-                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
+                            <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
                         </a>
                     </div>
                     <h4><a href="#" style="text-decoration:none;"><strong>${pageContext.request.userPrincipal.name}</strong></a><small><small><a href="#" style="text-decoration:none; color:grey;"><i><i class="fa fa-clock-o" aria-hidden="true"></i> 42 minutes ago</i></a></small></small></h4>
@@ -209,7 +199,7 @@
                     <div class="media">
                         <div class="pull-left">
                             <a href="#">
-                                <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
+                                <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
                             </a>
                         </div>
                         <div class="media-body">
@@ -223,7 +213,7 @@
                 <div class="panel-body">
                     <div class="pull-left">
                         <a href="#">
-                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
+                            <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
                         </a>
                     </div>
                     <h4><a href="#" style="text-decoration:none;"><strong>${pageContext.request.userPrincipal.name}</strong></a><small><small><a href="#" style="text-decoration:none; color:grey;"><i><i class="fa fa-clock-o" aria-hidden="true"></i> 42 minutes ago</i></a></small></small></h4>
@@ -251,7 +241,7 @@
                             <div class="panel-body">
                                 <div class="pull-left">
                                     <a href="#">
-                                        <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user2.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
+                                        <img class="media-object img-circle" src="https://diaspote.org/uploads/images/thumb_large_283df6397c4db3fe0344.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
                                     </a>
                                 </div>
                                 <h4><a href="#" style="text-decoration:none;"><strong>Waheed Khan</strong></a> <small><small><a href="#" style="text-decoration:none; color:grey;"><i><i class="fa fa-clock-o" aria-hidden="true"></i> about 10 hours ago</i></a></small></small></h4>
@@ -282,7 +272,7 @@
                     <div class="media">
                         <div class="pull-left">
                             <a href="#">
-                                <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
+                                <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
                             </a>
                         </div>
                         <div class="media-body">
@@ -296,7 +286,7 @@
                 <div class="panel-body">
                     <div class="pull-left">
                         <a href="#">
-                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
+                            <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
                         </a>
                     </div>
                     <h4><a href="#" style="text-decoration:none;"><strong>${pageContext.request.userPrincipal.name}</strong></a><small><small><a href="#" style="text-decoration:none; color:grey;"><i><i class="fa fa-clock-o" aria-hidden="true"></i> 42 minutes ago</i></a></small></small></h4>
@@ -321,7 +311,7 @@
                     <hr>
                     <div class="post-content">
                         <p>" Manager Reaction On Your Work without DevOps "</p>
-                        <img class="img-responsive" src="${contextPath}/resources/Images/user/giphy.gif">
+                        <img class="img-responsive" src="https://media.giphy.com/media/j1QQj6To9Pbxu/giphy.gif">
                         <p><br><a href="#" class="tag">#  I want DevOps </a> <a href="#" class="tag">#  DevOps..</a></p>
                     </div>
                     <hr>
@@ -340,7 +330,7 @@
                     <div class="media">
                         <div class="pull-left">
                             <a href="#">
-                                <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
+                                <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
                             </a>
                         </div>
                         <div class="media-body">
@@ -354,7 +344,7 @@
                 <div class="panel-body">
                     <div class="pull-left">
                         <a href="#">
-                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
+                            <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="50px" height="50px" style="margin-right:8px; margin-top:-5px;">
                         </a>
                     </div>
                     <h4><a href="#" style="text-decoration:none;"><strong>${pageContext.request.userPrincipal.name}</strong></a> <small><small><a href="#" style="text-decoration:none; color:grey;"><i><i class="fa fa-clock-o" aria-hidden="true"></i> 42 minutes ago</i></a></small></small></h4>
@@ -400,7 +390,7 @@
                                 <div class="panel-body">
                                     <div class="pull-left">
                                         <a href="#">
-                                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user2.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
+                                            <img class="media-object img-circle" src="https://diaspote.org/uploads/images/thumb_large_283df6397c4db3fe0344.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
                                         </a>
                                     </div>
                                     <h4><a href="#" style="text-decoration:none;"><strong>Kiran Kumar</strong></a></h4>
@@ -418,7 +408,7 @@
                                 <div class="panel-body">
                                     <div class="pull-left">
                                         <a href="#">
-                                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user3.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
+                                            <img class="media-object img-circle" src="https://lut.im/yR07xwobAA/bZpvdTZmBBTZDJDd.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
                                         </a>
                                     </div>
                                     <h4><a href="#" style="text-decoration:none;"><strong>Mi Chleen</strong></a></h4>
@@ -436,7 +426,7 @@
                                 <div class="panel-body">
                                     <div class="pull-left">
                                         <a href="#">
-                                            <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
+                                            <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="35px" height="35px" style="margin-right:8px; margin-top:-5px;">
                                         </a>
                                     </div>
                                     <h4><a href="#" style="text-decoration:none;"><strong>${pageContext.request.userPrincipal.name}</strong></a></h4>
@@ -452,7 +442,7 @@
                     <div class="media">
                         <div class="pull-left">
                             <a href="#">
-                                <img class="media-object img-circle" src="${contextPath}/resources/Images/user/user.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
+                                <img class="media-object img-circle" src="https://lut.im/7JCpw12uUT/mY0Mb78SvSIcjvkf.png" width="35px" height="35px" style="margin-left:3px; margin-right:-5px;">
                             </a>
                         </div>
                         <div class="media-body">
@@ -469,6 +459,9 @@
         <form id="logoutForm" method="POST" action="${contextPath}/logout">
             <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
         </form>
+
+        <h2>Welcome ${pageContext.request.userPrincipal.name} | <a onclick="document.forms['logoutForm'].submit()">Logout</a></h2>
+
     </c:if>
 </div>
 <script type="text/javascript">
diff --git a/src/main/webapp/resources/Images/background.png b/src/main/webapp/resources/Images/background.png
deleted file mode 100644
index e2d5dd3a9..000000000
Binary files a/src/main/webapp/resources/Images/background.png and /dev/null differ
diff --git a/src/main/webapp/resources/Images/user/giphy.gif b/src/main/webapp/resources/Images/user/giphy.gif
deleted file mode 100644
index 8cf166f7c..000000000
Binary files a/src/main/webapp/resources/Images/user/giphy.gif and /dev/null differ
diff --git a/src/main/webapp/resources/Images/user/logo.png b/src/main/webapp/resources/Images/user/logo.png
deleted file mode 100644
index 843262d6c..000000000
Binary files a/src/main/webapp/resources/Images/user/logo.png and /dev/null differ
diff --git a/src/main/webapp/resources/Images/user/user.png b/src/main/webapp/resources/Images/user/user.png
deleted file mode 100644
index 1b8d24b54..000000000
Binary files a/src/main/webapp/resources/Images/user/user.png and /dev/null differ
diff --git a/src/main/webapp/resources/Images/user/user2.png b/src/main/webapp/resources/Images/user/user2.png
deleted file mode 100644
index bba7180e8..000000000
Binary files a/src/main/webapp/resources/Images/user/user2.png and /dev/null differ
diff --git a/src/main/webapp/resources/Images/user/user3.png b/src/main/webapp/resources/Images/user/user3.png
deleted file mode 100644
index c87fe345a..000000000
Binary files a/src/main/webapp/resources/Images/user/user3.png and /dev/null differ
diff --git a/src/main/webapp/resources/css/w3.css b/src/main/webapp/resources/css/w3.css
deleted file mode 100644
index 9fda92c8c..000000000
--- a/src/main/webapp/resources/css/w3.css
+++ /dev/null
@@ -1,231 +0,0 @@
-/* W3.CSS 4.06 November 2017 by Jan Egil and Borge Refsnes */
-html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
-/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
-html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
-article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}
-audio,canvas,progress,video{display:inline-block}progress{vertical-align:baseline}
-audio:not([controls]){display:none;height:0}[hidden],template{display:none}
-a{background-color:transparent;-webkit-text-decoration-skip:objects}
-a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}
-dfn{font-style:italic}mark{background:#ff0;color:#000}
-small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-sub{bottom:-0.25em}sup{top:-0.5em}figure{margin:1em 40px}img{border-style:none}svg:not(:root){overflow:hidden}
-code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}hr{box-sizing:content-box;height:0;overflow:visible}
-button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}
-button,input{overflow:visible}button,select{text-transform:none}
-button,html [type=button],[type=reset],[type=submit]{-webkit-appearance:button}
-button::-moz-focus-inner, [type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner{border-style:none;padding:0}
-button:-moz-focusring, [type=button]:-moz-focusring, [type=reset]:-moz-focusring, [type=submit]:-moz-focusring{outline:1px dotted ButtonText}
-fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
-legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}
-[type=checkbox],[type=radio]{padding:0}
-[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
-[type=search]{-webkit-appearance:textfield;outline-offset:-2px}
-[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}
-::-webkit-input-placeholder{color:inherit;opacity:0.54}
-::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
-/* End extract */
-html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
-h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}.w3-serif{font-family:serif}
-h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
-hr{border:0;border-top:1px solid #eee;margin:20px 0}
-.w3-image{max-width:100%;height:auto}img{margin-bottom:-5px}a{color:inherit}
-.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
-.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
-.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
-.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
-.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
-.w3-btn,.w3-button{border:none;display:inline-block;outline:0;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
-.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
-.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
-.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
-.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
-.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
-.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
-.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
-.w3-select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
-.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
-.w3-dropdown-hover:hover .w3-dropdown-content{display:block;z-index:1}
-.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
-.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
-.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0}
-.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
-.w3-sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
-.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
-.w3-main,#main{transition:margin-left .4s}
-.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
-.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
-.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
-.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;outline:none;display:block}
-.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
-.w3-bar .w3-button{white-space:normal}
-.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;outline:none;white-space:normal;float:none}
-.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
-.w3-responsive{display:block;overflow-x:auto}
-.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
-.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
-.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
-.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
-.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
-.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
-@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
-.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
-.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
-.w3-content{max-width:980px;margin:auto}.w3-rest{overflow:hidden}
-.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
-.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
-.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
-@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
-.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
-.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
-.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
-@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
-@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
-@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
-@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}}
-.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
-.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
-.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
-.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
-.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
-.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
-.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
-.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
-.w3-display-position{position:absolute}
-.w3-circle{border-radius:50%}
-.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
-.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
-.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
-.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
-.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
-.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
-.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
-.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
-.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
-.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
-.w3-animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
-.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
-.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
-.w3-animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
-.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
-.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
-.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
-.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
-.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
-.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
-.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
-.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
-.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
-.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
-.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
-.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
-.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
-.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
-.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
-.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
-.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
-.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
-.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px 8px 50px}.w3-padding-large{padding:12px 24px!important}
-.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
-.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
-.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
-.w3-left{float:left!important}.w3-right{float:right!important}
-.w3-button:hover{color:#000!important;background-color:#ccc!important}
-.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
-.w3-hover-none:hover{box-shadow:none!important}
-/* Colors */
-.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
-.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
-.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
-.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
-.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
-.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
-.w3-blue-grey,.w3-hover-blue-grey:hover,.w3-blue-gray,.w3-hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
-.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
-.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
-.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
-.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
-.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
-.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
-.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
-.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
-.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
-.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
-.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
-.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
-.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
-.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
-.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
-.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
-.w3-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
-.w3-light-grey,.w3-hover-light-grey:hover,.w3-light-gray,.w3-hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
-.w3-dark-grey,.w3-hover-dark-grey:hover,.w3-dark-gray,.w3-hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
-.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
-.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
-.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
-.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
-.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
-.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
-.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
-.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
-.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
-.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
-.w3-text-blue-grey,.w3-hover-text-blue-grey:hover,.w3-text-blue-gray,.w3-hover-text-blue-gray:hover{color:#607d8b!important}
-.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
-.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
-.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
-.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
-.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
-.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
-.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
-.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
-.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
-.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
-.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
-.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
-.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
-.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
-.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
-.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
-.w3-text-grey,.w3-hover-text-grey:hover,.w3-text-gray,.w3-hover-text-gray:hover{color:#757575!important}
-.w3-text-light-grey,.w3-hover-text-light-grey:hover,.w3-text-light-gray,.w3-hover-text-light-gray:hover{color:#f1f1f1!important}
-.w3-text-dark-grey,.w3-hover-text-dark-grey:hover,.w3-text-dark-gray,.w3-hover-text-dark-gray:hover{color:#3a3a3a!important}
-.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
-.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
-.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
-.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
-.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
-.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
-.w3-border-blue-grey,.w3-hover-border-blue-grey:hover,.w3-border-blue-gray,.w3-hover-border-blue-gray:hover{border-color:#607d8b!important}
-.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
-.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
-.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
-.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
-.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
-.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
-.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
-.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
-.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
-.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
-.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
-.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
-.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
-.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
-.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
-.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
-.w3-border-grey,.w3-hover-border-grey:hover,.w3-border-gray,.w3-hover-border-gray:hover{border-color:#9e9e9e!important}
-.w3-border-light-grey,.w3-hover-border-light-grey:hover,.w3-border-light-gray,.w3-hover-border-light-gray:hover{border-color:#f1f1f1!important}
-.w3-border-dark-grey,.w3-hover-border-dark-grey:hover,.w3-border-dark-gray,.w3-hover-border-dark-gray:hover{border-color:#616161!important}
-.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
-.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}
\ No newline at end of file
diff --git a/target/classes/accountsdb.sql b/target/classes/accountsdb.sql
new file mode 100644
index 000000000..d224d810f
--- /dev/null
+++ b/target/classes/accountsdb.sql
@@ -0,0 +1,104 @@
+-- MySQL dump 10.13  Distrib 5.7.18, for Linux (x86_64)
+--
+-- Host: localhost    Database: accounts
+-- ------------------------------------------------------
+-- Server version	5.7.18-0ubuntu0.16.10.1
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `role`
+--
+
+DROP TABLE IF EXISTS `role`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `role` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `role`
+--
+
+LOCK TABLES `role` WRITE;
+/*!40000 ALTER TABLE `role` DISABLE KEYS */;
+INSERT INTO `role` VALUES (1,'ROLE_USER');
+/*!40000 ALTER TABLE `role` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user`
+--
+
+DROP TABLE IF EXISTS `user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar(255) DEFAULT NULL,
+  `userEmail` varchar(255) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user`
+--
+
+LOCK TABLES `user` WRITE;
+/*!40000 ALTER TABLE `user` DISABLE KEYS */;
+INSERT INTO `user` VALUES (4,'admin_vp','admin@visualpathit.com','$2a$11$DSEIKJNrgPjG.iCYUwErvOkREtC67mqzQ.ogkZbc/KOW1OPOpZfY6');
+/*!40000 ALTER TABLE `user` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_role`
+--
+
+DROP TABLE IF EXISTS `user_role`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_role` (
+  `user_id` int(11) NOT NULL,
+  `role_id` int(11) NOT NULL,
+  PRIMARY KEY (`user_id`,`role_id`),
+  KEY `fk_user_role_roleid_idx` (`role_id`),
+  CONSTRAINT `fk_user_role_roleid` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `fk_user_role_userid` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user_role`
+--
+
+LOCK TABLES `user_role` WRITE;
+/*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
+INSERT INTO `user_role` VALUES (4,1);
+/*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2017-08-28 10:50:51
diff --git a/target/classes/application.properties b/target/classes/application.properties
new file mode 100644
index 000000000..ef8b5a8fe
--- /dev/null
+++ b/target/classes/application.properties
@@ -0,0 +1,4 @@
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/accounts?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+jdbc.username=newuser
+jdbc.password=password
diff --git a/target/classes/com/visualpathit/account/controller/UserController.class b/target/classes/com/visualpathit/account/controller/UserController.class
new file mode 100644
index 000000000..166637197
Binary files /dev/null and b/target/classes/com/visualpathit/account/controller/UserController.class differ
diff --git a/target/classes/com/visualpathit/account/model/Role.class b/target/classes/com/visualpathit/account/model/Role.class
new file mode 100644
index 000000000..44eb149f4
Binary files /dev/null and b/target/classes/com/visualpathit/account/model/Role.class differ
diff --git a/target/classes/com/visualpathit/account/model/User.class b/target/classes/com/visualpathit/account/model/User.class
new file mode 100644
index 000000000..f674122a0
Binary files /dev/null and b/target/classes/com/visualpathit/account/model/User.class differ
diff --git a/target/classes/com/visualpathit/account/repository/RoleRepository.class b/target/classes/com/visualpathit/account/repository/RoleRepository.class
new file mode 100644
index 000000000..ea5943ffc
Binary files /dev/null and b/target/classes/com/visualpathit/account/repository/RoleRepository.class differ
diff --git a/target/classes/com/visualpathit/account/repository/UserRepository.class b/target/classes/com/visualpathit/account/repository/UserRepository.class
new file mode 100644
index 000000000..1a36be14e
Binary files /dev/null and b/target/classes/com/visualpathit/account/repository/UserRepository.class differ
diff --git a/target/classes/com/visualpathit/account/service/SecurityService.class b/target/classes/com/visualpathit/account/service/SecurityService.class
new file mode 100644
index 000000000..3dd66bfdb
Binary files /dev/null and b/target/classes/com/visualpathit/account/service/SecurityService.class differ
diff --git a/target/classes/com/visualpathit/account/service/SecurityServiceImpl.class b/target/classes/com/visualpathit/account/service/SecurityServiceImpl.class
new file mode 100644
index 000000000..5f6244126
Binary files /dev/null and b/target/classes/com/visualpathit/account/service/SecurityServiceImpl.class differ
diff --git a/target/classes/com/visualpathit/account/service/UserDetailsServiceImpl.class b/target/classes/com/visualpathit/account/service/UserDetailsServiceImpl.class
new file mode 100644
index 000000000..2b6dbe5b0
Binary files /dev/null and b/target/classes/com/visualpathit/account/service/UserDetailsServiceImpl.class differ
diff --git a/target/classes/com/visualpathit/account/service/UserService.class b/target/classes/com/visualpathit/account/service/UserService.class
new file mode 100644
index 000000000..34daa4a2b
Binary files /dev/null and b/target/classes/com/visualpathit/account/service/UserService.class differ
diff --git a/target/classes/com/visualpathit/account/service/UserServiceImpl.class b/target/classes/com/visualpathit/account/service/UserServiceImpl.class
new file mode 100644
index 000000000..576a783b0
Binary files /dev/null and b/target/classes/com/visualpathit/account/service/UserServiceImpl.class differ
diff --git a/target/classes/com/visualpathit/account/validator/UserValidator.class b/target/classes/com/visualpathit/account/validator/UserValidator.class
new file mode 100644
index 000000000..3bc9554b5
Binary files /dev/null and b/target/classes/com/visualpathit/account/validator/UserValidator.class differ
diff --git a/target/classes/logback.xml b/target/classes/logback.xml
new file mode 100644
index 000000000..35b81df4d
--- /dev/null
+++ b/target/classes/logback.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE logback>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{15}#%line %msg\n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.visualpathit.account">
+        <level value="debug"/>
+    </logger>
+
+    <logger name="org.springframework">
+        <level value="info"/>
+    </logger>
+
+    <root>
+        <level value="error"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/target/classes/validation.properties b/target/classes/validation.properties
new file mode 100644
index 000000000..0453cdd3a
--- /dev/null
+++ b/target/classes/validation.properties
@@ -0,0 +1,5 @@
+NotEmpty=This field is required.
+Size.userForm.username=Please use between 6 and 32 characters.
+Duplicate.userForm.username= User has already taken this Username.
+Size.userForm.password=Try one with at least 8 characters.
+Diff.userForm.passwordConfirm=These passwords don't match.
\ No newline at end of file
diff --git a/target/test-classes/com/visualpathit/account/controllerTest/SampleTest.class b/target/test-classes/com/visualpathit/account/controllerTest/SampleTest.class
new file mode 100644
index 000000000..00fd98a02
Binary files /dev/null and b/target/test-classes/com/visualpathit/account/controllerTest/SampleTest.class differ
diff --git a/target/test-classes/com/visualpathit/account/controllerTest/UserControllerTest.class b/target/test-classes/com/visualpathit/account/controllerTest/UserControllerTest.class
new file mode 100644
index 000000000..0fc899186
Binary files /dev/null and b/target/test-classes/com/visualpathit/account/controllerTest/UserControllerTest.class differ
diff --git a/target/test-classes/com/visualpathit/account/modelTest/RoleTest.class b/target/test-classes/com/visualpathit/account/modelTest/RoleTest.class
new file mode 100644
index 000000000..3851d4ffb
Binary files /dev/null and b/target/test-classes/com/visualpathit/account/modelTest/RoleTest.class differ
diff --git a/target/test-classes/com/visualpathit/account/modelTest/UserTest.class b/target/test-classes/com/visualpathit/account/modelTest/UserTest.class
new file mode 100644
index 000000000..fc0166942
Binary files /dev/null and b/target/test-classes/com/visualpathit/account/modelTest/UserTest.class differ
diff --git a/target/test-classes/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.class b/target/test-classes/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.class
new file mode 100644
index 000000000..74a522193
Binary files /dev/null and b/target/test-classes/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.class differ
diff --git a/userdata/jenkins-setup.sh b/userdata/jenkins-setup.sh
new file mode 100644
index 000000000..2fa949dc6
--- /dev/null
+++ b/userdata/jenkins-setup.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+sudo apt update
+sudo apt install openjdk-11-jdk -y
+sudo apt install maven -y
+curl -fsSL https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key | sudo tee \
+  /usr/share/keyrings/jenkins-keyring.asc > /dev/null
+  
+echo deb [signed-by=/usr/share/keyrings/jenkins-keyring.asc] \
+  https://pkg.jenkins.io/debian-stable binary/ | sudo tee \
+  /etc/apt/sources.list.d/jenkins.list > /dev/null
+
+sudo apt-get update
+sudo apt-get install jenkins -y
+###
diff --git a/userdata/nexus-setup.sh b/userdata/nexus-setup.sh
new file mode 100644
index 000000000..4d0c48fc4
--- /dev/null
+++ b/userdata/nexus-setup.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+yum install java-1.8.0-openjdk.x86_64 wget -y   
+mkdir -p /opt/nexus/   
+mkdir -p /tmp/nexus/                           
+cd /tmp/nexus/
+NEXUSURL="https://download.sonatype.com/nexus/3/latest-unix.tar.gz"
+wget $NEXUSURL -O nexus.tar.gz
+sleep 10
+EXTOUT=`tar xzvf nexus.tar.gz`
+NEXUSDIR=`echo $EXTOUT | cut -d '/' -f1`
+sleep 5
+rm -rf /tmp/nexus/nexus.tar.gz
+cp -r /tmp/nexus/* /opt/nexus/
+sleep 5
+useradd nexus
+chown -R nexus.nexus /opt/nexus 
+cat <<EOT>> /etc/systemd/system/nexus.service
+[Unit]                                                                          
+Description=nexus service                                                       
+After=network.target                                                            
+                                                                  
+[Service]                                                                       
+Type=forking                                                                    
+LimitNOFILE=65536                                                               
+ExecStart=/opt/nexus/$NEXUSDIR/bin/nexus start                                  
+ExecStop=/opt/nexus/$NEXUSDIR/bin/nexus stop                                    
+User=nexus                                                                      
+Restart=on-abort                                                                
+                                                                  
+[Install]                                                                       
+WantedBy=multi-user.target                                                      
+
+EOT
+
+echo 'run_as_user="nexus"' > /opt/nexus/$NEXUSDIR/bin/nexus.rc
+systemctl daemon-reload
+systemctl start nexus
+systemctl enable nexus
diff --git a/userdata/sonar-analysis-properties b/userdata/sonar-analysis-properties
new file mode 100644
index 000000000..8751fe7fd
--- /dev/null
+++ b/userdata/sonar-analysis-properties
@@ -0,0 +1,10 @@
+sonar.projectKey=vprofile
+sonar.projectName=vprofile-repo
+sonar.projectVersion=1.0
+sonar.sources=src/
+sonar.java.binaries=target/test-classes/com/visualpathit/account/controllerTest/
+sonar.junit.reportsPath=target/surefire-reports/
+sonar.jacoco.reportsPath=target/jacoco.exec
+sonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
+
+
diff --git a/userdata/sonar-setup.sh b/userdata/sonar-setup.sh
new file mode 100644
index 000000000..99a3a78b7
--- /dev/null
+++ b/userdata/sonar-setup.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+cp /etc/sysctl.conf /root/sysctl.conf_backup
+cat <<EOT> /etc/sysctl.conf
+vm.max_map_count=262144
+fs.file-max=65536
+ulimit -n 65536
+ulimit -u 4096
+EOT
+cp /etc/security/limits.conf /root/sec_limit.conf_backup
+cat <<EOT> /etc/security/limits.conf
+sonarqube   -   nofile   65536
+sonarqube   -   nproc    409
+EOT
+
+sudo apt-get update -y
+sudo apt-get install openjdk-11-jdk -y
+sudo update-alternatives --config java
+
+java -version
+
+sudo apt update
+wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo apt-key add -
+
+sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
+sudo apt install postgresql postgresql-contrib -y
+#sudo -u postgres psql -c "SELECT version();"
+sudo systemctl enable postgresql.service
+sudo systemctl start  postgresql.service
+sudo echo "postgres:admin123" | chpasswd
+runuser -l postgres -c "createuser sonar"
+sudo -i -u postgres psql -c "ALTER USER sonar WITH ENCRYPTED PASSWORD 'admin123';"
+sudo -i -u postgres psql -c "CREATE DATABASE sonarqube OWNER sonar;"
+sudo -i -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE sonarqube to sonar;"
+systemctl restart  postgresql
+#systemctl status -l   postgresql
+netstat -tulpena | grep postgres
+sudo mkdir -p /sonarqube/
+cd /sonarqube/
+sudo curl -O https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-8.3.0.34182.zip
+sudo apt-get install zip -y
+sudo unzip -o sonarqube-8.3.0.34182.zip -d /opt/
+sudo mv /opt/sonarqube-8.3.0.34182/ /opt/sonarqube
+sudo groupadd sonar
+sudo useradd -c "SonarQube - User" -d /opt/sonarqube/ -g sonar sonar
+sudo chown sonar:sonar /opt/sonarqube/ -R
+cp /opt/sonarqube/conf/sonar.properties /root/sonar.properties_backup
+cat <<EOT> /opt/sonarqube/conf/sonar.properties
+sonar.jdbc.username=sonar
+sonar.jdbc.password=admin123
+sonar.jdbc.url=jdbc:postgresql://localhost/sonarqube
+sonar.web.host=0.0.0.0
+sonar.web.port=9000
+sonar.web.javaAdditionalOpts=-server
+sonar.search.javaOpts=-Xmx512m -Xms512m -XX:+HeapDumpOnOutOfMemoryError
+sonar.log.level=INFO
+sonar.path.logs=logs
+EOT
+
+cat <<EOT> /etc/systemd/system/sonarqube.service
+[Unit]
+Description=SonarQube service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+
+ExecStart=/opt/sonarqube/bin/linux-x86-64/sonar.sh start
+ExecStop=/opt/sonarqube/bin/linux-x86-64/sonar.sh stop
+
+User=sonar
+Group=sonar
+Restart=always
+
+LimitNOFILE=65536
+LimitNPROC=4096
+
+
+[Install]
+WantedBy=multi-user.target
+EOT
+
+systemctl daemon-reload
+systemctl enable sonarqube.service
+#systemctl start sonarqube.service
+#systemctl status -l sonarqube.service
+apt-get install nginx -y
+rm -rf /etc/nginx/sites-enabled/default
+rm -rf /etc/nginx/sites-available/default
+cat <<EOT> /etc/nginx/sites-available/sonarqube
+server{
+    listen      80;
+    server_name sonarqube.groophy.in;
+
+    access_log  /var/log/nginx/sonar.access.log;
+    error_log   /var/log/nginx/sonar.error.log;
+
+    proxy_buffers 16 64k;
+    proxy_buffer_size 128k;
+
+    location / {
+        proxy_pass  http://127.0.0.1:9000;
+        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+        proxy_redirect off;
+              
+        proxy_set_header    Host            \$host;
+        proxy_set_header    X-Real-IP       \$remote_addr;
+        proxy_set_header    X-Forwarded-For \$proxy_add_x_forwarded_for;
+        proxy_set_header    X-Forwarded-Proto http;
+    }
+}
+EOT
+ln -s /etc/nginx/sites-available/sonarqube /etc/nginx/sites-enabled/sonarqube
+systemctl enable nginx.service
+#systemctl restart nginx.service
+sudo ufw allow 80,9000,9001/tcp
+
+echo "System reboot in 30 sec"
+sleep 30
+reboot