diff --git a/apprecommender/web/server.py b/web/server.py
similarity index 95%
rename from apprecommender/web/server.py
rename to web/server.py
index 2069105..0a37b80 100755
--- a/apprecommender/web/server.py
+++ b/web/server.py
@@ -8,10 +8,10 @@
 
 sys.path.insert(0, "/var/www/AppRecommender/src/")
 
-from config import Config
-from recommender import Recommender
-from user import PopconSystem, PkgsListSystem
-from data import DebianPackage
+from apprecommender.config import Config
+from apprecommender.recommender import Recommender
+from apprecommender.user import PopconSystem, PkgsListSystem
+from apprecommender.data import DebianPackage
 
 # avoid "RuntimeError: maximum recursion depth exceeded"
 sys.setrecursionlimit(50000)
diff --git a/apprecommender/web/static/coda-slider-2.0/GPL-LICENSE.txt b/web/static/coda-slider-2.0/GPL-LICENSE.txt
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/GPL-LICENSE.txt
rename to web/static/coda-slider-2.0/GPL-LICENSE.txt
diff --git a/apprecommender/web/static/coda-slider-2.0/MIT-LICENSE.txt b/web/static/coda-slider-2.0/MIT-LICENSE.txt
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/MIT-LICENSE.txt
rename to web/static/coda-slider-2.0/MIT-LICENSE.txt
diff --git a/apprecommender/web/static/coda-slider-2.0/images/ajax-loader.gif b/web/static/coda-slider-2.0/images/ajax-loader.gif
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/images/ajax-loader.gif
rename to web/static/coda-slider-2.0/images/ajax-loader.gif
diff --git a/apprecommender/web/static/coda-slider-2.0/index.html b/web/static/coda-slider-2.0/index.html
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/index.html
rename to web/static/coda-slider-2.0/index.html
diff --git a/apprecommender/web/static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js b/web/static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js
rename to web/static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js
diff --git a/apprecommender/web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js b/web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js
rename to web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js
diff --git a/apprecommender/web/static/coda-slider-2.0/javascripts/jquery.easing.1.3.js b/web/static/coda-slider-2.0/javascripts/jquery.easing.1.3.js
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/javascripts/jquery.easing.1.3.js
rename to web/static/coda-slider-2.0/javascripts/jquery.easing.1.3.js
diff --git a/apprecommender/web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css b/web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css
rename to web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css
diff --git a/apprecommender/web/static/coda-slider-2.0/stylesheets/reset.css b/web/static/coda-slider-2.0/stylesheets/reset.css
similarity index 100%
rename from apprecommender/web/static/coda-slider-2.0/stylesheets/reset.css
rename to web/static/coda-slider-2.0/stylesheets/reset.css
diff --git a/apprecommender/web/static/css/apprec.css b/web/static/css/apprec.css
similarity index 100%
rename from apprecommender/web/static/css/apprec.css
rename to web/static/css/apprec.css
diff --git a/apprecommender/web/static/css/debtags.css b/web/static/css/debtags.css
similarity index 100%
rename from apprecommender/web/static/css/debtags.css
rename to web/static/css/debtags.css
diff --git a/apprecommender/web/static/css/dropdown.css b/web/static/css/dropdown.css
similarity index 100%
rename from apprecommender/web/static/css/dropdown.css
rename to web/static/css/dropdown.css
diff --git a/apprecommender/web/static/css/facebox.css b/web/static/css/facebox.css
similarity index 100%
rename from apprecommender/web/static/css/facebox.css
rename to web/static/css/facebox.css
diff --git a/apprecommender/web/static/css/local.css b/web/static/css/local.css
similarity index 100%
rename from apprecommender/web/static/css/local.css
rename to web/static/css/local.css
diff --git a/apprecommender/web/static/css/quimby.css b/web/static/css/quimby.css
similarity index 100%
rename from apprecommender/web/static/css/quimby.css
rename to web/static/css/quimby.css
diff --git a/apprecommender/web/static/css/screen.css b/web/static/css/screen.css
similarity index 100%
rename from apprecommender/web/static/css/screen.css
rename to web/static/css/screen.css
diff --git a/apprecommender/web/static/css/style.css b/web/static/css/style.css
similarity index 100%
rename from apprecommender/web/static/css/style.css
rename to web/static/css/style.css
diff --git a/apprecommender/web/static/css/survey.css b/web/static/css/survey.css
similarity index 100%
rename from apprecommender/web/static/css/survey.css
rename to web/static/css/survey.css
diff --git a/apprecommender/web/static/css/tabs.css b/web/static/css/tabs.css
similarity index 100%
rename from apprecommender/web/static/css/tabs.css
rename to web/static/css/tabs.css
diff --git a/apprecommender/web/static/css/voting.css b/web/static/css/voting.css
similarity index 100%
rename from apprecommender/web/static/css/voting.css
rename to web/static/css/voting.css
diff --git a/apprecommender/web/static/favicon.ico b/web/static/favicon.ico
similarity index 100%
rename from apprecommender/web/static/favicon.ico
rename to web/static/favicon.ico
diff --git a/apprecommender/web/static/images/AppRecommender-logo.jpg b/web/static/images/AppRecommender-logo.jpg
similarity index 100%
rename from apprecommender/web/static/images/AppRecommender-logo.jpg
rename to web/static/images/AppRecommender-logo.jpg
diff --git a/apprecommender/web/static/images/admon-important.png b/web/static/images/admon-important.png
similarity index 100%
rename from apprecommender/web/static/images/admon-important.png
rename to web/static/images/admon-important.png
diff --git a/apprecommender/web/static/images/admon-note.png b/web/static/images/admon-note.png
similarity index 100%
rename from apprecommender/web/static/images/admon-note.png
rename to web/static/images/admon-note.png
diff --git a/apprecommender/web/static/images/admon-tip.png b/web/static/images/admon-tip.png
similarity index 100%
rename from apprecommender/web/static/images/admon-tip.png
rename to web/static/images/admon-tip.png
diff --git a/apprecommender/web/static/images/admon-warning.png b/web/static/images/admon-warning.png
similarity index 100%
rename from apprecommender/web/static/images/admon-warning.png
rename to web/static/images/admon-warning.png
diff --git a/apprecommender/web/static/images/ajax-loader.gif b/web/static/images/ajax-loader.gif
similarity index 100%
rename from apprecommender/web/static/images/ajax-loader.gif
rename to web/static/images/ajax-loader.gif
diff --git a/apprecommender/web/static/images/apprec.png b/web/static/images/apprec.png
similarity index 100%
rename from apprecommender/web/static/images/apprec.png
rename to web/static/images/apprec.png
diff --git a/apprecommender/web/static/images/closelabel.png b/web/static/images/closelabel.png
similarity index 100%
rename from apprecommender/web/static/images/closelabel.png
rename to web/static/images/closelabel.png
diff --git a/apprecommender/web/static/images/delete.gif b/web/static/images/delete.gif
similarity index 100%
rename from apprecommender/web/static/images/delete.gif
rename to web/static/images/delete.gif
diff --git a/apprecommender/web/static/images/emblem-downloads.png b/web/static/images/emblem-downloads.png
similarity index 100%
rename from apprecommender/web/static/images/emblem-downloads.png
rename to web/static/images/emblem-downloads.png
diff --git a/apprecommender/web/static/images/gradient.png b/web/static/images/gradient.png
similarity index 100%
rename from apprecommender/web/static/images/gradient.png
rename to web/static/images/gradient.png
diff --git a/apprecommender/web/static/images/greydot.png b/web/static/images/greydot.png
similarity index 100%
rename from apprecommender/web/static/images/greydot.png
rename to web/static/images/greydot.png
diff --git a/apprecommender/web/static/images/icon45.png b/web/static/images/icon45.png
similarity index 100%
rename from apprecommender/web/static/images/icon45.png
rename to web/static/images/icon45.png
diff --git a/apprecommender/web/static/images/icon55.png b/web/static/images/icon55.png
similarity index 100%
rename from apprecommender/web/static/images/icon55.png
rename to web/static/images/icon55.png
diff --git a/apprecommender/web/static/images/icon95.png b/web/static/images/icon95.png
similarity index 100%
rename from apprecommender/web/static/images/icon95.png
rename to web/static/images/icon95.png
diff --git a/apprecommender/web/static/images/loading.gif b/web/static/images/loading.gif
similarity index 100%
rename from apprecommender/web/static/images/loading.gif
rename to web/static/images/loading.gif
diff --git a/apprecommender/web/static/images/loadingAnimation.gif b/web/static/images/loadingAnimation.gif
similarity index 100%
rename from apprecommender/web/static/images/loadingAnimation.gif
rename to web/static/images/loadingAnimation.gif
diff --git a/apprecommender/web/static/images/logo-gray-gradient.png b/web/static/images/logo-gray-gradient.png
similarity index 100%
rename from apprecommender/web/static/images/logo-gray-gradient.png
rename to web/static/images/logo-gray-gradient.png
diff --git a/apprecommender/web/static/images/logo.png b/web/static/images/logo.png
similarity index 100%
rename from apprecommender/web/static/images/logo.png
rename to web/static/images/logo.png
diff --git a/apprecommender/web/static/images/macFFBgHack.png b/web/static/images/macFFBgHack.png
similarity index 100%
rename from apprecommender/web/static/images/macFFBgHack.png
rename to web/static/images/macFFBgHack.png
diff --git a/apprecommender/web/static/images/master-vfl172243.png b/web/static/images/master-vfl172243.png
similarity index 100%
rename from apprecommender/web/static/images/master-vfl172243.png
rename to web/static/images/master-vfl172243.png
diff --git a/apprecommender/web/static/images/no-dis.JPG b/web/static/images/no-dis.JPG
similarity index 100%
rename from apprecommender/web/static/images/no-dis.JPG
rename to web/static/images/no-dis.JPG
diff --git a/apprecommender/web/static/images/no-enb.JPG b/web/static/images/no-enb.JPG
similarity index 100%
rename from apprecommender/web/static/images/no-enb.JPG
rename to web/static/images/no-enb.JPG
diff --git a/apprecommender/web/static/images/openlogo-50.png b/web/static/images/openlogo-50.png
similarity index 100%
rename from apprecommender/web/static/images/openlogo-50.png
rename to web/static/images/openlogo-50.png
diff --git a/apprecommender/web/static/images/pattern.gif b/web/static/images/pattern.gif
similarity index 100%
rename from apprecommender/web/static/images/pattern.gif
rename to web/static/images/pattern.gif
diff --git a/apprecommender/web/static/images/pixel-vfl73.gif b/web/static/images/pixel-vfl73.gif
similarity index 100%
rename from apprecommender/web/static/images/pixel-vfl73.gif
rename to web/static/images/pixel-vfl73.gif
diff --git a/apprecommender/web/static/images/reddot.png b/web/static/images/reddot.png
similarity index 100%
rename from apprecommender/web/static/images/reddot.png
rename to web/static/images/reddot.png
diff --git a/apprecommender/web/static/images/smile-g.png b/web/static/images/smile-g.png
similarity index 100%
rename from apprecommender/web/static/images/smile-g.png
rename to web/static/images/smile-g.png
diff --git a/apprecommender/web/static/images/smile-p.png b/web/static/images/smile-p.png
similarity index 100%
rename from apprecommender/web/static/images/smile-p.png
rename to web/static/images/smile-p.png
diff --git a/apprecommender/web/static/images/smile-s.png b/web/static/images/smile-s.png
similarity index 100%
rename from apprecommender/web/static/images/smile-s.png
rename to web/static/images/smile-s.png
diff --git a/apprecommender/web/static/images/spinner.gif b/web/static/images/spinner.gif
similarity index 100%
rename from apprecommender/web/static/images/spinner.gif
rename to web/static/images/spinner.gif
diff --git a/apprecommender/web/static/images/star.gif b/web/static/images/star.gif
similarity index 100%
rename from apprecommender/web/static/images/star.gif
rename to web/static/images/star.gif
diff --git a/apprecommender/web/static/images/tick.gif b/web/static/images/tick.gif
similarity index 100%
rename from apprecommender/web/static/images/tick.gif
rename to web/static/images/tick.gif
diff --git a/apprecommender/web/static/images/upload.png b/web/static/images/upload.png
similarity index 100%
rename from apprecommender/web/static/images/upload.png
rename to web/static/images/upload.png
diff --git a/apprecommender/web/static/images/yes-dis.JPG b/web/static/images/yes-dis.JPG
similarity index 100%
rename from apprecommender/web/static/images/yes-dis.JPG
rename to web/static/images/yes-dis.JPG
diff --git a/apprecommender/web/static/images/yes-enb.JPG b/web/static/images/yes-enb.JPG
similarity index 100%
rename from apprecommender/web/static/images/yes-enb.JPG
rename to web/static/images/yes-enb.JPG
diff --git a/apprecommender/web/static/js/FormManager.js b/web/static/js/FormManager.js
similarity index 100%
rename from apprecommender/web/static/js/FormManager.js
rename to web/static/js/FormManager.js
diff --git a/apprecommender/web/static/js/facebox.js b/web/static/js/facebox.js
similarity index 100%
rename from apprecommender/web/static/js/facebox.js
rename to web/static/js/facebox.js
diff --git a/apprecommender/web/static/js/form.js b/web/static/js/form.js
similarity index 100%
rename from apprecommender/web/static/js/form.js
rename to web/static/js/form.js
diff --git a/apprecommender/web/static/js/handlers.js b/web/static/js/handlers.js
similarity index 100%
rename from apprecommender/web/static/js/handlers.js
rename to web/static/js/handlers.js
diff --git a/apprecommender/web/static/js/jquery.MetaData.js b/web/static/js/jquery.MetaData.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.MetaData.js
rename to web/static/js/jquery.MetaData.js
diff --git a/apprecommender/web/static/js/jquery.autocomplete.js b/web/static/js/jquery.autocomplete.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.autocomplete.js
rename to web/static/js/jquery.autocomplete.js
diff --git a/apprecommender/web/static/js/jquery.cycle.js b/web/static/js/jquery.cycle.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.cycle.js
rename to web/static/js/jquery.cycle.js
diff --git a/apprecommender/web/static/js/jquery.flyout.js b/web/static/js/jquery.flyout.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.flyout.js
rename to web/static/js/jquery.flyout.js
diff --git a/apprecommender/web/static/js/jquery.jgrowl.js b/web/static/js/jquery.jgrowl.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.jgrowl.js
rename to web/static/js/jquery.jgrowl.js
diff --git a/apprecommender/web/static/js/jquery.js b/web/static/js/jquery.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.js
rename to web/static/js/jquery.js
diff --git a/apprecommender/web/static/js/jquery.livequery.js b/web/static/js/jquery.livequery.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.livequery.js
rename to web/static/js/jquery.livequery.js
diff --git a/apprecommender/web/static/js/jquery.rating.js b/web/static/js/jquery.rating.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.rating.js
rename to web/static/js/jquery.rating.js
diff --git a/apprecommender/web/static/js/jquery.simplerss.js b/web/static/js/jquery.simplerss.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.simplerss.js
rename to web/static/js/jquery.simplerss.js
diff --git a/apprecommender/web/static/js/jquery.tooltip.js b/web/static/js/jquery.tooltip.js
similarity index 100%
rename from apprecommender/web/static/js/jquery.tooltip.js
rename to web/static/js/jquery.tooltip.js
diff --git a/apprecommender/web/static/json/screenshots.json b/web/static/json/screenshots.json
similarity index 100%
rename from apprecommender/web/static/json/screenshots.json
rename to web/static/json/screenshots.json
diff --git a/apprecommender/web/survey.py b/web/survey.py
similarity index 98%
rename from apprecommender/web/survey.py
rename to web/survey.py
index 569bee9..7199e5f 100755
--- a/apprecommender/web/survey.py
+++ b/web/survey.py
@@ -3,6 +3,7 @@
 import os
 import web
 import tempfile
