diff --git a/JenkinsfileDeploy b/JenkinsfileDeploy
index ee1c26e234caf7b935c1030a77bcca9fe851fa3f..56b7cbf94b3272da0864ec9ab9a926ce079ae93e 100755
--- a/JenkinsfileDeploy
+++ b/JenkinsfileDeploy
@@ -3,102 +3,21 @@ pipeline {
  
   stages {
 
-    stage('Retrieve Data') {
+    stage('Retrieve Website') {
       steps {
         sh '''        
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/docs/*zip*/docs.zip -O docs.zip
-          unzip -o docs.zip
-          
-          mkdir -p projects/
-          cp -r datasets/projects/* projects/
-
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/projects/list_projects.txt -O projects/list_projects.txt 
-          for p in `cat projects/list_projects.txt`; do 
-              wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/projects/$p/*zip*/$p.zip -O projects/$p.zip
-              unzip -d projects/ -o projects/$p.zip
-          done
-
-          mkdir -p aeri_stacktraces/
-          cp -r datasets/aeri_stacktraces/* aeri_stacktraces/
-
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/aeri_stacktraces/*zip*/aeri_stacktraces.zip -O aeri_stacktraces.zip
-          unzip -o aeri_stacktraces.zip
-
-          mkdir -p eclipse_mls/mboxes
-          cp -r datasets/eclipse_mls/* eclipse_mls/
-
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/eclipse_mls_full.csv.gz -O eclipse_mls/eclipse_mls_full.csv.gz
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/eclipse_mls.html -O eclipse_mls/eclipse_mls.html
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/mbox_csv_analysis.html -O eclipse_mls/mbox_csv_analysis.html	
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/mbox_csv_analysis.rmd -O eclipse_mls/mbox_csv_analysis.rmd
-
-          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/list_mboxes.txt -O eclipse_mls/list_mboxes.txt
-          for mbox in `cat eclipse_mls/list_mboxes.txt`; do 
-            wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/datasets/eclipse_mls/mboxes/${mbox}.gz -O eclipse_mls/mboxes/${mbox}.gz
-          done
+          wget http://ci4.castalia.camp:8080/job/scava-datasets/lastSuccessfulBuild/artifact/website/public/*zip*/public.zip -O public.zip
+          unzip -o public.zip
         '''
       }
     }
 
-    stage('Deploy Documentation') {
-      steps {
-        sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-          sh '''
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/index.html
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/datasets_privacy.html
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/data_transformation.png
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/scava-header.jpg
-
-            scp -r docs/scava.html genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/index.html
-            scp -r docs/datasets_privacy.html genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/
-            scp -r docs/data_transformation.png genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/
-            scp -r docs/scava-header.jpg genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/
-          '''
-        }
-      }
-
-    }
-
-    /* stage('Deploy AERI') {
-      steps {
-        sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-          sh '''
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/aeri_stacktraces/
-            ssh genie.scava@projects-storage.eclipse.org mkdir -p /home/data/httpd/download.eclipse.org/scava/aeri_stacktraces/
-
-            wget https://castalia.camp/dl/datasets/incidents_bundles_extract.csv.bz2 -O aeri_stacktraces/incidents_bundles_extract.csv.bz2
-            wget https://castalia.camp/dl/datasets/incidents_extract.csv.bz2 -O aeri_stacktraces/incidents_extract.csv.bz2
-            wget https://castalia.camp/dl/datasets/incidents_full.tar.bz2 -O aeri_stacktraces/incidents_full.tar.bz2
-            wget https://castalia.camp/dl/datasets/problems_extract.csv.bz2 -O aeri_stacktraces/problems_extract.csv.bz2
-            wget https://castalia.camp/dl/datasets/problems_full.tar.bz2 -O aeri_stacktraces/problems_full.tar.bz2
-            
-            scp -r aeri_stacktraces/* genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/aeri_stacktraces/
-          '''
-        }
-      }
-	} */
-
-    stage('Deploy Mailing lists') {
-      steps {
-          sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-            sh '''
-              ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/eclipse_mls/
-              ssh genie.scava@projects-storage.eclipse.org mkdir -p /home/data/httpd/download.eclipse.org/scava/eclipse_mls/
-             
-              scp -r eclipse_mls/* genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/eclipse_mls/
-            '''
-          }
-        }
-    }
-
-    stage('Deploy Projects') {
+    stage('Deploy to downloads') {
       steps {
         sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
           sh '''
-            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/projects/
-            ssh genie.scava@projects-storage.eclipse.org mkdir -p /home/data/httpd/download.eclipse.org/scava/projects/
-            
-            scp -r projects/* genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/projects/
+            ssh genie.scava@projects-storage.eclipse.org rm -rf /home/data/httpd/download.eclipse.org/scava/*
+            scp -r public/* genie.scava@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/scava/
 
             ssh genie.scava@projects-storage.eclipse.org ls -lR /home/data/httpd/download.eclipse.org/scava/
           '''