diff --git a/config.default.inc.php b/data/config.default.inc.php
similarity index 100%
rename from config.default.inc.php
rename to data/config.default.inc.php
diff --git a/config.inc.php.dist b/data/config.inc.php.dist
similarity index 100%
rename from config.inc.php.dist
rename to data/config.inc.php.dist
diff --git a/locales/de_DE/LC_MESSAGES/messages.mo b/data/locales/de_DE/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/de_DE/LC_MESSAGES/messages.mo
rename to data/locales/de_DE/LC_MESSAGES/messages.mo
diff --git a/locales/de_DE/LC_MESSAGES/messages.po b/data/locales/de_DE/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/de_DE/LC_MESSAGES/messages.po
rename to data/locales/de_DE/LC_MESSAGES/messages.po
diff --git a/locales/dk_DK/LC_MESSAGES/messages.mo b/data/locales/dk_DK/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/dk_DK/LC_MESSAGES/messages.mo
rename to data/locales/dk_DK/LC_MESSAGES/messages.mo
diff --git a/locales/dk_DK/LC_MESSAGES/messages.po b/data/locales/dk_DK/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/dk_DK/LC_MESSAGES/messages.po
rename to data/locales/dk_DK/LC_MESSAGES/messages.po
diff --git a/locales/en_GB/LC_MESSAGES/messages.mo b/data/locales/en_GB/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/en_GB/LC_MESSAGES/messages.mo
rename to data/locales/en_GB/LC_MESSAGES/messages.mo
diff --git a/locales/en_GB/LC_MESSAGES/messages.po b/data/locales/en_GB/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/en_GB/LC_MESSAGES/messages.po
rename to data/locales/en_GB/LC_MESSAGES/messages.po
diff --git a/locales/es_ES/LC_MESSAGES/messages.mo b/data/locales/es_ES/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/es_ES/LC_MESSAGES/messages.mo
rename to data/locales/es_ES/LC_MESSAGES/messages.mo
diff --git a/locales/es_ES/LC_MESSAGES/messages.po b/data/locales/es_ES/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/es_ES/LC_MESSAGES/messages.po
rename to data/locales/es_ES/LC_MESSAGES/messages.po
diff --git a/locales/fr_CA/LC_MESSAGES/messages.mo b/data/locales/fr_CA/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/fr_CA/LC_MESSAGES/messages.mo
rename to data/locales/fr_CA/LC_MESSAGES/messages.mo
diff --git a/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/fr_CA/LC_MESSAGES/messages.po
rename to data/locales/fr_CA/LC_MESSAGES/messages.po
diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/data/locales/fr_FR/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/fr_FR/LC_MESSAGES/messages.mo
rename to data/locales/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/fr_FR/LC_MESSAGES/messages.po
rename to data/locales/fr_FR/LC_MESSAGES/messages.po
diff --git a/locales/hi_IN/LC_MESSAGES/messages.mo b/data/locales/hi_IN/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/hi_IN/LC_MESSAGES/messages.mo
rename to data/locales/hi_IN/LC_MESSAGES/messages.mo
diff --git a/locales/hi_IN/LC_MESSAGES/messages.po b/data/locales/hi_IN/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/hi_IN/LC_MESSAGES/messages.po
rename to data/locales/hi_IN/LC_MESSAGES/messages.po
diff --git a/locales/it_IT/LC_MESSAGES/messages.mo b/data/locales/it_IT/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/it_IT/LC_MESSAGES/messages.mo
rename to data/locales/it_IT/LC_MESSAGES/messages.mo
diff --git a/locales/it_IT/LC_MESSAGES/messages.po b/data/locales/it_IT/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/it_IT/LC_MESSAGES/messages.po
rename to data/locales/it_IT/LC_MESSAGES/messages.po
diff --git a/locales/ja_JP/LC_MESSAGES/messages.mo b/data/locales/ja_JP/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/ja_JP/LC_MESSAGES/messages.mo
rename to data/locales/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locales/ja_JP/LC_MESSAGES/messages.po b/data/locales/ja_JP/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/ja_JP/LC_MESSAGES/messages.po
rename to data/locales/ja_JP/LC_MESSAGES/messages.po
diff --git a/locales/lt_LT/LC_MESSAGES/messages.mo b/data/locales/lt_LT/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/lt_LT/LC_MESSAGES/messages.mo
rename to data/locales/lt_LT/LC_MESSAGES/messages.mo
diff --git a/locales/lt_LT/LC_MESSAGES/messages.po b/data/locales/lt_LT/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/lt_LT/LC_MESSAGES/messages.po
rename to data/locales/lt_LT/LC_MESSAGES/messages.po
diff --git a/locales/messages.po b/data/locales/messages.po
similarity index 100%
rename from locales/messages.po
rename to data/locales/messages.po
diff --git a/locales/nl_NL/LC_MESSAGES/messages.mo b/data/locales/nl_NL/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/nl_NL/LC_MESSAGES/messages.mo
rename to data/locales/nl_NL/LC_MESSAGES/messages.mo
diff --git a/locales/nl_NL/LC_MESSAGES/messages.po b/data/locales/nl_NL/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/nl_NL/LC_MESSAGES/messages.po
rename to data/locales/nl_NL/LC_MESSAGES/messages.po
diff --git a/locales/pt_BR/LC_MESSAGES/messages.mo b/data/locales/pt_BR/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/pt_BR/LC_MESSAGES/messages.mo
rename to data/locales/pt_BR/LC_MESSAGES/messages.mo
diff --git a/locales/pt_BR/LC_MESSAGES/messages.po b/data/locales/pt_BR/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/pt_BR/LC_MESSAGES/messages.po
rename to data/locales/pt_BR/LC_MESSAGES/messages.po
diff --git a/locales/zh_CN/LC_MESSAGES/messages.mo b/data/locales/zh_CN/LC_MESSAGES/messages.mo
similarity index 100%
rename from locales/zh_CN/LC_MESSAGES/messages.mo
rename to data/locales/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locales/zh_CN/LC_MESSAGES/messages.po b/data/locales/zh_CN/LC_MESSAGES/messages.po
similarity index 100%
rename from locales/zh_CN/LC_MESSAGES/messages.po
rename to data/locales/zh_CN/LC_MESSAGES/messages.po
diff --git a/tables.sql b/data/tables.sql
similarity index 100%
rename from tables.sql
rename to data/tables.sql
diff --git a/templates/about.tpl.php b/data/templates/about.tpl.php
similarity index 100%
rename from templates/about.tpl.php
rename to data/templates/about.tpl.php
diff --git a/templates/admin.tpl.php b/data/templates/admin.tpl.php
similarity index 100%
rename from templates/admin.tpl.php
rename to data/templates/admin.tpl.php
diff --git a/templates/bookmarkcommondescriptionedit.tpl.php b/data/templates/bookmarkcommondescriptionedit.tpl.php
similarity index 100%
rename from templates/bookmarkcommondescriptionedit.tpl.php
rename to data/templates/bookmarkcommondescriptionedit.tpl.php
diff --git a/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
similarity index 100%
rename from templates/bookmarks.tpl.php
rename to data/templates/bookmarks.tpl.php
diff --git a/templates/bottom.inc.php b/data/templates/bottom.inc.php
similarity index 100%
rename from templates/bottom.inc.php
rename to data/templates/bottom.inc.php
diff --git a/templates/dojo.inc.php b/data/templates/dojo.inc.php
similarity index 100%
rename from templates/dojo.inc.php
rename to data/templates/dojo.inc.php
diff --git a/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php
similarity index 100%
rename from templates/dynamictags.inc.php
rename to data/templates/dynamictags.inc.php
diff --git a/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php
similarity index 100%
rename from templates/editbookmark.tpl.php
rename to data/templates/editbookmark.tpl.php
diff --git a/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php
similarity index 100%
rename from templates/editprofile.tpl.php
rename to data/templates/editprofile.tpl.php
diff --git a/templates/error.404.tpl.php b/data/templates/error.404.tpl.php
similarity index 100%
rename from templates/error.404.tpl.php
rename to data/templates/error.404.tpl.php
diff --git a/templates/error.500.tpl.php b/data/templates/error.500.tpl.php
similarity index 100%
rename from templates/error.500.tpl.php
rename to data/templates/error.500.tpl.php
diff --git a/templates/importDelicious.tpl.php b/data/templates/importDelicious.tpl.php
similarity index 100%
rename from templates/importDelicious.tpl.php
rename to data/templates/importDelicious.tpl.php
diff --git a/templates/importNetscape.tpl.php b/data/templates/importNetscape.tpl.php
similarity index 100%
rename from templates/importNetscape.tpl.php
rename to data/templates/importNetscape.tpl.php
diff --git a/templates/importStructure.tpl.php b/data/templates/importStructure.tpl.php
similarity index 100%
rename from templates/importStructure.tpl.php
rename to data/templates/importStructure.tpl.php
diff --git a/templates/login.tpl.php b/data/templates/login.tpl.php
similarity index 100%
rename from templates/login.tpl.php
rename to data/templates/login.tpl.php
diff --git a/templates/password.tpl.php b/data/templates/password.tpl.php
similarity index 100%
rename from templates/password.tpl.php
rename to data/templates/password.tpl.php
diff --git a/templates/profile.tpl.php b/data/templates/profile.tpl.php
similarity index 100%
rename from templates/profile.tpl.php
rename to data/templates/profile.tpl.php
diff --git a/templates/register.tpl.php b/data/templates/register.tpl.php
similarity index 100%
rename from templates/register.tpl.php
rename to data/templates/register.tpl.php
diff --git a/templates/rss.tpl.php b/data/templates/rss.tpl.php
similarity index 100%
rename from templates/rss.tpl.php
rename to data/templates/rss.tpl.php
diff --git a/templates/sidebar.block.common.php b/data/templates/sidebar.block.common.php
similarity index 100%
rename from templates/sidebar.block.common.php
rename to data/templates/sidebar.block.common.php
diff --git a/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php
similarity index 100%
rename from templates/sidebar.block.linked.php
rename to data/templates/sidebar.block.linked.php
diff --git a/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php
similarity index 100%
rename from templates/sidebar.block.menu.php
rename to data/templates/sidebar.block.menu.php
diff --git a/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php
similarity index 100%
rename from templates/sidebar.block.menu2.php
rename to data/templates/sidebar.block.menu2.php
diff --git a/templates/sidebar.block.popular.php b/data/templates/sidebar.block.popular.php
similarity index 100%
rename from templates/sidebar.block.popular.php
rename to data/templates/sidebar.block.popular.php
diff --git a/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php
similarity index 100%
rename from templates/sidebar.block.recent.php
rename to data/templates/sidebar.block.recent.php
diff --git a/templates/sidebar.block.related.php b/data/templates/sidebar.block.related.php
similarity index 100%
rename from templates/sidebar.block.related.php
rename to data/templates/sidebar.block.related.php
diff --git a/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php
similarity index 100%
rename from templates/sidebar.block.search.php
rename to data/templates/sidebar.block.search.php
diff --git a/templates/sidebar.block.tagactions.php b/data/templates/sidebar.block.tagactions.php
similarity index 100%
rename from templates/sidebar.block.tagactions.php
rename to data/templates/sidebar.block.tagactions.php
diff --git a/templates/sidebar.block.users.php b/data/templates/sidebar.block.users.php
similarity index 100%
rename from templates/sidebar.block.users.php
rename to data/templates/sidebar.block.users.php
diff --git a/templates/sidebar.block.watchlist.php b/data/templates/sidebar.block.watchlist.php
similarity index 100%
rename from templates/sidebar.block.watchlist.php
rename to data/templates/sidebar.block.watchlist.php
diff --git a/templates/sidebar.block.watchstatus.php b/data/templates/sidebar.block.watchstatus.php
similarity index 100%
rename from templates/sidebar.block.watchstatus.php
rename to data/templates/sidebar.block.watchstatus.php
diff --git a/templates/sidebar.linkedtags.inc.php b/data/templates/sidebar.linkedtags.inc.php
similarity index 100%
rename from templates/sidebar.linkedtags.inc.php
rename to data/templates/sidebar.linkedtags.inc.php
diff --git a/templates/sidebar.tpl.php b/data/templates/sidebar.tpl.php
similarity index 100%
rename from templates/sidebar.tpl.php
rename to data/templates/sidebar.tpl.php
diff --git a/templates/tag2tagadd.tpl.php b/data/templates/tag2tagadd.tpl.php
similarity index 100%
rename from templates/tag2tagadd.tpl.php
rename to data/templates/tag2tagadd.tpl.php
diff --git a/templates/tag2tagdelete.tpl.php b/data/templates/tag2tagdelete.tpl.php
similarity index 100%
rename from templates/tag2tagdelete.tpl.php
rename to data/templates/tag2tagdelete.tpl.php
diff --git a/templates/tag2tagedit.tpl.php b/data/templates/tag2tagedit.tpl.php
similarity index 100%
rename from templates/tag2tagedit.tpl.php
rename to data/templates/tag2tagedit.tpl.php
diff --git a/templates/tagcommondescriptionedit.tpl.php b/data/templates/tagcommondescriptionedit.tpl.php
similarity index 100%
rename from templates/tagcommondescriptionedit.tpl.php
rename to data/templates/tagcommondescriptionedit.tpl.php
diff --git a/templates/tagdelete.tpl.php b/data/templates/tagdelete.tpl.php
similarity index 100%
rename from templates/tagdelete.tpl.php
rename to data/templates/tagdelete.tpl.php
diff --git a/templates/tagedit.tpl.php b/data/templates/tagedit.tpl.php
similarity index 100%
rename from templates/tagedit.tpl.php
rename to data/templates/tagedit.tpl.php
diff --git a/templates/tagrename.tpl.php b/data/templates/tagrename.tpl.php
similarity index 100%
rename from templates/tagrename.tpl.php
rename to data/templates/tagrename.tpl.php
diff --git a/templates/tags.tpl.php b/data/templates/tags.tpl.php
similarity index 100%
rename from templates/tags.tpl.php
rename to data/templates/tags.tpl.php
diff --git a/templates/toolbar.inc.php b/data/templates/toolbar.inc.php
similarity index 100%
rename from templates/toolbar.inc.php
rename to data/templates/toolbar.inc.php
diff --git a/templates/top.inc.php b/data/templates/top.inc.php
similarity index 100%
rename from templates/top.inc.php
rename to data/templates/top.inc.php
diff --git a/templates/users.tpl.php b/data/templates/users.tpl.php
similarity index 100%
rename from templates/users.tpl.php
rename to data/templates/users.tpl.php
diff --git a/AUTHORS b/doc/AUTHORS
similarity index 100%
rename from AUTHORS
rename to doc/AUTHORS
diff --git a/ChangeLog b/doc/ChangeLog
similarity index 100%
rename from ChangeLog
rename to doc/ChangeLog
diff --git a/INSTALL.txt b/doc/INSTALL.txt
similarity index 100%
rename from INSTALL.txt
rename to doc/INSTALL.txt
diff --git a/LICENSE.txt b/doc/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to doc/LICENSE.txt
diff --git a/README.txt b/doc/README.txt
similarity index 100%
rename from README.txt
rename to doc/README.txt
diff --git a/UPGRADE.txt b/doc/UPGRADE.txt
similarity index 100%
rename from UPGRADE.txt
rename to doc/UPGRADE.txt
diff --git a/services/bookmark2tagservice.php b/src/SemanticScuttle/Service/bookmark2tagservice.php
similarity index 100%
rename from services/bookmark2tagservice.php
rename to src/SemanticScuttle/Service/bookmark2tagservice.php
diff --git a/services/bookmarkservice.php b/src/SemanticScuttle/Service/bookmarkservice.php
similarity index 100%
rename from services/bookmarkservice.php
rename to src/SemanticScuttle/Service/bookmarkservice.php
diff --git a/services/cacheservice.php b/src/SemanticScuttle/Service/cacheservice.php
similarity index 100%
rename from services/cacheservice.php
rename to src/SemanticScuttle/Service/cacheservice.php
diff --git a/services/commondescriptionservice.php b/src/SemanticScuttle/Service/commondescriptionservice.php
similarity index 100%
rename from services/commondescriptionservice.php
rename to src/SemanticScuttle/Service/commondescriptionservice.php
diff --git a/services/searchhistoryservice.php b/src/SemanticScuttle/Service/searchhistoryservice.php
similarity index 100%
rename from services/searchhistoryservice.php
rename to src/SemanticScuttle/Service/searchhistoryservice.php
diff --git a/services/servicefactory.php b/src/SemanticScuttle/Service/servicefactory.php
similarity index 100%
rename from services/servicefactory.php
rename to src/SemanticScuttle/Service/servicefactory.php
diff --git a/services/tag2tagservice.php b/src/SemanticScuttle/Service/tag2tagservice.php
similarity index 100%
rename from services/tag2tagservice.php
rename to src/SemanticScuttle/Service/tag2tagservice.php
diff --git a/services/tagcacheservice.php b/src/SemanticScuttle/Service/tagcacheservice.php
similarity index 100%
rename from services/tagcacheservice.php
rename to src/SemanticScuttle/Service/tagcacheservice.php
diff --git a/services/tagservice.php b/src/SemanticScuttle/Service/tagservice.php
similarity index 100%
rename from services/tagservice.php
rename to src/SemanticScuttle/Service/tagservice.php
diff --git a/services/tagstatservice.php b/src/SemanticScuttle/Service/tagstatservice.php
similarity index 100%
rename from services/tagstatservice.php
rename to src/SemanticScuttle/Service/tagstatservice.php
diff --git a/services/templateservice.php b/src/SemanticScuttle/Service/templateservice.php
similarity index 100%
rename from services/templateservice.php
rename to src/SemanticScuttle/Service/templateservice.php
diff --git a/services/userservice.php b/src/SemanticScuttle/Service/userservice.php
similarity index 100%
rename from services/userservice.php
rename to src/SemanticScuttle/Service/userservice.php
diff --git a/constants.inc.php b/src/SemanticScuttle/constants.php
similarity index 100%
rename from constants.inc.php
rename to src/SemanticScuttle/constants.php
diff --git a/includes/db/db2.php b/src/SemanticScuttle/db/db2.php
similarity index 100%
rename from includes/db/db2.php
rename to src/SemanticScuttle/db/db2.php
diff --git a/includes/db/firebird.php b/src/SemanticScuttle/db/firebird.php
similarity index 100%
rename from includes/db/firebird.php
rename to src/SemanticScuttle/db/firebird.php
diff --git a/includes/db/index.htm b/src/SemanticScuttle/db/index.htm
similarity index 100%
rename from includes/db/index.htm
rename to src/SemanticScuttle/db/index.htm
diff --git a/includes/db/mssql-odbc.php b/src/SemanticScuttle/db/mssql-odbc.php
similarity index 100%
rename from includes/db/mssql-odbc.php
rename to src/SemanticScuttle/db/mssql-odbc.php
diff --git a/includes/db/mssql.php b/src/SemanticScuttle/db/mssql.php
similarity index 100%
rename from includes/db/mssql.php
rename to src/SemanticScuttle/db/mssql.php
diff --git a/includes/db/mysql.php b/src/SemanticScuttle/db/mysql.php
similarity index 100%
rename from includes/db/mysql.php
rename to src/SemanticScuttle/db/mysql.php
diff --git a/includes/db/mysql4.php b/src/SemanticScuttle/db/mysql4.php
similarity index 100%
rename from includes/db/mysql4.php
rename to src/SemanticScuttle/db/mysql4.php
diff --git a/includes/db/mysqli.php b/src/SemanticScuttle/db/mysqli.php
similarity index 100%
rename from includes/db/mysqli.php
rename to src/SemanticScuttle/db/mysqli.php
diff --git a/includes/db/oracle.php b/src/SemanticScuttle/db/oracle.php
similarity index 100%
rename from includes/db/oracle.php
rename to src/SemanticScuttle/db/oracle.php
diff --git a/includes/db/postgres.php b/src/SemanticScuttle/db/postgres.php
similarity index 100%
rename from includes/db/postgres.php
rename to src/SemanticScuttle/db/postgres.php
diff --git a/includes/db/sqlite.php b/src/SemanticScuttle/db/sqlite.php
similarity index 100%
rename from includes/db/sqlite.php
rename to src/SemanticScuttle/db/sqlite.php
diff --git a/functions.inc.php b/src/SemanticScuttle/functions.inc.php
similarity index 100%
rename from functions.inc.php
rename to src/SemanticScuttle/functions.inc.php
diff --git a/header.inc.php b/src/SemanticScuttle/header.inc.php
similarity index 100%
rename from header.inc.php
rename to src/SemanticScuttle/header.inc.php
diff --git a/search.inc.php b/src/SemanticScuttle/search.inc.php
similarity index 100%
rename from search.inc.php
rename to src/SemanticScuttle/search.inc.php
diff --git a/includes/php-gettext/AUTHORS b/src/php-gettext/AUTHORS
similarity index 100%
rename from includes/php-gettext/AUTHORS
rename to src/php-gettext/AUTHORS
diff --git a/includes/php-gettext/COPYING b/src/php-gettext/COPYING
similarity index 100%
rename from includes/php-gettext/COPYING
rename to src/php-gettext/COPYING
diff --git a/includes/php-gettext/ChangeLog b/src/php-gettext/ChangeLog
similarity index 100%
rename from includes/php-gettext/ChangeLog
rename to src/php-gettext/ChangeLog
diff --git a/includes/php-gettext/Makefile b/src/php-gettext/Makefile
similarity index 100%
rename from includes/php-gettext/Makefile
rename to src/php-gettext/Makefile
diff --git a/includes/php-gettext/README b/src/php-gettext/README
similarity index 100%
rename from includes/php-gettext/README
rename to src/php-gettext/README
diff --git a/includes/php-gettext/bin/gettexts.bat b/src/php-gettext/bin/gettexts.bat
similarity index 100%
rename from includes/php-gettext/bin/gettexts.bat
rename to src/php-gettext/bin/gettexts.bat
diff --git a/includes/php-gettext/bin/gettexts.sh b/src/php-gettext/bin/gettexts.sh
similarity index 100%
rename from includes/php-gettext/bin/gettexts.sh
rename to src/php-gettext/bin/gettexts.sh
diff --git a/includes/php-gettext/examples/index.php b/src/php-gettext/examples/index.php
similarity index 100%
rename from includes/php-gettext/examples/index.php
rename to src/php-gettext/examples/index.php
diff --git a/includes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo b/src/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
similarity index 100%
rename from includes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
rename to src/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
diff --git a/includes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po b/src/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
similarity index 100%
rename from includes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
rename to src/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
diff --git a/includes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo b/src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
similarity index 100%
rename from includes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
rename to src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
diff --git a/includes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po b/src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
similarity index 100%
rename from includes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
rename to src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
diff --git a/includes/php-gettext/examples/pigs_dropin.php b/src/php-gettext/examples/pigs_dropin.php
similarity index 100%
rename from includes/php-gettext/examples/pigs_dropin.php
rename to src/php-gettext/examples/pigs_dropin.php
diff --git a/includes/php-gettext/examples/pigs_fallback.php b/src/php-gettext/examples/pigs_fallback.php
similarity index 100%
rename from includes/php-gettext/examples/pigs_fallback.php
rename to src/php-gettext/examples/pigs_fallback.php
diff --git a/includes/php-gettext/examples/update b/src/php-gettext/examples/update
similarity index 100%
rename from includes/php-gettext/examples/update
rename to src/php-gettext/examples/update
diff --git a/includes/php-gettext/gettext.inc b/src/php-gettext/gettext.inc
similarity index 100%
rename from includes/php-gettext/gettext.inc
rename to src/php-gettext/gettext.inc
diff --git a/includes/php-gettext/gettext.php b/src/php-gettext/gettext.php
similarity index 100%
rename from includes/php-gettext/gettext.php
rename to src/php-gettext/gettext.php
diff --git a/includes/php-gettext/streams.php b/src/php-gettext/streams.php
similarity index 100%
rename from includes/php-gettext/streams.php
rename to src/php-gettext/streams.php
diff --git a/about.php b/www/about.php
similarity index 100%
rename from about.php
rename to www/about.php
diff --git a/admin.php b/www/admin.php
similarity index 100%
rename from admin.php
rename to www/admin.php
diff --git a/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php
similarity index 100%
rename from ajax/getadminlinkedtags.php
rename to www/ajax/getadminlinkedtags.php
diff --git a/ajax/getadmintags.php b/www/ajax/getadmintags.php
similarity index 100%
rename from ajax/getadmintags.php
rename to www/ajax/getadmintags.php
diff --git a/ajax/getcontacttags.php b/www/ajax/getcontacttags.php
similarity index 100%
rename from ajax/getcontacttags.php
rename to www/ajax/getcontacttags.php
diff --git a/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php
similarity index 100%
rename from ajax/getlinkedtags.php
rename to www/ajax/getlinkedtags.php
diff --git a/ajax/gettags.php b/www/ajax/gettags.php
similarity index 100%
rename from ajax/gettags.php
rename to www/ajax/gettags.php
diff --git a/ajaxDelete.php b/www/ajaxDelete.php
similarity index 100%
rename from ajaxDelete.php
rename to www/ajaxDelete.php
diff --git a/ajaxGetTitle.php b/www/ajaxGetTitle.php
similarity index 100%
rename from ajaxGetTitle.php
rename to www/ajaxGetTitle.php
diff --git a/ajaxIsAvailable.php b/www/ajaxIsAvailable.php
similarity index 100%
rename from ajaxIsAvailable.php
rename to www/ajaxIsAvailable.php
diff --git a/alltags.php b/www/alltags.php
similarity index 100%
rename from alltags.php
rename to www/alltags.php
diff --git a/api/export_csv.php b/www/api/export_csv.php
similarity index 100%
rename from api/export_csv.php
rename to www/api/export_csv.php
diff --git a/api/export_gcs.php b/www/api/export_gcs.php
similarity index 100%
rename from api/export_gcs.php
rename to www/api/export_gcs.php
diff --git a/api/export_html.php b/www/api/export_html.php
similarity index 100%
rename from api/export_html.php
rename to www/api/export_html.php
diff --git a/api/export_sioc.php b/www/api/export_sioc.php
similarity index 100%
rename from api/export_sioc.php
rename to www/api/export_sioc.php
diff --git a/api/httpauth.inc.php b/www/api/httpauth.inc.php
similarity index 100%
rename from api/httpauth.inc.php
rename to www/api/httpauth.inc.php
diff --git a/api/opensearch.php b/www/api/opensearch.php
similarity index 100%
rename from api/opensearch.php
rename to www/api/opensearch.php
diff --git a/api/posts_add.php b/www/api/posts_add.php
similarity index 100%
rename from api/posts_add.php
rename to www/api/posts_add.php
diff --git a/api/posts_all.php b/www/api/posts_all.php
similarity index 100%
rename from api/posts_all.php
rename to www/api/posts_all.php
diff --git a/api/posts_dates.php b/www/api/posts_dates.php
similarity index 100%
rename from api/posts_dates.php
rename to www/api/posts_dates.php
diff --git a/api/posts_delete.php b/www/api/posts_delete.php
similarity index 100%
rename from api/posts_delete.php
rename to www/api/posts_delete.php
diff --git a/api/posts_get.php b/www/api/posts_get.php
similarity index 100%
rename from api/posts_get.php
rename to www/api/posts_get.php
diff --git a/api/posts_public.php b/www/api/posts_public.php
similarity index 100%
rename from api/posts_public.php
rename to www/api/posts_public.php
diff --git a/api/posts_recent.php b/www/api/posts_recent.php
similarity index 100%
rename from api/posts_recent.php
rename to www/api/posts_recent.php
diff --git a/api/posts_update.php b/www/api/posts_update.php
similarity index 100%
rename from api/posts_update.php
rename to www/api/posts_update.php
diff --git a/api/tags_get.php b/www/api/tags_get.php
similarity index 100%
rename from api/tags_get.php
rename to www/api/tags_get.php
diff --git a/api/tags_rename.php b/www/api/tags_rename.php
similarity index 100%
rename from api/tags_rename.php
rename to www/api/tags_rename.php
diff --git a/bookmarkcommondescriptionedit.php b/www/bookmarkcommondescriptionedit.php
similarity index 100%
rename from bookmarkcommondescriptionedit.php
rename to www/bookmarkcommondescriptionedit.php
diff --git a/bookmarks.php b/www/bookmarks.php
similarity index 100%
rename from bookmarks.php
rename to www/bookmarks.php
diff --git a/edit.php b/www/edit.php
similarity index 100%
rename from edit.php
rename to www/edit.php
diff --git a/gsearch/context.php b/www/gsearch/context.php
similarity index 100%
rename from gsearch/context.php
rename to www/gsearch/context.php
diff --git a/gsearch/index.php b/www/gsearch/index.php
similarity index 100%
rename from gsearch/index.php
rename to www/gsearch/index.php
diff --git a/history.php b/www/history.php
similarity index 100%
rename from history.php
rename to www/history.php
diff --git a/icon.png b/www/icon.png
similarity index 100%
rename from icon.png
rename to www/icon.png
diff --git a/images/b_edit.png b/www/images/b_edit.png
similarity index 100%
rename from images/b_edit.png
rename to www/images/b_edit.png
diff --git a/images/bg_admin.png b/www/images/bg_admin.png
similarity index 100%
rename from images/bg_admin.png
rename to www/images/bg_admin.png
diff --git a/images/bg_bar.png b/www/images/bg_bar.png
similarity index 100%
rename from images/bg_bar.png
rename to www/images/bg_bar.png
diff --git a/images/bg_header.png b/www/images/bg_header.png
similarity index 100%
rename from images/bg_header.png
rename to www/images/bg_header.png
diff --git a/images/bg_sidebar.png b/www/images/bg_sidebar.png
similarity index 100%
rename from images/bg_sidebar.png
rename to www/images/bg_sidebar.png
diff --git a/images/loading.gif b/www/images/loading.gif
similarity index 100%
rename from images/loading.gif
rename to www/images/loading.gif
diff --git a/images/logo.png b/www/images/logo.png
similarity index 100%
rename from images/logo.png
rename to www/images/logo.png
diff --git a/images/logo_24.gif b/www/images/logo_24.gif
similarity index 100%
rename from images/logo_24.gif
rename to www/images/logo_24.gif
diff --git a/images/rss.gif b/www/images/rss.gif
similarity index 100%
rename from images/rss.gif
rename to www/images/rss.gif
diff --git a/import.php b/www/import.php
similarity index 100%
rename from import.php
rename to www/import.php
diff --git a/importNetscape.php b/www/importNetscape.php
similarity index 100%
rename from importNetscape.php
rename to www/importNetscape.php
diff --git a/importStructure.php b/www/importStructure.php
similarity index 100%
rename from importStructure.php
rename to www/importStructure.php
diff --git a/index.php b/www/index.php
similarity index 100%
rename from index.php
rename to www/index.php
diff --git a/includes/js/MultiComboBox.js b/www/js/MultiComboBox.js
similarity index 100%
rename from includes/js/MultiComboBox.js
rename to www/js/MultiComboBox.js
diff --git a/jsScuttle.php b/www/jsScuttle.php
similarity index 100%
rename from jsScuttle.php
rename to www/jsScuttle.php
diff --git a/login.php b/www/login.php
similarity index 100%
rename from login.php
rename to www/login.php
diff --git a/password.php b/www/password.php
similarity index 100%
rename from password.php
rename to www/password.php
diff --git a/includes/player/error.swf b/www/player/error.swf
similarity index 100%
rename from includes/player/error.swf
rename to www/player/error.swf
diff --git a/includes/player/license.txt b/www/player/license.txt
similarity index 100%
rename from includes/player/license.txt
rename to www/player/license.txt
diff --git a/includes/player/load.swf b/www/player/load.swf
similarity index 100%
rename from includes/player/load.swf
rename to www/player/load.swf
diff --git a/includes/player/musicplayer_f6.swf b/www/player/musicplayer_f6.swf
similarity index 100%
rename from includes/player/musicplayer_f6.swf
rename to www/player/musicplayer_f6.swf
diff --git a/includes/player/play.swf b/www/player/play.swf
similarity index 100%
rename from includes/player/play.swf
rename to www/player/play.swf
diff --git a/includes/player/stop.swf b/www/player/stop.swf
similarity index 100%
rename from includes/player/stop.swf
rename to www/player/stop.swf
diff --git a/populartags.php b/www/populartags.php
similarity index 100%
rename from populartags.php
rename to www/populartags.php
diff --git a/profile.php b/www/profile.php
similarity index 100%
rename from profile.php
rename to www/profile.php
diff --git a/register.php b/www/register.php
similarity index 100%
rename from register.php
rename to www/register.php
diff --git a/rss.php b/www/rss.php
similarity index 100%
rename from rss.php
rename to www/rss.php
diff --git a/scuttle.css b/www/scuttle.css
similarity index 100%
rename from scuttle.css
rename to www/scuttle.css
diff --git a/search.php b/www/search.php
similarity index 100%
rename from search.php
rename to www/search.php
diff --git a/tag2tagadd.php b/www/tag2tagadd.php
similarity index 100%
rename from tag2tagadd.php
rename to www/tag2tagadd.php
diff --git a/tag2tagdelete.php b/www/tag2tagdelete.php
similarity index 100%
rename from tag2tagdelete.php
rename to www/tag2tagdelete.php
diff --git a/tag2tagedit.php b/www/tag2tagedit.php
similarity index 100%
rename from tag2tagedit.php
rename to www/tag2tagedit.php
diff --git a/tagcommondescriptionedit.php b/www/tagcommondescriptionedit.php
similarity index 100%
rename from tagcommondescriptionedit.php
rename to www/tagcommondescriptionedit.php
diff --git a/tagdelete.php b/www/tagdelete.php
similarity index 100%
rename from tagdelete.php
rename to www/tagdelete.php
diff --git a/tagedit.php b/www/tagedit.php
similarity index 100%
rename from tagedit.php
rename to www/tagedit.php
diff --git a/tagrename.php b/www/tagrename.php
similarity index 100%
rename from tagrename.php
rename to www/tagrename.php
diff --git a/tags.php b/www/tags.php
similarity index 100%
rename from tags.php
rename to www/tags.php
diff --git a/upgrade.php b/www/upgrade.php
similarity index 100%
rename from upgrade.php
rename to www/upgrade.php
diff --git a/users.php b/www/users.php
similarity index 100%
rename from users.php
rename to www/users.php
diff --git a/watch.php b/www/watch.php
similarity index 100%
rename from watch.php
rename to www/watch.php
diff --git a/watchlist.php b/www/watchlist.php
similarity index 100%
rename from watchlist.php
rename to www/watchlist.php
diff --git a/widgetUWA.php b/www/widgetUWA.php
similarity index 100%
rename from widgetUWA.php
rename to www/widgetUWA.php