diff --git a/www.i2p2/i2p2www/__init__.py b/i2p2www/__init__.py
similarity index 100%
rename from www.i2p2/i2p2www/__init__.py
rename to i2p2www/__init__.py
diff --git a/www.i2p2/i2p2www/blog/2006/10/10/status.html b/i2p2www/blog/2006/10/10/status.html
similarity index 100%
rename from www.i2p2/i2p2www/blog/2006/10/10/status.html
rename to i2p2www/blog/2006/10/10/status.html
diff --git a/www.i2p2/i2p2www/blog/2006/10/10/status.rst b/i2p2www/blog/2006/10/10/status.rst
similarity index 100%
rename from www.i2p2/i2p2www/blog/2006/10/10/status.rst
rename to i2p2www/blog/2006/10/10/status.rst
diff --git a/www.i2p2/i2p2www/meetings/208.log b/i2p2www/meetings/208.log
similarity index 100%
rename from www.i2p2/i2p2www/meetings/208.log
rename to i2p2www/meetings/208.log
diff --git a/www.i2p2/i2p2www/pages/blog/index.html b/i2p2www/pages/blog/index.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/blog/index.html
rename to i2p2www/pages/blog/index.html
diff --git a/www.i2p2/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/downloads/list.html
rename to i2p2www/pages/downloads/list.html
diff --git a/www.i2p2/i2p2www/pages/global/error_404.html b/i2p2www/pages/global/error_404.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/error_404.html
rename to i2p2www/pages/global/error_404.html
diff --git a/www.i2p2/i2p2www/pages/global/error_500.html b/i2p2www/pages/global/error_500.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/error_500.html
rename to i2p2www/pages/global/error_500.html
diff --git a/www.i2p2/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/footer.html
rename to i2p2www/pages/global/footer.html
diff --git a/www.i2p2/i2p2www/pages/global/lang.html b/i2p2www/pages/global/lang.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/lang.html
rename to i2p2www/pages/global/lang.html
diff --git a/www.i2p2/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/layout.html
rename to i2p2www/pages/global/layout.html
diff --git a/www.i2p2/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/nav.html
rename to i2p2www/pages/global/nav.html
diff --git a/www.i2p2/i2p2www/pages/global/urlify b/i2p2www/pages/global/urlify
similarity index 100%
rename from www.i2p2/i2p2www/pages/global/urlify
rename to i2p2www/pages/global/urlify
diff --git a/www.i2p2/i2p2www/pages/meetings/index.html b/i2p2www/pages/meetings/index.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/meetings/index.html
rename to i2p2www/pages/meetings/index.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/cryptography.html b/i2p2www/pages/site/docs/how/cryptography.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/cryptography.html
rename to i2p2www/pages/site/docs/how/cryptography.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/elgamalaes.html b/i2p2www/pages/site/docs/how/elgamalaes.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/elgamalaes.html
rename to i2p2www/pages/site/docs/how/elgamalaes.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/garlicrouting.html b/i2p2www/pages/site/docs/how/garlicrouting.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/garlicrouting.html
rename to i2p2www/pages/site/docs/how/garlicrouting.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/index.html b/i2p2www/pages/site/docs/how/index.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/index.html
rename to i2p2www/pages/site/docs/how/index.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/intro.html b/i2p2www/pages/site/docs/how/intro.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/intro.html
rename to i2p2www/pages/site/docs/how/intro.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/networkcomparisons.html b/i2p2www/pages/site/docs/how/networkcomparisons.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/networkcomparisons.html
rename to i2p2www/pages/site/docs/how/networkcomparisons.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/networkdatabase.html b/i2p2www/pages/site/docs/how/networkdatabase.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/networkdatabase.html
rename to i2p2www/pages/site/docs/how/networkdatabase.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/peerselection.html b/i2p2www/pages/site/docs/how/peerselection.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/peerselection.html
rename to i2p2www/pages/site/docs/how/peerselection.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/threatmodel.html b/i2p2www/pages/site/docs/how/threatmodel.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/threatmodel.html
rename to i2p2www/pages/site/docs/how/threatmodel.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/how/tunnelrouting.html b/i2p2www/pages/site/docs/how/tunnelrouting.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/how/tunnelrouting.html
rename to i2p2www/pages/site/docs/how/tunnelrouting.html
diff --git a/www.i2p2/i2p2www/pages/site/docs/techintro.html b/i2p2www/pages/site/docs/techintro.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/docs/techintro.html
rename to i2p2www/pages/site/docs/techintro.html
diff --git a/www.i2p2/i2p2www/pages/site/index.html b/i2p2www/pages/site/index.html
similarity index 100%
rename from www.i2p2/i2p2www/pages/site/index.html
rename to i2p2www/pages/site/index.html
diff --git a/www.i2p2/i2p2www/static/favicon.ico b/i2p2www/static/favicon.ico
similarity index 100%
rename from www.i2p2/i2p2www/static/favicon.ico
rename to i2p2www/static/favicon.ico
diff --git a/www.i2p2/i2p2www/static/images/I2PTunnel-streamr.png b/i2p2www/static/images/I2PTunnel-streamr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/I2PTunnel-streamr.png
rename to i2p2www/static/images/I2PTunnel-streamr.png
diff --git a/www.i2p2/i2p2www/static/images/add-key-terminal.png b/i2p2www/static/images/add-key-terminal.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/add-key-terminal.png
rename to i2p2www/static/images/add-key-terminal.png
diff --git a/www.i2p2/i2p2www/static/images/ar.png b/i2p2www/static/images/ar.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ar.png
rename to i2p2www/static/images/ar.png
diff --git a/www.i2p2/i2p2www/static/images/bandwidth2009.png b/i2p2www/static/images/bandwidth2009.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/bandwidth2009.png
rename to i2p2www/static/images/bandwidth2009.png
diff --git a/www.i2p2/i2p2www/static/images/btn_left.png b/i2p2www/static/images/btn_left.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/btn_left.png
rename to i2p2www/static/images/btn_left.png
diff --git a/www.i2p2/i2p2www/static/images/btn_right.png b/i2p2www/static/images/btn_right.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/btn_right.png
rename to i2p2www/static/images/btn_right.png
diff --git a/www.i2p2/i2p2www/static/images/btn_stretch.png b/i2p2www/static/images/btn_stretch.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/btn_stretch.png
rename to i2p2www/static/images/btn_stretch.png
diff --git a/www.i2p2/i2p2www/static/images/cs.png b/i2p2www/static/images/cs.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/cs.png
rename to i2p2www/static/images/cs.png
diff --git a/www.i2p2/i2p2www/static/images/cz.png b/i2p2www/static/images/cz.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/cz.png
rename to i2p2www/static/images/cz.png
diff --git a/www.i2p2/i2p2www/static/images/dark.png b/i2p2www/static/images/dark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/dark.png
rename to i2p2www/static/images/dark.png
diff --git a/www.i2p2/i2p2www/static/images/darkbluebg.png b/i2p2www/static/images/darkbluebg.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/darkbluebg.png
rename to i2p2www/static/images/darkbluebg.png
diff --git a/www.i2p2/i2p2www/static/images/darkbluetile.png b/i2p2www/static/images/darkbluetile.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/darkbluetile.png
rename to i2p2www/static/images/darkbluetile.png
diff --git a/www.i2p2/i2p2www/static/images/darkerbluetile.png b/i2p2www/static/images/darkerbluetile.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/darkerbluetile.png
rename to i2p2www/static/images/darkerbluetile.png
diff --git a/www.i2p2/i2p2www/static/images/de.png b/i2p2www/static/images/de.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/de.png
rename to i2p2www/static/images/de.png
diff --git a/www.i2p2/i2p2www/static/images/dots.png b/i2p2www/static/images/dots.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/dots.png
rename to i2p2www/static/images/dots.png
diff --git a/www.i2p2/i2p2www/static/images/download.png b/i2p2www/static/images/download.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/download.png
rename to i2p2www/static/images/download.png
diff --git a/www.i2p2/i2p2www/static/images/download_dark.png b/i2p2www/static/images/download_dark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/download_dark.png
rename to i2p2www/static/images/download_dark.png
diff --git a/www.i2p2/i2p2www/static/images/endToEndEncryption.png b/i2p2www/static/images/endToEndEncryption.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/endToEndEncryption.png
rename to i2p2www/static/images/endToEndEncryption.png
diff --git a/www.i2p2/i2p2www/static/images/endToEndEncryption_fr.png b/i2p2www/static/images/endToEndEncryption_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/endToEndEncryption_fr.png
rename to i2p2www/static/images/endToEndEncryption_fr.png
diff --git a/www.i2p2/i2p2www/static/images/endToEndEncryption_zh.png b/i2p2www/static/images/endToEndEncryption_zh.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/endToEndEncryption_zh.png
rename to i2p2www/static/images/endToEndEncryption_zh.png
diff --git a/www.i2p2/i2p2www/static/images/es.png b/i2p2www/static/images/es.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/es.png
rename to i2p2www/static/images/es.png
diff --git a/www.i2p2/i2p2www/static/images/eu.png b/i2p2www/static/images/eu.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/eu.png
rename to i2p2www/static/images/eu.png
diff --git a/www.i2p2/i2p2www/static/images/firefox.options.jpg b/i2p2www/static/images/firefox.options.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/firefox.options.jpg
rename to i2p2www/static/images/firefox.options.jpg
diff --git a/www.i2p2/i2p2www/static/images/firefox.options_fr.png b/i2p2www/static/images/firefox.options_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/firefox.options_fr.png
rename to i2p2www/static/images/firefox.options_fr.png
diff --git a/www.i2p2/i2p2www/static/images/firefox.proxyports.jpg b/i2p2www/static/images/firefox.proxyports.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/firefox.proxyports.jpg
rename to i2p2www/static/images/firefox.proxyports.jpg
diff --git a/www.i2p2/i2p2www/static/images/firefox.proxyports_fr.png b/i2p2www/static/images/firefox.proxyports_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/firefox.proxyports_fr.png
rename to i2p2www/static/images/firefox.proxyports_fr.png
diff --git a/www.i2p2/i2p2www/static/images/fr.png b/i2p2www/static/images/fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/fr.png
rename to i2p2www/static/images/fr.png
diff --git a/www.i2p2/i2p2www/static/images/garliccloves.png b/i2p2www/static/images/garliccloves.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/garliccloves.png
rename to i2p2www/static/images/garliccloves.png
diff --git a/www.i2p2/i2p2www/static/images/help.png b/i2p2www/static/images/help.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/help.png
rename to i2p2www/static/images/help.png
diff --git a/www.i2p2/i2p2www/static/images/help_dark.png b/i2p2www/static/images/help_dark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/help_dark.png
rename to i2p2www/static/images/help_dark.png
diff --git a/www.i2p2/i2p2www/static/images/i2plogo.png b/i2p2www/static/images/i2plogo.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/i2plogo.png
rename to i2p2www/static/images/i2plogo.png
diff --git a/www.i2p2/i2p2www/static/images/i2ptunnel_peertopeer.png b/i2p2www/static/images/i2ptunnel_peertopeer.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/i2ptunnel_peertopeer.png
rename to i2p2www/static/images/i2ptunnel_peertopeer.png
diff --git a/www.i2p2/i2p2www/static/images/i2ptunnel_serverclient.png b/i2p2www/static/images/i2ptunnel_serverclient.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/i2ptunnel_serverclient.png
rename to i2p2www/static/images/i2ptunnel_serverclient.png
diff --git a/www.i2p2/i2p2www/static/images/i2pvstor_zh.png b/i2p2www/static/images/i2pvstor_zh.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/i2pvstor_zh.png
rename to i2p2www/static/images/i2pvstor_zh.png
diff --git a/www.i2p2/i2p2www/static/images/ie.options.jpg b/i2p2www/static/images/ie.options.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ie.options.jpg
rename to i2p2www/static/images/ie.options.jpg
diff --git a/www.i2p2/i2p2www/static/images/ie.options_fr.png b/i2p2www/static/images/ie.options_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ie.options_fr.png
rename to i2p2www/static/images/ie.options_fr.png
diff --git a/www.i2p2/i2p2www/static/images/ie.proxyports.jpg b/i2p2www/static/images/ie.proxyports.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ie.proxyports.jpg
rename to i2p2www/static/images/ie.proxyports.jpg
diff --git a/www.i2p2/i2p2www/static/images/ie.proxyports_fr.png b/i2p2www/static/images/ie.proxyports_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ie.proxyports_fr.png
rename to i2p2www/static/images/ie.proxyports_fr.png
diff --git a/www.i2p2/i2p2www/static/images/info.png b/i2p2www/static/images/info.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/info.png
rename to i2p2www/static/images/info.png
diff --git a/www.i2p2/i2p2www/static/images/info_dark.png b/i2p2www/static/images/info_dark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/info_dark.png
rename to i2p2www/static/images/info_dark.png
diff --git a/www.i2p2/i2p2www/static/images/it.png b/i2p2www/static/images/it.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/it.png
rename to i2p2www/static/images/it.png
diff --git a/www.i2p2/i2p2www/static/images/itoopie.png b/i2p2www/static/images/itoopie.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/itoopie.png
rename to i2p2www/static/images/itoopie.png
diff --git a/www.i2p2/i2p2www/static/images/konqueror.options.jpg b/i2p2www/static/images/konqueror.options.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/konqueror.options.jpg
rename to i2p2www/static/images/konqueror.options.jpg
diff --git a/www.i2p2/i2p2www/static/images/konqueror.options_fr.jpg b/i2p2www/static/images/konqueror.options_fr.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/konqueror.options_fr.jpg
rename to i2p2www/static/images/konqueror.options_fr.jpg
diff --git a/www.i2p2/i2p2www/static/images/konqueror.proxyports.jpg b/i2p2www/static/images/konqueror.proxyports.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/konqueror.proxyports.jpg
rename to i2p2www/static/images/konqueror.proxyports.jpg
diff --git a/www.i2p2/i2p2www/static/images/konqueror.proxyports_fr.jpg b/i2p2www/static/images/konqueror.proxyports_fr.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/konqueror.proxyports_fr.jpg
rename to i2p2www/static/images/konqueror.proxyports_fr.jpg
diff --git a/www.i2p2/i2p2www/static/images/lang_ar.png b/i2p2www/static/images/lang_ar.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/lang_ar.png
rename to i2p2www/static/images/lang_ar.png
diff --git a/www.i2p2/i2p2www/static/images/light.png b/i2p2www/static/images/light.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/light.png
rename to i2p2www/static/images/light.png
diff --git a/www.i2p2/i2p2www/static/images/lightbluetile.png b/i2p2www/static/images/lightbluetile.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/lightbluetile.png
rename to i2p2www/static/images/lightbluetile.png
diff --git a/www.i2p2/i2p2www/static/images/link.png b/i2p2www/static/images/link.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/link.png
rename to i2p2www/static/images/link.png
diff --git a/www.i2p2/i2p2www/static/images/link_dark.png b/i2p2www/static/images/link_dark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/link_dark.png
rename to i2p2www/static/images/link_dark.png
diff --git a/www.i2p2/i2p2www/static/images/logo07c.jpg b/i2p2www/static/images/logo07c.jpg
similarity index 100%
rename from www.i2p2/i2p2www/static/images/logo07c.jpg
rename to i2p2www/static/images/logo07c.jpg
diff --git a/www.i2p2/i2p2www/static/images/logo_medium.png b/i2p2www/static/images/logo_medium.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/logo_medium.png
rename to i2p2www/static/images/logo_medium.png
diff --git a/www.i2p2/i2p2www/static/images/net.png b/i2p2www/static/images/net.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/net.png
rename to i2p2www/static/images/net.png
diff --git a/www.i2p2/i2p2www/static/images/net_fr.png b/i2p2www/static/images/net_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/net_fr.png
rename to i2p2www/static/images/net_fr.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_leaseset.png b/i2p2www/static/images/netdb_get_leaseset.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_leaseset.png
rename to i2p2www/static/images/netdb_get_leaseset.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_leaseset_fr.png b/i2p2www/static/images/netdb_get_leaseset_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_leaseset_fr.png
rename to i2p2www/static/images/netdb_get_leaseset_fr.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_routerinfo_1.png b/i2p2www/static/images/netdb_get_routerinfo_1.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_routerinfo_1.png
rename to i2p2www/static/images/netdb_get_routerinfo_1.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_routerinfo_1_fr.png b/i2p2www/static/images/netdb_get_routerinfo_1_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_routerinfo_1_fr.png
rename to i2p2www/static/images/netdb_get_routerinfo_1_fr.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_routerinfo_2.png b/i2p2www/static/images/netdb_get_routerinfo_2.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_routerinfo_2.png
rename to i2p2www/static/images/netdb_get_routerinfo_2.png
diff --git a/www.i2p2/i2p2www/static/images/netdb_get_routerinfo_2_fr.png b/i2p2www/static/images/netdb_get_routerinfo_2_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/netdb_get_routerinfo_2_fr.png
rename to i2p2www/static/images/netdb_get_routerinfo_2_fr.png
diff --git a/www.i2p2/i2p2www/static/images/nl.png b/i2p2www/static/images/nl.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/nl.png
rename to i2p2www/static/images/nl.png
diff --git a/www.i2p2/i2p2www/static/images/plan.png b/i2p2www/static/images/plan.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/plan.png
rename to i2p2www/static/images/plan.png
diff --git a/www.i2p2/i2p2www/static/images/protocol_stack.png b/i2p2www/static/images/protocol_stack.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/protocol_stack.png
rename to i2p2www/static/images/protocol_stack.png
diff --git a/www.i2p2/i2p2www/static/images/protocol_stack_fr.png b/i2p2www/static/images/protocol_stack_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/protocol_stack_fr.png
rename to i2p2www/static/images/protocol_stack_fr.png
diff --git a/www.i2p2/i2p2www/static/images/ru.png b/i2p2www/static/images/ru.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/ru.png
rename to i2p2www/static/images/ru.png
diff --git a/www.i2p2/i2p2www/static/images/sqbullet.png b/i2p2www/static/images/sqbullet.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/sqbullet.png
rename to i2p2www/static/images/sqbullet.png
diff --git a/www.i2p2/i2p2www/static/images/stackoverflow_ad.png b/i2p2www/static/images/stackoverflow_ad.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/stackoverflow_ad.png
rename to i2p2www/static/images/stackoverflow_ad.png
diff --git a/www.i2p2/i2p2www/static/images/sv.png b/i2p2www/static/images/sv.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/sv.png
rename to i2p2www/static/images/sv.png
diff --git a/www.i2p2/i2p2www/static/images/tabletile.png b/i2p2www/static/images/tabletile.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tabletile.png
rename to i2p2www/static/images/tabletile.png
diff --git a/www.i2p2/i2p2www/static/images/tabletile_alt.png b/i2p2www/static/images/tabletile_alt.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tabletile_alt.png
rename to i2p2www/static/images/tabletile_alt.png
diff --git a/www.i2p2/i2p2www/static/images/tabletitledark.png b/i2p2www/static/images/tabletitledark.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tabletitledark.png
rename to i2p2www/static/images/tabletitledark.png
diff --git a/www.i2p2/i2p2www/static/images/tabletitlelight-tall.png b/i2p2www/static/images/tabletitlelight-tall.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tabletitlelight-tall.png
rename to i2p2www/static/images/tabletitlelight-tall.png
diff --git a/www.i2p2/i2p2www/static/images/tabletitlelight.png b/i2p2www/static/images/tabletitlelight.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tabletitlelight.png
rename to i2p2www/static/images/tabletitlelight.png
diff --git a/www.i2p2/i2p2www/static/images/target.png b/i2p2www/static/images/target.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/target.png
rename to i2p2www/static/images/target.png
diff --git a/www.i2p2/i2p2www/static/images/tunnelSending.png b/i2p2www/static/images/tunnelSending.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tunnelSending.png
rename to i2p2www/static/images/tunnelSending.png
diff --git a/www.i2p2/i2p2www/static/images/tunnels.png b/i2p2www/static/images/tunnels.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tunnels.png
rename to i2p2www/static/images/tunnels.png
diff --git a/www.i2p2/i2p2www/static/images/tunnels_fr.png b/i2p2www/static/images/tunnels_fr.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/tunnels_fr.png
rename to i2p2www/static/images/tunnels_fr.png
diff --git a/www.i2p2/i2p2www/static/images/udp.png b/i2p2www/static/images/udp.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/udp.png
rename to i2p2www/static/images/udp.png
diff --git a/www.i2p2/i2p2www/static/images/us.png b/i2p2www/static/images/us.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/us.png
rename to i2p2www/static/images/us.png
diff --git a/www.i2p2/i2p2www/static/images/zh.png b/i2p2www/static/images/zh.png
similarity index 100%
rename from www.i2p2/i2p2www/static/images/zh.png
rename to i2p2www/static/images/zh.png
diff --git a/www.i2p2/i2p2www/static/news/news.xml b/i2p2www/static/news/news.xml
similarity index 100%
rename from www.i2p2/i2p2www/static/news/news.xml
rename to i2p2www/static/news/news.xml
diff --git a/www.i2p2/i2p2www/static/pdf/I2CP_spec.pdf b/i2p2www/static/pdf/I2CP_spec.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/I2CP_spec.pdf
rename to i2p2www/static/pdf/I2CP_spec.pdf
diff --git a/www.i2p2/i2p2www/static/pdf/I2NP_spec.pdf b/i2p2www/static/pdf/I2NP_spec.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/I2NP_spec.pdf
rename to i2p2www/static/pdf/I2NP_spec.pdf
diff --git a/www.i2p2/i2p2www/static/pdf/I2P-PET-CON-2009.1.pdf b/i2p2www/static/pdf/I2P-PET-CON-2009.1.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/I2P-PET-CON-2009.1.pdf
rename to i2p2www/static/pdf/I2P-PET-CON-2009.1.pdf
diff --git a/www.i2p2/i2p2www/static/pdf/datastructures.pdf b/i2p2www/static/pdf/datastructures.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/datastructures.pdf
rename to i2p2www/static/pdf/datastructures.pdf
diff --git a/www.i2p2/i2p2www/static/pdf/i2p_philosophy.pdf b/i2p2www/static/pdf/i2p_philosophy.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/i2p_philosophy.pdf
rename to i2p2www/static/pdf/i2p_philosophy.pdf
diff --git a/www.i2p2/i2p2www/static/pdf/polling_http_transport.pdf b/i2p2www/static/pdf/polling_http_transport.pdf
similarity index 100%
rename from www.i2p2/i2p2www/static/pdf/polling_http_transport.pdf
rename to i2p2www/static/pdf/polling_http_transport.pdf
diff --git a/www.i2p2/i2p2www/static/styles/dark.css b/i2p2www/static/styles/dark.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/dark.css
rename to i2p2www/static/styles/dark.css
diff --git a/www.i2p2/i2p2www/static/styles/default.css b/i2p2www/static/styles/default.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/default.css
rename to i2p2www/static/styles/default.css
diff --git a/www.i2p2/i2p2www/static/styles/duck.css b/i2p2www/static/styles/duck.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/duck.css
rename to i2p2www/static/styles/duck.css
diff --git a/www.i2p2/i2p2www/static/styles/light.css b/i2p2www/static/styles/light.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/light.css
rename to i2p2www/static/styles/light.css
diff --git a/www.i2p2/i2p2www/static/styles/light_ar.css b/i2p2www/static/styles/light_ar.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/light_ar.css
rename to i2p2www/static/styles/light_ar.css
diff --git a/www.i2p2/i2p2www/static/styles/light_zh.css b/i2p2www/static/styles/light_zh.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/light_zh.css
rename to i2p2www/static/styles/light_zh.css
diff --git a/www.i2p2/i2p2www/static/styles/mainmenu.css b/i2p2www/static/styles/mainmenu.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/mainmenu.css
rename to i2p2www/static/styles/mainmenu.css
diff --git a/www.i2p2/i2p2www/static/styles/reset.css b/i2p2www/static/styles/reset.css
similarity index 100%
rename from www.i2p2/i2p2www/static/styles/reset.css
rename to i2p2www/static/styles/reset.css
diff --git a/www.i2p2/runserver.py b/runserver.py
similarity index 100%
rename from www.i2p2/runserver.py
rename to runserver.py