diff --git a/swisssurfer/AUTHORS b/AUTHORS
similarity index 100%
rename from swisssurfer/AUTHORS
rename to AUTHORS
diff --git a/swisssurfer/COPYING b/COPYING
similarity index 100%
rename from swisssurfer/COPYING
rename to COPYING
diff --git a/swisssurfer/ChangeLog b/ChangeLog
similarity index 100%
rename from swisssurfer/ChangeLog
rename to ChangeLog
diff --git a/swisssurfer/INSTALL b/INSTALL
similarity index 100%
rename from swisssurfer/INSTALL
rename to INSTALL
diff --git a/swisssurfer/NEWS b/NEWS
similarity index 100%
rename from swisssurfer/NEWS
rename to NEWS
diff --git a/swisssurfer/README b/README
similarity index 100%
rename from swisssurfer/README
rename to README
diff --git a/swisssurfer/bootstrap.sh b/bootstrap.sh
similarity index 100%
rename from swisssurfer/bootstrap.sh
rename to bootstrap.sh
diff --git a/swisssurfer/configure.in b/configure.in
similarity index 100%
rename from swisssurfer/configure.in
rename to configure.in
diff --git a/swisssurfer/doc/doxyfile.in b/doc/doxyfile.in
similarity index 100%
rename from swisssurfer/doc/doxyfile.in
rename to doc/doxyfile.in
diff --git a/swisssurfer/doc/makefile.am b/doc/makefile.am
similarity index 100%
rename from swisssurfer/doc/makefile.am
rename to doc/makefile.am
diff --git a/swisssurfer/doc/screenshot.png b/doc/screenshot.png
similarity index 100%
rename from swisssurfer/doc/screenshot.png
rename to doc/screenshot.png
diff --git a/swisssurfer/makefile.am b/makefile.am
similarity index 100%
rename from swisssurfer/makefile.am
rename to makefile.am
diff --git a/swisssurfer/src/Info.plist b/src/Info.plist
similarity index 100%
rename from swisssurfer/src/Info.plist
rename to src/Info.plist
diff --git a/swisssurfer/src/authentication.hxx b/src/authentication.hxx
similarity index 100%
rename from swisssurfer/src/authentication.hxx
rename to src/authentication.hxx
diff --git a/swisssurfer/src/authentication.ui b/src/authentication.ui
similarity index 100%
rename from swisssurfer/src/authentication.ui
rename to src/authentication.ui
diff --git a/swisssurfer/src/browser.hxx b/src/browser.hxx
similarity index 100%
rename from swisssurfer/src/browser.hxx
rename to src/browser.hxx
diff --git a/swisssurfer/src/browser.ui b/src/browser.ui
similarity index 100%
rename from swisssurfer/src/browser.ui
rename to src/browser.ui
diff --git a/swisssurfer/src/certificate.hxx b/src/certificate.hxx
similarity index 100%
rename from swisssurfer/src/certificate.hxx
rename to src/certificate.hxx
diff --git a/swisssurfer/src/certificate.ui b/src/certificate.ui
similarity index 100%
rename from swisssurfer/src/certificate.ui
rename to src/certificate.ui
diff --git a/swisssurfer/src/downloadmanager.hxx b/src/downloadmanager.hxx
similarity index 100%
rename from swisssurfer/src/downloadmanager.hxx
rename to src/downloadmanager.hxx
diff --git a/swisssurfer/src/editbookmarks.hxx b/src/editbookmarks.hxx
similarity index 100%
rename from swisssurfer/src/editbookmarks.hxx
rename to src/editbookmarks.hxx
diff --git a/swisssurfer/src/editbookmarks.ui b/src/editbookmarks.ui
similarity index 100%
rename from swisssurfer/src/editbookmarks.ui
rename to src/editbookmarks.ui
diff --git a/swisssurfer/src/errorlog.hxx b/src/errorlog.hxx
similarity index 100%
rename from swisssurfer/src/errorlog.hxx
rename to src/errorlog.hxx
diff --git a/swisssurfer/src/errorlog.ui b/src/errorlog.ui
similarity index 100%
rename from swisssurfer/src/errorlog.ui
rename to src/errorlog.ui
diff --git a/swisssurfer/src/languages.qrc.in b/src/languages.qrc.in
similarity index 100%
rename from swisssurfer/src/languages.qrc.in
rename to src/languages.qrc.in
diff --git a/swisssurfer/src/logincertificate.hxx b/src/logincertificate.hxx
similarity index 100%
rename from swisssurfer/src/logincertificate.hxx
rename to src/logincertificate.hxx
diff --git a/swisssurfer/src/logincertificate.ui b/src/logincertificate.ui
similarity index 100%
rename from swisssurfer/src/logincertificate.ui
rename to src/logincertificate.ui
diff --git a/swisssurfer/src/main.cxx b/src/main.cxx
similarity index 100%
rename from swisssurfer/src/main.cxx
rename to src/main.cxx
diff --git a/swisssurfer/src/makefile.am b/src/makefile.am
similarity index 100%
rename from swisssurfer/src/makefile.am
rename to src/makefile.am
diff --git a/swisssurfer/src/pdfdisplay.hpp b/src/pdfdisplay.hpp
similarity index 100%
rename from swisssurfer/src/pdfdisplay.hpp
rename to src/pdfdisplay.hpp
diff --git a/swisssurfer/src/pinentry.hxx b/src/pinentry.hxx
similarity index 100%
rename from swisssurfer/src/pinentry.hxx
rename to src/pinentry.hxx
diff --git a/swisssurfer/src/pinentry.ui b/src/pinentry.ui
similarity index 100%
rename from swisssurfer/src/pinentry.ui
rename to src/pinentry.ui
diff --git a/swisssurfer/src/pluginfactory.hxx b/src/pluginfactory.hxx
similarity index 100%
rename from swisssurfer/src/pluginfactory.hxx
rename to src/pluginfactory.hxx
diff --git a/swisssurfer/src/qmake.pro.in b/src/qmake.pro.in
similarity index 100%
rename from swisssurfer/src/qmake.pro.in
rename to src/qmake.pro.in
diff --git a/swisssurfer/src/resources.qrc b/src/resources.qrc
similarity index 100%
rename from swisssurfer/src/resources.qrc
rename to src/resources.qrc
diff --git a/swisssurfer/src/resources/icons/about.png b/src/resources/icons/about.png
similarity index 100%
rename from swisssurfer/src/resources/icons/about.png
rename to src/resources/icons/about.png
diff --git a/swisssurfer/src/resources/icons/about.svg b/src/resources/icons/about.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/about.svg
rename to src/resources/icons/about.svg
diff --git a/swisssurfer/src/resources/icons/addbookmark.png b/src/resources/icons/addbookmark.png
similarity index 100%
rename from swisssurfer/src/resources/icons/addbookmark.png
rename to src/resources/icons/addbookmark.png
diff --git a/swisssurfer/src/resources/icons/addbookmark.svg b/src/resources/icons/addbookmark.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/addbookmark.svg
rename to src/resources/icons/addbookmark.svg
diff --git a/swisssurfer/src/resources/icons/back.png b/src/resources/icons/back.png
similarity index 100%
rename from swisssurfer/src/resources/icons/back.png
rename to src/resources/icons/back.png
diff --git a/swisssurfer/src/resources/icons/clearlocation.png b/src/resources/icons/clearlocation.png
similarity index 100%
rename from swisssurfer/src/resources/icons/clearlocation.png
rename to src/resources/icons/clearlocation.png
diff --git a/swisssurfer/src/resources/icons/clearlocation.svg b/src/resources/icons/clearlocation.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/clearlocation.svg
rename to src/resources/icons/clearlocation.svg
diff --git a/swisssurfer/src/resources/icons/close.png b/src/resources/icons/close.png
similarity index 100%
rename from swisssurfer/src/resources/icons/close.png
rename to src/resources/icons/close.png
diff --git a/swisssurfer/src/resources/icons/close.svg b/src/resources/icons/close.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/close.svg
rename to src/resources/icons/close.svg
diff --git a/swisssurfer/src/resources/icons/error.png b/src/resources/icons/error.png
similarity index 100%
rename from swisssurfer/src/resources/icons/error.png
rename to src/resources/icons/error.png
diff --git a/swisssurfer/src/resources/icons/error.svg b/src/resources/icons/error.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/error.svg
rename to src/resources/icons/error.svg
diff --git a/swisssurfer/src/resources/icons/find.png b/src/resources/icons/find.png
similarity index 100%
rename from swisssurfer/src/resources/icons/find.png
rename to src/resources/icons/find.png
diff --git a/swisssurfer/src/resources/icons/find.svg b/src/resources/icons/find.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/find.svg
rename to src/resources/icons/find.svg
diff --git a/swisssurfer/src/resources/icons/forward.png b/src/resources/icons/forward.png
similarity index 100%
rename from swisssurfer/src/resources/icons/forward.png
rename to src/resources/icons/forward.png
diff --git a/swisssurfer/src/resources/icons/gg.png b/src/resources/icons/gg.png
similarity index 100%
rename from swisssurfer/src/resources/icons/gg.png
rename to src/resources/icons/gg.png
diff --git a/swisssurfer/src/resources/icons/gohome.png b/src/resources/icons/gohome.png
similarity index 100%
rename from swisssurfer/src/resources/icons/gohome.png
rename to src/resources/icons/gohome.png
diff --git a/swisssurfer/src/resources/icons/newtab.png b/src/resources/icons/newtab.png
similarity index 100%
rename from swisssurfer/src/resources/icons/newtab.png
rename to src/resources/icons/newtab.png
diff --git a/swisssurfer/src/resources/icons/newtab.svg b/src/resources/icons/newtab.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/newtab.svg
rename to src/resources/icons/newtab.svg
diff --git a/swisssurfer/src/resources/icons/newwindow.png b/src/resources/icons/newwindow.png
similarity index 100%
rename from swisssurfer/src/resources/icons/newwindow.png
rename to src/resources/icons/newwindow.png
diff --git a/swisssurfer/src/resources/icons/newwindow.svg b/src/resources/icons/newwindow.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/newwindow.svg
rename to src/resources/icons/newwindow.svg
diff --git a/swisssurfer/src/resources/icons/print.png b/src/resources/icons/print.png
similarity index 100%
rename from swisssurfer/src/resources/icons/print.png
rename to src/resources/icons/print.png
diff --git a/swisssurfer/src/resources/icons/print.svg b/src/resources/icons/print.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/print.svg
rename to src/resources/icons/print.svg
diff --git a/swisssurfer/src/resources/icons/printpreview.png b/src/resources/icons/printpreview.png
similarity index 100%
rename from swisssurfer/src/resources/icons/printpreview.png
rename to src/resources/icons/printpreview.png
diff --git a/swisssurfer/src/resources/icons/printpreview.svg b/src/resources/icons/printpreview.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/printpreview.svg
rename to src/resources/icons/printpreview.svg
diff --git a/swisssurfer/src/resources/icons/reload.png b/src/resources/icons/reload.png
similarity index 100%
rename from swisssurfer/src/resources/icons/reload.png
rename to src/resources/icons/reload.png
diff --git a/swisssurfer/src/resources/icons/settings.png b/src/resources/icons/settings.png
similarity index 100%
rename from swisssurfer/src/resources/icons/settings.png
rename to src/resources/icons/settings.png
diff --git a/swisssurfer/src/resources/icons/settings.svg b/src/resources/icons/settings.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/settings.svg
rename to src/resources/icons/settings.svg
diff --git a/swisssurfer/src/resources/icons/source b/src/resources/icons/source
similarity index 100%
rename from swisssurfer/src/resources/icons/source
rename to src/resources/icons/source
diff --git a/swisssurfer/src/resources/icons/stop.png b/src/resources/icons/stop.png
similarity index 100%
rename from swisssurfer/src/resources/icons/stop.png
rename to src/resources/icons/stop.png
diff --git a/swisssurfer/src/resources/icons/swisssurfer_32x32x32.png b/src/resources/icons/swisssurfer_32x32x32.png
similarity index 100%
rename from swisssurfer/src/resources/icons/swisssurfer_32x32x32.png
rename to src/resources/icons/swisssurfer_32x32x32.png
diff --git a/swisssurfer/src/resources/icons/tel.png b/src/resources/icons/tel.png
similarity index 100%
rename from swisssurfer/src/resources/icons/tel.png
rename to src/resources/icons/tel.png
diff --git a/swisssurfer/src/resources/icons/up.png b/src/resources/icons/up.png
similarity index 100%
rename from swisssurfer/src/resources/icons/up.png
rename to src/resources/icons/up.png
diff --git a/swisssurfer/src/resources/icons/usercert.png b/src/resources/icons/usercert.png
similarity index 100%
rename from swisssurfer/src/resources/icons/usercert.png
rename to src/resources/icons/usercert.png
diff --git a/swisssurfer/src/resources/icons/usercert.svg b/src/resources/icons/usercert.svg
similarity index 100%
rename from swisssurfer/src/resources/icons/usercert.svg
rename to src/resources/icons/usercert.svg
diff --git a/swisssurfer/src/resources/icons/wp.png b/src/resources/icons/wp.png
similarity index 100%
rename from swisssurfer/src/resources/icons/wp.png
rename to src/resources/icons/wp.png
diff --git a/swisssurfer/src/saveorrun.hxx b/src/saveorrun.hxx
similarity index 100%
rename from swisssurfer/src/saveorrun.hxx
rename to src/saveorrun.hxx
diff --git a/swisssurfer/src/saveorrun.ui b/src/saveorrun.ui
similarity index 100%
rename from swisssurfer/src/saveorrun.ui
rename to src/saveorrun.ui
diff --git a/swisssurfer/src/settings.hxx b/src/settings.hxx
similarity index 100%
rename from swisssurfer/src/settings.hxx
rename to src/settings.hxx
diff --git a/swisssurfer/src/settings.ui b/src/settings.ui
similarity index 100%
rename from swisssurfer/src/settings.ui
rename to src/settings.ui
diff --git a/swisssurfer/src/smartcardauth.hxx b/src/smartcardauth.hxx
similarity index 100%
rename from swisssurfer/src/smartcardauth.hxx
rename to src/smartcardauth.hxx
diff --git a/swisssurfer/src/sslclientnetworkmanager.hxx b/src/sslclientnetworkmanager.hxx
similarity index 100%
rename from swisssurfer/src/sslclientnetworkmanager.hxx
rename to src/sslclientnetworkmanager.hxx
diff --git a/swisssurfer/src/swisssurfer.icns b/src/swisssurfer.icns
similarity index 100%
rename from swisssurfer/src/swisssurfer.icns
rename to src/swisssurfer.icns
diff --git a/swisssurfer/src/swisssurfer_de.ts b/src/swisssurfer_de.ts
similarity index 100%
rename from swisssurfer/src/swisssurfer_de.ts
rename to src/swisssurfer_de.ts
diff --git a/swisssurfer/src/swisssurfer_en.ts b/src/swisssurfer_en.ts
similarity index 100%
rename from swisssurfer/src/swisssurfer_en.ts
rename to src/swisssurfer_en.ts
diff --git a/swisssurfer/src/swisssurfer_fr.ts b/src/swisssurfer_fr.ts
similarity index 100%
rename from swisssurfer/src/swisssurfer_fr.ts
rename to src/swisssurfer_fr.ts
diff --git a/swisssurfer/src/swisssurfer_it.ts b/src/swisssurfer_it.ts
similarity index 100%
rename from swisssurfer/src/swisssurfer_it.ts
rename to src/swisssurfer_it.ts
diff --git a/swisssurfer/src/temporaryfile.hxx b/src/temporaryfile.hxx
similarity index 100%
rename from swisssurfer/src/temporaryfile.hxx
rename to src/temporaryfile.hxx
diff --git a/swisssurfer/src/webpage.cxx b/src/webpage.cxx
similarity index 100%
rename from swisssurfer/src/webpage.cxx
rename to src/webpage.cxx
diff --git a/swisssurfer/src/webpage.hxx b/src/webpage.hxx
similarity index 100%
rename from swisssurfer/src/webpage.hxx
rename to src/webpage.hxx