+import logging
 import sys
 import csv
 import datetime
@@ -11,11 +12,10 @@
 
 sys.path.insert(0, "/var/www/AppRecommender/src/")
 
-import logging
-from config import Config
-from recommender import Recommender
-from user import PopconSystem, PkgsListSystem
-from data import DebianPackage
+from apprecommender.config import Config
+from apprecommender.recommender import Recommender
+from apprecommender.user import PopconSystem, PkgsListSystem
+from apprecommender.data import DebianPackage
 
 # avoid "RuntimeError: maximum recursion depth exceeded"
 sys.setrecursionlimit(50000)
diff --git a/apprecommender/web/templates/README b/web/templates/README
similarity index 100%
rename from apprecommender/web/templates/README
rename to web/templates/README
diff --git a/apprecommender/web/templates/about.html b/web/templates/about.html
similarity index 100%
rename from apprecommender/web/templates/about.html
rename to web/templates/about.html
diff --git a/apprecommender/web/templates/about_survey.html b/web/templates/about_survey.html
similarity index 100%
rename from apprecommender/web/templates/about_survey.html
rename to web/templates/about_survey.html
diff --git a/apprecommender/web/templates/apprec.html b/web/templates/apprec.html
similarity index 100%
rename from apprecommender/web/templates/apprec.html
rename to web/templates/apprec.html
diff --git a/apprecommender/web/templates/custom.html b/web/templates/custom.html
similarity index 100%
rename from apprecommender/web/templates/custom.html
rename to web/templates/custom.html
diff --git a/apprecommender/web/templates/error.html b/web/templates/error.html
similarity index 100%
rename from apprecommender/web/templates/error.html
rename to web/templates/error.html
diff --git a/apprecommender/web/templates/fake.html b/web/templates/fake.html
similarity index 100%
rename from apprecommender/web/templates/fake.html
rename to web/templates/fake.html
diff --git a/apprecommender/web/templates/index.html b/web/templates/index.html
similarity index 100%
rename from apprecommender/web/templates/index.html
rename to web/templates/index.html
diff --git a/apprecommender/web/templates/index_survey.html b/web/templates/index_survey.html
similarity index 100%
rename from apprecommender/web/templates/index_survey.html
rename to web/templates/index_survey.html
diff --git a/apprecommender/web/templates/layout.html b/web/templates/layout.html
similarity index 100%
rename from apprecommender/web/templates/layout.html
rename to web/templates/layout.html
diff --git a/apprecommender/web/templates/package.html b/web/templates/package.html
similarity index 100%
rename from apprecommender/web/templates/package.html
rename to web/templates/package.html
diff --git a/apprecommender/web/templates/searchbox.html b/web/templates/searchbox.html
similarity index 100%
rename from apprecommender/web/templates/searchbox.html
rename to web/templates/searchbox.html
diff --git a/apprecommender/web/templates/support.html b/web/templates/support.html
similarity index 100%
rename from apprecommender/web/templates/support.html
rename to web/templates/support.html
diff --git a/apprecommender/web/templates/survey.html b/web/templates/survey.html
similarity index 100%
rename from apprecommender/web/templates/survey.html
rename to web/templates/survey.html
diff --git a/apprecommender/web/templates/tabs.html b/web/templates/tabs.html
similarity index 100%
rename from apprecommender/web/templates/tabs.html
rename to web/templates/tabs.html
diff --git a/apprecommender/web/templates/thanks.html b/web/templates/thanks.html
similarity index 100%
rename from apprecommender/web/templates/thanks.html
rename to web/templates/thanks.html
diff --git a/apprecommender/web/templates/thanks_id.html b/web/templates/thanks_id.html
similarity index 100%
rename from apprecommender/web/templates/thanks_id.html
rename to web/templates/thanks_id.html