diff --git a/component/admin/access.xml b/admin/access.xml
similarity index 100%
rename from component/admin/access.xml
rename to admin/access.xml
diff --git a/component/admin/assets/css/help.css b/admin/assets/css/help.css
similarity index 100%
rename from component/admin/assets/css/help.css
rename to admin/assets/css/help.css
diff --git a/component/admin/assets/css/hidesubmenu.css b/admin/assets/css/hidesubmenu.css
similarity index 100%
rename from component/admin/assets/css/hidesubmenu.css
rename to admin/assets/css/hidesubmenu.css
diff --git a/component/admin/assets/css/index.html b/admin/assets/css/index.html
similarity index 100%
rename from component/admin/assets/css/index.html
rename to admin/assets/css/index.html
diff --git a/component/admin/assets/css/jfhelp.css b/admin/assets/css/jfhelp.css
similarity index 100%
rename from component/admin/assets/css/jfhelp.css
rename to admin/assets/css/jfhelp.css
diff --git a/component/admin/assets/css/joomfish.css b/admin/assets/css/joomfish.css
similarity index 100%
rename from component/admin/assets/css/joomfish.css
rename to admin/assets/css/joomfish.css
diff --git a/component/admin/assets/images/body-div.png b/admin/assets/images/body-div.png
similarity index 100%
rename from component/admin/assets/images/body-div.png
rename to admin/assets/images/body-div.png
diff --git a/component/admin/assets/images/body-readon.png b/admin/assets/images/body-readon.png
similarity index 100%
rename from component/admin/assets/images/body-readon.png
rename to admin/assets/images/body-readon.png
diff --git a/component/admin/assets/images/bottom-hdiv.png b/admin/assets/images/bottom-hdiv.png
similarity index 100%
rename from component/admin/assets/images/bottom-hdiv.png
rename to admin/assets/images/bottom-hdiv.png
diff --git a/component/admin/assets/images/dot.png b/admin/assets/images/dot.png
similarity index 100%
rename from component/admin/assets/images/dot.png
rename to admin/assets/images/dot.png
diff --git a/component/admin/assets/images/fish.png b/admin/assets/images/fish.png
similarity index 100%
rename from component/admin/assets/images/fish.png
rename to admin/assets/images/fish.png
diff --git a/component/admin/assets/images/folder.png b/admin/assets/images/folder.png
similarity index 100%
rename from component/admin/assets/images/folder.png
rename to admin/assets/images/folder.png
diff --git a/component/admin/assets/images/footer-bg.png b/admin/assets/images/footer-bg.png
similarity index 100%
rename from component/admin/assets/images/footer-bg.png
rename to admin/assets/images/footer-bg.png
diff --git a/component/admin/assets/images/footer-l.png b/admin/assets/images/footer-l.png
similarity index 100%
rename from component/admin/assets/images/footer-l.png
rename to admin/assets/images/footer-l.png
diff --git a/component/admin/assets/images/footer-r.png b/admin/assets/images/footer-r.png
similarity index 100%
rename from component/admin/assets/images/footer-r.png
rename to admin/assets/images/footer-r.png
diff --git a/component/admin/assets/images/header-bg.png b/admin/assets/images/header-bg.png
similarity index 100%
rename from component/admin/assets/images/header-bg.png
rename to admin/assets/images/header-bg.png
diff --git a/component/admin/assets/images/header-l.png b/admin/assets/images/header-l.png
similarity index 100%
rename from component/admin/assets/images/header-l.png
rename to admin/assets/images/header-l.png
diff --git a/component/admin/assets/images/header-r.png b/admin/assets/images/header-r.png
similarity index 100%
rename from component/admin/assets/images/header-r.png
rename to admin/assets/images/header-r.png
diff --git a/component/admin/assets/images/icon-10-blank.png b/admin/assets/images/icon-10-blank.png
similarity index 100%
rename from component/admin/assets/images/icon-10-blank.png
rename to admin/assets/images/icon-10-blank.png
diff --git a/component/admin/assets/images/icon-16-cpanel.png b/admin/assets/images/icon-16-cpanel.png
similarity index 100%
rename from component/admin/assets/images/icon-16-cpanel.png
rename to admin/assets/images/icon-16-cpanel.png
diff --git a/component/admin/assets/images/icon-16-critical.png b/admin/assets/images/icon-16-critical.png
similarity index 100%
rename from component/admin/assets/images/icon-16-critical.png
rename to admin/assets/images/icon-16-critical.png
diff --git a/component/admin/assets/images/icon-16-extension.png b/admin/assets/images/icon-16-extension.png
similarity index 100%
rename from component/admin/assets/images/icon-16-extension.png
rename to admin/assets/images/icon-16-extension.png
diff --git a/component/admin/assets/images/icon-16-help.png b/admin/assets/images/icon-16-help.png
similarity index 100%
rename from component/admin/assets/images/icon-16-help.png
rename to admin/assets/images/icon-16-help.png
diff --git a/component/admin/assets/images/icon-16-info.png b/admin/assets/images/icon-16-info.png
similarity index 100%
rename from component/admin/assets/images/icon-16-info.png
rename to admin/assets/images/icon-16-info.png
diff --git a/component/admin/assets/images/icon-16-joomfish.png b/admin/assets/images/icon-16-joomfish.png
similarity index 100%
rename from component/admin/assets/images/icon-16-joomfish.png
rename to admin/assets/images/icon-16-joomfish.png
diff --git a/component/admin/assets/images/icon-16-language.png b/admin/assets/images/icon-16-language.png
similarity index 100%
rename from component/admin/assets/images/icon-16-language.png
rename to admin/assets/images/icon-16-language.png
diff --git a/component/admin/assets/images/icon-16-manage.png b/admin/assets/images/icon-16-manage.png
similarity index 100%
rename from component/admin/assets/images/icon-16-manage.png
rename to admin/assets/images/icon-16-manage.png
diff --git a/component/admin/assets/images/icon-16-ok.png b/admin/assets/images/icon-16-ok.png
similarity index 100%
rename from component/admin/assets/images/icon-16-ok.png
rename to admin/assets/images/icon-16-ok.png
diff --git a/component/admin/assets/images/icon-16-orphan.png b/admin/assets/images/icon-16-orphan.png
similarity index 100%
rename from component/admin/assets/images/icon-16-orphan.png
rename to admin/assets/images/icon-16-orphan.png
diff --git a/component/admin/assets/images/icon-16-plugin.png b/admin/assets/images/icon-16-plugin.png
similarity index 100%
rename from component/admin/assets/images/icon-16-plugin.png
rename to admin/assets/images/icon-16-plugin.png
diff --git a/component/admin/assets/images/icon-16-statistics.png b/admin/assets/images/icon-16-statistics.png
similarity index 100%
rename from component/admin/assets/images/icon-16-statistics.png
rename to admin/assets/images/icon-16-statistics.png
diff --git a/component/admin/assets/images/icon-16-translation.png b/admin/assets/images/icon-16-translation.png
similarity index 100%
rename from component/admin/assets/images/icon-16-translation.png
rename to admin/assets/images/icon-16-translation.png
diff --git a/component/admin/assets/images/icon-16-warning.png b/admin/assets/images/icon-16-warning.png
similarity index 100%
rename from component/admin/assets/images/icon-16-warning.png
rename to admin/assets/images/icon-16-warning.png
diff --git a/component/admin/assets/images/icon-32-joomfish.png b/admin/assets/images/icon-32-joomfish.png
similarity index 100%
rename from component/admin/assets/images/icon-32-joomfish.png
rename to admin/assets/images/icon-32-joomfish.png
diff --git a/component/admin/assets/images/icon-48-checktranslations.png b/admin/assets/images/icon-48-checktranslations.png
similarity index 100%
rename from component/admin/assets/images/icon-48-checktranslations.png
rename to admin/assets/images/icon-48-checktranslations.png
diff --git a/component/admin/assets/images/icon-48-extension.png b/admin/assets/images/icon-48-extension.png
similarity index 100%
rename from component/admin/assets/images/icon-48-extension.png
rename to admin/assets/images/icon-48-extension.png
diff --git a/component/admin/assets/images/icon-48-fish.png b/admin/assets/images/icon-48-fish.png
similarity index 100%
rename from component/admin/assets/images/icon-48-fish.png
rename to admin/assets/images/icon-48-fish.png
diff --git a/component/admin/assets/images/icon-48-help.png b/admin/assets/images/icon-48-help.png
similarity index 100%
rename from component/admin/assets/images/icon-48-help.png
rename to admin/assets/images/icon-48-help.png
diff --git a/component/admin/assets/images/icon-48-info.png b/admin/assets/images/icon-48-info.png
similarity index 100%
rename from component/admin/assets/images/icon-48-info.png
rename to admin/assets/images/icon-48-info.png
diff --git a/component/admin/assets/images/icon-48-language.png b/admin/assets/images/icon-48-language.png
similarity index 100%
rename from component/admin/assets/images/icon-48-language.png
rename to admin/assets/images/icon-48-language.png
diff --git a/component/admin/assets/images/icon-48-manage-translations.png b/admin/assets/images/icon-48-manage-translations.png
similarity index 100%
rename from component/admin/assets/images/icon-48-manage-translations.png
rename to admin/assets/images/icon-48-manage-translations.png
diff --git a/component/admin/assets/images/icon-48-manage.png b/admin/assets/images/icon-48-manage.png
similarity index 100%
rename from component/admin/assets/images/icon-48-manage.png
rename to admin/assets/images/icon-48-manage.png
diff --git a/component/admin/assets/images/icon-48-orphan.png b/admin/assets/images/icon-48-orphan.png
similarity index 100%
rename from component/admin/assets/images/icon-48-orphan.png
rename to admin/assets/images/icon-48-orphan.png
diff --git a/component/admin/assets/images/icon-48-plugin.png b/admin/assets/images/icon-48-plugin.png
similarity index 100%
rename from component/admin/assets/images/icon-48-plugin.png
rename to admin/assets/images/icon-48-plugin.png
diff --git a/component/admin/assets/images/icon-48-statistics.png b/admin/assets/images/icon-48-statistics.png
similarity index 100%
rename from component/admin/assets/images/icon-48-statistics.png
rename to admin/assets/images/icon-48-statistics.png
diff --git a/component/admin/assets/images/icon-48-translation.png b/admin/assets/images/icon-48-translation.png
similarity index 100%
rename from component/admin/assets/images/icon-48-translation.png
rename to admin/assets/images/icon-48-translation.png
diff --git a/component/admin/assets/images/index.html b/admin/assets/images/index.html
similarity index 100%
rename from component/admin/assets/images/index.html
rename to admin/assets/images/index.html
diff --git a/component/admin/assets/images/jfspacer.png b/admin/assets/images/jfspacer.png
similarity index 100%
rename from component/admin/assets/images/jfspacer.png
rename to admin/assets/images/jfspacer.png
diff --git a/component/admin/assets/images/joomfish.png b/admin/assets/images/joomfish.png
similarity index 100%
rename from component/admin/assets/images/joomfish.png
rename to admin/assets/images/joomfish.png
diff --git a/component/admin/assets/images/joomfish_slogan.png b/admin/assets/images/joomfish_slogan.png
similarity index 100%
rename from component/admin/assets/images/joomfish_slogan.png
rename to admin/assets/images/joomfish_slogan.png
diff --git a/component/admin/assets/images/joomfishclub.png b/admin/assets/images/joomfishclub.png
similarity index 100%
rename from component/admin/assets/images/joomfishclub.png
rename to admin/assets/images/joomfishclub.png
diff --git a/component/admin/assets/images/sidebar.png b/admin/assets/images/sidebar.png
similarity index 100%
rename from component/admin/assets/images/sidebar.png
rename to admin/assets/images/sidebar.png
diff --git a/component/admin/assets/images/splash_btn_startvideo.png b/admin/assets/images/splash_btn_startvideo.png
similarity index 100%
rename from component/admin/assets/images/splash_btn_startvideo.png
rename to admin/assets/images/splash_btn_startvideo.png
diff --git a/component/admin/assets/images/splash_screens.png b/admin/assets/images/splash_screens.png
similarity index 100%
rename from component/admin/assets/images/splash_screens.png
rename to admin/assets/images/splash_screens.png
diff --git a/component/admin/assets/images/splash_support.png b/admin/assets/images/splash_support.png
similarity index 100%
rename from component/admin/assets/images/splash_support.png
rename to admin/assets/images/splash_support.png
diff --git a/component/admin/assets/images/splash_videopreview.png b/admin/assets/images/splash_videopreview.png
similarity index 100%
rename from component/admin/assets/images/splash_videopreview.png
rename to admin/assets/images/splash_videopreview.png
diff --git a/component/admin/assets/images/status_g.png b/admin/assets/images/status_g.png
similarity index 100%
rename from component/admin/assets/images/status_g.png
rename to admin/assets/images/status_g.png
diff --git a/component/admin/assets/images/status_r.png b/admin/assets/images/status_r.png
similarity index 100%
rename from component/admin/assets/images/status_r.png
rename to admin/assets/images/status_r.png
diff --git a/component/admin/assets/images/status_y.png b/admin/assets/images/status_y.png
similarity index 100%
rename from component/admin/assets/images/status_y.png
rename to admin/assets/images/status_y.png
diff --git a/component/admin/assets/images/xicon-32-joomfish.png b/admin/assets/images/xicon-32-joomfish.png
similarity index 100%
rename from component/admin/assets/images/xicon-32-joomfish.png
rename to admin/assets/images/xicon-32-joomfish.png
diff --git a/component/admin/assets/index.html b/admin/assets/index.html
similarity index 100%
rename from component/admin/assets/index.html
rename to admin/assets/index.html
diff --git a/component/admin/assets/js/joomfish.mootools.js b/admin/assets/js/joomfish.mootools.js
similarity index 100%
rename from component/admin/assets/js/joomfish.mootools.js
rename to admin/assets/js/joomfish.mootools.js
diff --git a/component/admin/classes/JCacheStorageJFDB.php b/admin/classes/JCacheStorageJFDB.php
similarity index 100%
rename from component/admin/classes/JCacheStorageJFDB.php
rename to admin/classes/JCacheStorageJFDB.php
diff --git a/component/admin/classes/JoomfishManager.class.php b/admin/classes/JoomfishManager.class.php
similarity index 100%
rename from component/admin/classes/JoomfishManager.class.php
rename to admin/classes/JoomfishManager.class.php
diff --git a/component/admin/config.xml b/admin/config.xml
similarity index 100%
rename from component/admin/config.xml
rename to admin/config.xml
diff --git a/component/admin/contentelements/banner_clients.xml b/admin/contentelements/banner_clients.xml
similarity index 100%
rename from component/admin/contentelements/banner_clients.xml
rename to admin/contentelements/banner_clients.xml
diff --git a/component/admin/contentelements/banners.xml b/admin/contentelements/banners.xml
similarity index 100%
rename from component/admin/contentelements/banners.xml
rename to admin/contentelements/banners.xml
diff --git a/component/admin/contentelements/categories.xml b/admin/contentelements/categories.xml
similarity index 100%
rename from component/admin/contentelements/categories.xml
rename to admin/contentelements/categories.xml
diff --git a/component/admin/contentelements/contact.xml b/admin/contentelements/contact.xml
similarity index 100%
rename from component/admin/contentelements/contact.xml
rename to admin/contentelements/contact.xml
diff --git a/component/admin/contentelements/contact_details.xml b/admin/contentelements/contact_details.xml
similarity index 100%
rename from component/admin/contentelements/contact_details.xml
rename to admin/contentelements/contact_details.xml
diff --git a/component/admin/contentelements/content.xml b/admin/contentelements/content.xml
similarity index 100%
rename from component/admin/contentelements/content.xml
rename to admin/contentelements/content.xml
diff --git a/component/admin/contentelements/index.html b/admin/contentelements/index.html
similarity index 100%
rename from component/admin/contentelements/index.html
rename to admin/contentelements/index.html
diff --git a/component/admin/contentelements/josconfig.ini b/admin/contentelements/josconfig.ini
similarity index 100%
rename from component/admin/contentelements/josconfig.ini
rename to admin/contentelements/josconfig.ini
diff --git a/component/admin/contentelements/language.config.php b/admin/contentelements/language.config.php
similarity index 100%
rename from component/admin/contentelements/language.config.php
rename to admin/contentelements/language.config.php
diff --git a/component/admin/contentelements/languages.xml b/admin/contentelements/languages.xml
similarity index 100%
rename from component/admin/contentelements/languages.xml
rename to admin/contentelements/languages.xml
diff --git a/component/admin/contentelements/menu.xml b/admin/contentelements/menu.xml
similarity index 100%
rename from component/admin/contentelements/menu.xml
rename to admin/contentelements/menu.xml
diff --git a/component/admin/contentelements/modules.xml b/admin/contentelements/modules.xml
similarity index 100%
rename from component/admin/contentelements/modules.xml
rename to admin/contentelements/modules.xml
diff --git a/component/admin/contentelements/newsfeeds.xml b/admin/contentelements/newsfeeds.xml
similarity index 100%
rename from component/admin/contentelements/newsfeeds.xml
rename to admin/contentelements/newsfeeds.xml
diff --git a/component/admin/contentelements/translationJfkeywordFilter.php b/admin/contentelements/translationJfkeywordFilter.php
similarity index 100%
rename from component/admin/contentelements/translationJfkeywordFilter.php
rename to admin/contentelements/translationJfkeywordFilter.php
diff --git a/component/admin/contentelements/users.xml b/admin/contentelements/users.xml
similarity index 100%
rename from component/admin/contentelements/users.xml
rename to admin/contentelements/users.xml
diff --git a/component/admin/contentelements/weblinks.xml b/admin/contentelements/weblinks.xml
similarity index 100%
rename from component/admin/contentelements/weblinks.xml
rename to admin/contentelements/weblinks.xml
diff --git a/component/admin/controller.php b/admin/controller.php
similarity index 100%
rename from component/admin/controller.php
rename to admin/controller.php
diff --git a/component/admin/controllers/cpanel.php b/admin/controllers/cpanel.php
similarity index 100%
rename from component/admin/controllers/cpanel.php
rename to admin/controllers/cpanel.php
diff --git a/component/admin/controllers/elements.php b/admin/controllers/elements.php
similarity index 100%
rename from component/admin/controllers/elements.php
rename to admin/controllers/elements.php
diff --git a/component/admin/controllers/help.php b/admin/controllers/help.php
similarity index 100%
rename from component/admin/controllers/help.php
rename to admin/controllers/help.php
diff --git a/component/admin/controllers/index.html b/admin/controllers/index.html
similarity index 100%
rename from component/admin/controllers/index.html
rename to admin/controllers/index.html
diff --git a/component/admin/controllers/languages.php b/admin/controllers/languages.php
similarity index 100%
rename from component/admin/controllers/languages.php
rename to admin/controllers/languages.php
diff --git a/component/admin/controllers/manage.php b/admin/controllers/manage.php
similarity index 100%
rename from component/admin/controllers/manage.php
rename to admin/controllers/manage.php
diff --git a/component/admin/controllers/plugin.php b/admin/controllers/plugin.php
similarity index 100%
rename from component/admin/controllers/plugin.php
rename to admin/controllers/plugin.php
diff --git a/component/admin/controllers/statistics.php b/admin/controllers/statistics.php
similarity index 100%
rename from component/admin/controllers/statistics.php
rename to admin/controllers/statistics.php
diff --git a/component/admin/controllers/translate.php b/admin/controllers/translate.php
similarity index 100%
rename from component/admin/controllers/translate.php
rename to admin/controllers/translate.php
diff --git a/component/admin/documentation/CHANGELOG.php b/admin/documentation/CHANGELOG.php
similarity index 100%
rename from component/admin/documentation/CHANGELOG.php
rename to admin/documentation/CHANGELOG.php
diff --git a/component/admin/documentation/COPYRIGHT.php b/admin/documentation/COPYRIGHT.php
similarity index 100%
rename from component/admin/documentation/COPYRIGHT.php
rename to admin/documentation/COPYRIGHT.php
diff --git a/component/admin/documentation/LICENSE.php b/admin/documentation/LICENSE.php
similarity index 100%
rename from component/admin/documentation/LICENSE.php
rename to admin/documentation/LICENSE.php
diff --git a/component/admin/documentation/README.php b/admin/documentation/README.php
similarity index 100%
rename from component/admin/documentation/README.php
rename to admin/documentation/README.php
diff --git a/component/admin/documentation/index.html b/admin/documentation/index.html
similarity index 100%
rename from component/admin/documentation/index.html
rename to admin/documentation/index.html
diff --git a/component/admin/editors/fckeditor.php b/admin/editors/fckeditor.php
similarity index 100%
rename from component/admin/editors/fckeditor.php
rename to admin/editors/fckeditor.php
diff --git a/component/admin/editors/htmlarea3_xtd.php b/admin/editors/htmlarea3_xtd.php
similarity index 100%
rename from component/admin/editors/htmlarea3_xtd.php
rename to admin/editors/htmlarea3_xtd.php
diff --git a/component/admin/editors/index.html b/admin/editors/index.html
similarity index 100%
rename from component/admin/editors/index.html
rename to admin/editors/index.html
diff --git a/component/admin/editors/jce.php b/admin/editors/jce.php
similarity index 100%
rename from component/admin/editors/jce.php
rename to admin/editors/jce.php
diff --git a/component/admin/editors/jeditor.php b/admin/editors/jeditor.php
similarity index 100%
rename from component/admin/editors/jeditor.php
rename to admin/editors/jeditor.php
diff --git a/component/admin/editors/spaw.php b/admin/editors/spaw.php
similarity index 100%
rename from component/admin/editors/spaw.php
rename to admin/editors/spaw.php
diff --git a/component/admin/editors/tinymce.php b/admin/editors/tinymce.php
similarity index 100%
rename from component/admin/editors/tinymce.php
rename to admin/editors/tinymce.php
diff --git a/component/admin/editors/tmedit.php b/admin/editors/tmedit.php
similarity index 100%
rename from component/admin/editors/tmedit.php
rename to admin/editors/tmedit.php
diff --git a/component/admin/editors/wysiwygpro.php b/admin/editors/wysiwygpro.php
similarity index 100%
rename from component/admin/editors/wysiwygpro.php
rename to admin/editors/wysiwygpro.php
diff --git a/component/admin/editors/xinha.php b/admin/editors/xinha.php
similarity index 100%
rename from component/admin/editors/xinha.php
rename to admin/editors/xinha.php
diff --git a/component/admin/editors/xstandard.php b/admin/editors/xstandard.php
similarity index 100%
rename from component/admin/editors/xstandard.php
rename to admin/editors/xstandard.php
diff --git a/component/admin/help/en-GB/help.default_sidemenu.html b/admin/help/en-GB/help.default_sidemenu.html
similarity index 100%
rename from component/admin/help/en-GB/help.default_sidemenu.html
rename to admin/help/en-GB/help.default_sidemenu.html
diff --git a/component/admin/help/en-GB/help.overview.html b/admin/help/en-GB/help.overview.html
similarity index 100%
rename from component/admin/help/en-GB/help.overview.html
rename to admin/help/en-GB/help.overview.html
diff --git a/component/admin/help/en-GB/index.html b/admin/help/en-GB/index.html
similarity index 100%
rename from component/admin/help/en-GB/index.html
rename to admin/help/en-GB/index.html
diff --git a/component/admin/help/en-GB/postinstall.html b/admin/help/en-GB/postinstall.html
similarity index 100%
rename from component/admin/help/en-GB/postinstall.html
rename to admin/help/en-GB/postinstall.html
diff --git a/component/admin/help/en-GB/screen.cpanel.html b/admin/help/en-GB/screen.cpanel.html
similarity index 100%
rename from component/admin/help/en-GB/screen.cpanel.html
rename to admin/help/en-GB/screen.cpanel.html
diff --git a/component/admin/help/en-GB/screen.elements.html b/admin/help/en-GB/screen.elements.html
similarity index 100%
rename from component/admin/help/en-GB/screen.elements.html
rename to admin/help/en-GB/screen.elements.html
diff --git a/component/admin/help/en-GB/screen.languages.html b/admin/help/en-GB/screen.languages.html
similarity index 100%
rename from component/admin/help/en-GB/screen.languages.html
rename to admin/help/en-GB/screen.languages.html
diff --git a/component/admin/help/en-GB/screen.manage.html b/admin/help/en-GB/screen.manage.html
similarity index 100%
rename from component/admin/help/en-GB/screen.manage.html
rename to admin/help/en-GB/screen.manage.html
diff --git a/component/admin/help/en-GB/screen.statistics.html b/admin/help/en-GB/screen.statistics.html
similarity index 100%
rename from component/admin/help/en-GB/screen.statistics.html
rename to admin/help/en-GB/screen.statistics.html
diff --git a/component/admin/help/en-GB/screen.translate.edit.html b/admin/help/en-GB/screen.translate.edit.html
similarity index 100%
rename from component/admin/help/en-GB/screen.translate.edit.html
rename to admin/help/en-GB/screen.translate.edit.html
diff --git a/component/admin/help/en-GB/screen.translate.orphans.html b/admin/help/en-GB/screen.translate.orphans.html
similarity index 100%
rename from component/admin/help/en-GB/screen.translate.orphans.html
rename to admin/help/en-GB/screen.translate.orphans.html
diff --git a/component/admin/help/en-GB/screen.translate.overview.html b/admin/help/en-GB/screen.translate.overview.html
similarity index 100%
rename from component/admin/help/en-GB/screen.translate.overview.html
rename to admin/help/en-GB/screen.translate.overview.html
diff --git a/component/admin/help/index.html b/admin/help/index.html
similarity index 100%
rename from component/admin/help/index.html
rename to admin/help/index.html
diff --git a/component/admin/helpers/content.php b/admin/helpers/content.php
similarity index 100%
rename from component/admin/helpers/content.php
rename to admin/helpers/content.php
diff --git a/component/admin/helpers/controllerHelper.php b/admin/helpers/controllerHelper.php
similarity index 100%
rename from component/admin/helpers/controllerHelper.php
rename to admin/helpers/controllerHelper.php
diff --git a/component/admin/helpers/extensionHelper.php b/admin/helpers/extensionHelper.php
similarity index 100%
rename from component/admin/helpers/extensionHelper.php
rename to admin/helpers/extensionHelper.php
diff --git a/component/admin/helpers/index.html b/admin/helpers/index.html
similarity index 100%
rename from component/admin/helpers/index.html
rename to admin/helpers/index.html
diff --git a/component/admin/helpers/jfinstaller.php b/admin/helpers/jfinstaller.php
similarity index 100%
rename from component/admin/helpers/jfinstaller.php
rename to admin/helpers/jfinstaller.php
diff --git a/component/admin/helpers/menus.php b/admin/helpers/menus.php
similarity index 100%
rename from component/admin/helpers/menus.php
rename to admin/helpers/menus.php
diff --git a/component/admin/helpers/modules.php b/admin/helpers/modules.php
similarity index 100%
rename from component/admin/helpers/modules.php
rename to admin/helpers/modules.php
diff --git a/component/admin/index.html b/admin/index.html
similarity index 100%
rename from component/admin/index.html
rename to admin/index.html
diff --git a/component/admin/install/index.html b/admin/install/index.html
similarity index 100%
rename from component/admin/install/index.html
rename to admin/install/index.html
diff --git a/component/admin/install/install.mysql.sql b/admin/install/install.mysql.sql
similarity index 100%
rename from component/admin/install/install.mysql.sql
rename to admin/install/install.mysql.sql
diff --git a/component/admin/install/install.mysql.utf8.sql b/admin/install/install.mysql.utf8.sql
similarity index 100%
rename from component/admin/install/install.mysql.utf8.sql
rename to admin/install/install.mysql.utf8.sql
diff --git a/component/admin/install/upgrade.mysql.utf8.sql b/admin/install/upgrade.mysql.utf8.sql
similarity index 100%
rename from component/admin/install/upgrade.mysql.utf8.sql
rename to admin/install/upgrade.mysql.utf8.sql
diff --git a/component/admin/joomfish.php b/admin/joomfish.php
similarity index 100%
rename from component/admin/joomfish.php
rename to admin/joomfish.php
diff --git a/component/admin/language/en-GB/en-GB.com_joomfish.ini b/admin/language/en-GB/en-GB.com_joomfish.ini
similarity index 100%
rename from component/admin/language/en-GB/en-GB.com_joomfish.ini
rename to admin/language/en-GB/en-GB.com_joomfish.ini
diff --git a/component/admin/language/en-GB/en-GB.com_joomfish.sys.ini b/admin/language/en-GB/en-GB.com_joomfish.sys.ini
similarity index 100%
rename from component/admin/language/en-GB/en-GB.com_joomfish.sys.ini
rename to admin/language/en-GB/en-GB.com_joomfish.sys.ini
diff --git a/component/admin/models/ContentElement.php b/admin/models/ContentElement.php
similarity index 100%
rename from component/admin/models/ContentElement.php
rename to admin/models/ContentElement.php
diff --git a/component/admin/models/ContentElementTable.php b/admin/models/ContentElementTable.php
similarity index 100%
rename from component/admin/models/ContentElementTable.php
rename to admin/models/ContentElementTable.php
diff --git a/component/admin/models/ContentElementTableField.php b/admin/models/ContentElementTableField.php
similarity index 100%
rename from component/admin/models/ContentElementTableField.php
rename to admin/models/ContentElementTableField.php
diff --git a/component/admin/models/JFContent.php b/admin/models/JFContent.php
similarity index 100%
rename from component/admin/models/JFContent.php
rename to admin/models/JFContent.php
diff --git a/component/admin/models/JFContentModelItem.php b/admin/models/JFContentModelItem.php
similarity index 100%
rename from component/admin/models/JFContentModelItem.php
rename to admin/models/JFContentModelItem.php
diff --git a/component/admin/models/JFMenusModelItem.php b/admin/models/JFMenusModelItem.php
similarity index 100%
rename from component/admin/models/JFMenusModelItem.php
rename to admin/models/JFMenusModelItem.php
diff --git a/component/admin/models/JFModel.php b/admin/models/JFModel.php
similarity index 100%
rename from component/admin/models/JFModel.php
rename to admin/models/JFModel.php
diff --git a/component/admin/models/JFModuleModelItem.php b/admin/models/JFModuleModelItem.php
similarity index 100%
rename from component/admin/models/JFModuleModelItem.php
rename to admin/models/JFModuleModelItem.php
diff --git a/component/admin/models/TranslateParams.php b/admin/models/TranslateParams.php
similarity index 100%
rename from component/admin/models/TranslateParams.php
rename to admin/models/TranslateParams.php
diff --git a/component/admin/models/TranslationFilter.php b/admin/models/TranslationFilter.php
similarity index 100%
rename from component/admin/models/TranslationFilter.php
rename to admin/models/TranslationFilter.php
diff --git a/component/admin/models/TranslationObject.php b/admin/models/TranslationObject.php
similarity index 100%
rename from component/admin/models/TranslationObject.php
rename to admin/models/TranslationObject.php
diff --git a/component/admin/models/TranslationObjectContent.php b/admin/models/TranslationObjectContent.php
similarity index 100%
rename from component/admin/models/TranslationObjectContent.php
rename to admin/models/TranslationObjectContent.php
diff --git a/component/admin/models/TranslationObjectMenu.php b/admin/models/TranslationObjectMenu.php
similarity index 100%
rename from component/admin/models/TranslationObjectMenu.php
rename to admin/models/TranslationObjectMenu.php
diff --git a/component/admin/models/cpanel.php b/admin/models/cpanel.php
similarity index 100%
rename from component/admin/models/cpanel.php
rename to admin/models/cpanel.php
diff --git a/component/admin/models/iJFTranslatable.php b/admin/models/iJFTranslatable.php
similarity index 100%
rename from component/admin/models/iJFTranslatable.php
rename to admin/models/iJFTranslatable.php
diff --git a/component/admin/models/index.html b/admin/models/index.html
similarity index 100%
rename from component/admin/models/index.html
rename to admin/models/index.html
diff --git a/component/admin/models/languages.php b/admin/models/languages.php
similarity index 100%
rename from component/admin/models/languages.php
rename to admin/models/languages.php
diff --git a/component/admin/models/manage.php b/admin/models/manage.php
similarity index 100%
rename from component/admin/models/manage.php
rename to admin/models/manage.php
diff --git a/component/admin/models/statistics.php b/admin/models/statistics.php
similarity index 100%
rename from component/admin/models/statistics.php
rename to admin/models/statistics.php
diff --git a/component/admin/models/translate.php b/admin/models/translate.php
similarity index 100%
rename from component/admin/models/translate.php
rename to admin/models/translate.php
diff --git a/component/admin/tables/JFContent.php b/admin/tables/JFContent.php
similarity index 100%
rename from component/admin/tables/JFContent.php
rename to admin/tables/JFContent.php
diff --git a/component/admin/tables/JFLanguage.php b/admin/tables/JFLanguage.php
similarity index 100%
rename from component/admin/tables/JFLanguage.php
rename to admin/tables/JFLanguage.php
diff --git a/component/admin/tables/JFLanguageExt.php b/admin/tables/JFLanguageExt.php
similarity index 100%
rename from component/admin/tables/JFLanguageExt.php
rename to admin/tables/JFLanguageExt.php
diff --git a/component/admin/tables/JLanguage.php b/admin/tables/JLanguage.php
similarity index 100%
rename from component/admin/tables/JLanguage.php
rename to admin/tables/JLanguage.php
diff --git a/component/admin/tables/index.html b/admin/tables/index.html
similarity index 100%
rename from component/admin/tables/index.html
rename to admin/tables/index.html
diff --git a/component/admin/version.php b/admin/version.php
similarity index 100%
rename from component/admin/version.php
rename to admin/version.php
diff --git a/component/admin/views/cpanel/index.html b/admin/views/cpanel/index.html
similarity index 100%
rename from component/admin/views/cpanel/index.html
rename to admin/views/cpanel/index.html
diff --git a/component/admin/views/cpanel/tmpl/default.php b/admin/views/cpanel/tmpl/default.php
similarity index 100%
rename from component/admin/views/cpanel/tmpl/default.php
rename to admin/views/cpanel/tmpl/default.php
diff --git a/component/admin/views/cpanel/tmpl/default_information.php b/admin/views/cpanel/tmpl/default_information.php
similarity index 100%
rename from component/admin/views/cpanel/tmpl/default_information.php
rename to admin/views/cpanel/tmpl/default_information.php
diff --git a/component/admin/views/cpanel/tmpl/default_jfnews.php b/admin/views/cpanel/tmpl/default_jfnews.php
similarity index 100%
rename from component/admin/views/cpanel/tmpl/default_jfnews.php
rename to admin/views/cpanel/tmpl/default_jfnews.php
diff --git a/component/admin/views/cpanel/tmpl/index.html b/admin/views/cpanel/tmpl/index.html
similarity index 100%
rename from component/admin/views/cpanel/tmpl/index.html
rename to admin/views/cpanel/tmpl/index.html
diff --git a/component/admin/views/cpanel/tmpl/usersplash.php b/admin/views/cpanel/tmpl/usersplash.php
similarity index 100%
rename from component/admin/views/cpanel/tmpl/usersplash.php
rename to admin/views/cpanel/tmpl/usersplash.php
diff --git a/component/admin/views/cpanel/view.php b/admin/views/cpanel/view.php
similarity index 100%
rename from component/admin/views/cpanel/view.php
rename to admin/views/cpanel/view.php
diff --git a/component/admin/views/default/index.html b/admin/views/default/index.html
similarity index 100%
rename from component/admin/views/default/index.html
rename to admin/views/default/index.html
diff --git a/component/admin/views/default/tmpl/default_message.php b/admin/views/default/tmpl/default_message.php
similarity index 100%
rename from component/admin/views/default/tmpl/default_message.php
rename to admin/views/default/tmpl/default_message.php
diff --git a/component/admin/views/default/tmpl/index.html b/admin/views/default/tmpl/index.html
similarity index 100%
rename from component/admin/views/default/tmpl/index.html
rename to admin/views/default/tmpl/index.html
diff --git a/component/admin/views/default/view.php b/admin/views/default/view.php
similarity index 100%
rename from component/admin/views/default/view.php
rename to admin/views/default/view.php
diff --git a/component/admin/views/elements/index.html b/admin/views/elements/index.html
similarity index 100%
rename from component/admin/views/elements/index.html
rename to admin/views/elements/index.html
diff --git a/component/admin/views/elements/tmpl/default.php b/admin/views/elements/tmpl/default.php
similarity index 100%
rename from component/admin/views/elements/tmpl/default.php
rename to admin/views/elements/tmpl/default.php
diff --git a/component/admin/views/elements/tmpl/default_list.php b/admin/views/elements/tmpl/default_list.php
similarity index 100%
rename from component/admin/views/elements/tmpl/default_list.php
rename to admin/views/elements/tmpl/default_list.php
diff --git a/component/admin/views/elements/tmpl/edit.php b/admin/views/elements/tmpl/edit.php
similarity index 100%
rename from component/admin/views/elements/tmpl/edit.php
rename to admin/views/elements/tmpl/edit.php
diff --git a/component/admin/views/elements/tmpl/index.html b/admin/views/elements/tmpl/index.html
similarity index 100%
rename from component/admin/views/elements/tmpl/index.html
rename to admin/views/elements/tmpl/index.html
diff --git a/component/admin/views/elements/tmpl/installer.php b/admin/views/elements/tmpl/installer.php
similarity index 100%
rename from component/admin/views/elements/tmpl/installer.php
rename to admin/views/elements/tmpl/installer.php
diff --git a/component/admin/views/elements/view.php b/admin/views/elements/view.php
similarity index 100%
rename from component/admin/views/elements/view.php
rename to admin/views/elements/view.php
diff --git a/component/admin/views/help/index.html b/admin/views/help/index.html
similarity index 100%
rename from component/admin/views/help/index.html
rename to admin/views/help/index.html
diff --git a/component/admin/views/help/tmpl/default.php b/admin/views/help/tmpl/default.php
similarity index 100%
rename from component/admin/views/help/tmpl/default.php
rename to admin/views/help/tmpl/default.php
diff --git a/component/admin/views/help/tmpl/default_credits.php b/admin/views/help/tmpl/default_credits.php
similarity index 100%
rename from component/admin/views/help/tmpl/default_credits.php
rename to admin/views/help/tmpl/default_credits.php
diff --git a/component/admin/views/help/tmpl/default_sidemenu.php b/admin/views/help/tmpl/default_sidemenu.php
similarity index 100%
rename from component/admin/views/help/tmpl/default_sidemenu.php
rename to admin/views/help/tmpl/default_sidemenu.php
diff --git a/component/admin/views/help/tmpl/index.html b/admin/views/help/tmpl/index.html
similarity index 100%
rename from component/admin/views/help/tmpl/index.html
rename to admin/views/help/tmpl/index.html
diff --git a/component/admin/views/help/tmpl/information.php b/admin/views/help/tmpl/information.php
similarity index 100%
rename from component/admin/views/help/tmpl/information.php
rename to admin/views/help/tmpl/information.php
diff --git a/component/admin/views/help/tmpl/postinstall.php b/admin/views/help/tmpl/postinstall.php
similarity index 100%
rename from component/admin/views/help/tmpl/postinstall.php
rename to admin/views/help/tmpl/postinstall.php
diff --git a/component/admin/views/help/view.php b/admin/views/help/view.php
similarity index 100%
rename from component/admin/views/help/view.php
rename to admin/views/help/view.php
diff --git a/component/admin/views/index.html b/admin/views/index.html
similarity index 100%
rename from component/admin/views/index.html
rename to admin/views/index.html
diff --git a/component/admin/views/languages/index.html b/admin/views/languages/index.html
similarity index 100%
rename from component/admin/views/languages/index.html
rename to admin/views/languages/index.html
diff --git a/component/admin/views/languages/tmpl/default.php b/admin/views/languages/tmpl/default.php
similarity index 100%
rename from component/admin/views/languages/tmpl/default.php
rename to admin/views/languages/tmpl/default.php
diff --git a/component/admin/views/languages/tmpl/filebrowser.php b/admin/views/languages/tmpl/filebrowser.php
similarity index 100%
rename from component/admin/views/languages/tmpl/filebrowser.php
rename to admin/views/languages/tmpl/filebrowser.php
diff --git a/component/admin/views/languages/tmpl/index.html b/admin/views/languages/tmpl/index.html
similarity index 100%
rename from component/admin/views/languages/tmpl/index.html
rename to admin/views/languages/tmpl/index.html
diff --git a/component/admin/views/languages/tmpl/translateconfig.php b/admin/views/languages/tmpl/translateconfig.php
similarity index 100%
rename from component/admin/views/languages/tmpl/translateconfig.php
rename to admin/views/languages/tmpl/translateconfig.php
diff --git a/component/admin/views/languages/view.php b/admin/views/languages/view.php
similarity index 100%
rename from component/admin/views/languages/view.php
rename to admin/views/languages/view.php
diff --git a/component/admin/views/manage/index.html b/admin/views/manage/index.html
similarity index 100%
rename from component/admin/views/manage/index.html
rename to admin/views/manage/index.html
diff --git a/component/admin/views/manage/tmpl/default.php b/admin/views/manage/tmpl/default.php
similarity index 100%
rename from component/admin/views/manage/tmpl/default.php
rename to admin/views/manage/tmpl/default.php
diff --git a/component/admin/views/manage/tmpl/index.html b/admin/views/manage/tmpl/index.html
similarity index 100%
rename from component/admin/views/manage/tmpl/index.html
rename to admin/views/manage/tmpl/index.html
diff --git a/component/admin/views/manage/tmpl/result.php b/admin/views/manage/tmpl/result.php
similarity index 100%
rename from component/admin/views/manage/tmpl/result.php
rename to admin/views/manage/tmpl/result.php
diff --git a/component/admin/views/manage/view.php b/admin/views/manage/view.php
similarity index 100%
rename from component/admin/views/manage/view.php
rename to admin/views/manage/view.php
diff --git a/component/admin/views/statistics/index.html b/admin/views/statistics/index.html
similarity index 100%
rename from component/admin/views/statistics/index.html
rename to admin/views/statistics/index.html
diff --git a/component/admin/views/statistics/tmpl/default.php b/admin/views/statistics/tmpl/default.php
similarity index 100%
rename from component/admin/views/statistics/tmpl/default.php
rename to admin/views/statistics/tmpl/default.php
diff --git a/component/admin/views/statistics/tmpl/index.html b/admin/views/statistics/tmpl/index.html
similarity index 100%
rename from component/admin/views/statistics/tmpl/index.html
rename to admin/views/statistics/tmpl/index.html
diff --git a/component/admin/views/statistics/tmpl/result.php b/admin/views/statistics/tmpl/result.php
similarity index 100%
rename from component/admin/views/statistics/tmpl/result.php
rename to admin/views/statistics/tmpl/result.php
diff --git a/component/admin/views/statistics/view.php b/admin/views/statistics/view.php
similarity index 100%
rename from component/admin/views/statistics/view.php
rename to admin/views/statistics/view.php
diff --git a/component/admin/views/translate/index.html b/admin/views/translate/index.html
similarity index 100%
rename from component/admin/views/translate/index.html
rename to admin/views/translate/index.html
diff --git a/component/admin/views/translate/tmpl/default.php b/admin/views/translate/tmpl/default.php
similarity index 100%
rename from component/admin/views/translate/tmpl/default.php
rename to admin/views/translate/tmpl/default.php
diff --git a/component/admin/views/translate/tmpl/default_list.php b/admin/views/translate/tmpl/default_list.php
similarity index 100%
rename from component/admin/views/translate/tmpl/default_list.php
rename to admin/views/translate/tmpl/default_list.php
diff --git a/component/admin/views/translate/tmpl/default_noselection.php b/admin/views/translate/tmpl/default_noselection.php
similarity index 100%
rename from component/admin/views/translate/tmpl/default_noselection.php
rename to admin/views/translate/tmpl/default_noselection.php
diff --git a/component/admin/views/translate/tmpl/edit.php b/admin/views/translate/tmpl/edit.php
similarity index 100%
rename from component/admin/views/translate/tmpl/edit.php
rename to admin/views/translate/tmpl/edit.php
diff --git a/component/admin/views/translate/tmpl/edit_message.php b/admin/views/translate/tmpl/edit_message.php
similarity index 100%
rename from component/admin/views/translate/tmpl/edit_message.php
rename to admin/views/translate/tmpl/edit_message.php
diff --git a/component/admin/views/translate/tmpl/index.html b/admin/views/translate/tmpl/index.html
similarity index 100%
rename from component/admin/views/translate/tmpl/index.html
rename to admin/views/translate/tmpl/index.html
diff --git a/component/admin/views/translate/tmpl/originalvalue.php b/admin/views/translate/tmpl/originalvalue.php
similarity index 100%
rename from component/admin/views/translate/tmpl/originalvalue.php
rename to admin/views/translate/tmpl/originalvalue.php
diff --git a/component/admin/views/translate/tmpl/orphandetail.php b/admin/views/translate/tmpl/orphandetail.php
similarity index 100%
rename from component/admin/views/translate/tmpl/orphandetail.php
rename to admin/views/translate/tmpl/orphandetail.php
diff --git a/component/admin/views/translate/tmpl/orphans.php b/admin/views/translate/tmpl/orphans.php
similarity index 100%
rename from component/admin/views/translate/tmpl/orphans.php
rename to admin/views/translate/tmpl/orphans.php
diff --git a/component/admin/views/translate/tmpl/preview.php b/admin/views/translate/tmpl/preview.php
similarity index 100%
rename from component/admin/views/translate/tmpl/preview.php
rename to admin/views/translate/tmpl/preview.php
diff --git a/component/admin/views/translate/view.php b/admin/views/translate/view.php
similarity index 100%
rename from component/admin/views/translate/view.php
rename to admin/views/translate/view.php
diff --git a/component/manifest.xml b/manifest.xml
similarity index 100%
rename from component/manifest.xml
rename to manifest.xml
diff --git a/component/media/default/flags/ba.gif b/media/default/flags/ba.gif
similarity index 100%
rename from component/media/default/flags/ba.gif
rename to media/default/flags/ba.gif
diff --git a/component/media/default/flags/be.gif b/media/default/flags/be.gif
similarity index 100%
rename from component/media/default/flags/be.gif
rename to media/default/flags/be.gif
diff --git a/component/media/default/flags/bg.gif b/media/default/flags/bg.gif
similarity index 100%
rename from component/media/default/flags/bg.gif
rename to media/default/flags/bg.gif
diff --git a/component/media/default/flags/br.gif b/media/default/flags/br.gif
similarity index 100%
rename from component/media/default/flags/br.gif
rename to media/default/flags/br.gif
diff --git a/component/media/default/flags/cr.gif b/media/default/flags/cr.gif
similarity index 100%
rename from component/media/default/flags/cr.gif
rename to media/default/flags/cr.gif
diff --git a/component/media/default/flags/cs.gif b/media/default/flags/cs.gif
similarity index 100%
rename from component/media/default/flags/cs.gif
rename to media/default/flags/cs.gif
diff --git a/component/media/default/flags/cy.gif b/media/default/flags/cy.gif
similarity index 100%
rename from component/media/default/flags/cy.gif
rename to media/default/flags/cy.gif
diff --git a/component/media/default/flags/cz.gif b/media/default/flags/cz.gif
similarity index 100%
rename from component/media/default/flags/cz.gif
rename to media/default/flags/cz.gif
diff --git a/component/media/default/flags/da.gif b/media/default/flags/da.gif
similarity index 100%
rename from component/media/default/flags/da.gif
rename to media/default/flags/da.gif
diff --git a/component/media/default/flags/de.gif b/media/default/flags/de.gif
similarity index 100%
rename from component/media/default/flags/de.gif
rename to media/default/flags/de.gif
diff --git a/component/media/default/flags/eeu.gif b/media/default/flags/eeu.gif
similarity index 100%
rename from component/media/default/flags/eeu.gif
rename to media/default/flags/eeu.gif
diff --git a/component/media/default/flags/eg.gif b/media/default/flags/eg.gif
similarity index 100%
rename from component/media/default/flags/eg.gif
rename to media/default/flags/eg.gif
diff --git a/component/media/default/flags/el.gif b/media/default/flags/el.gif
similarity index 100%
rename from component/media/default/flags/el.gif
rename to media/default/flags/el.gif
diff --git a/component/media/default/flags/en.gif b/media/default/flags/en.gif
similarity index 100%
rename from component/media/default/flags/en.gif
rename to media/default/flags/en.gif
diff --git a/component/media/default/flags/es.gif b/media/default/flags/es.gif
similarity index 100%
rename from component/media/default/flags/es.gif
rename to media/default/flags/es.gif
diff --git a/component/media/default/flags/et.gif b/media/default/flags/et.gif
similarity index 100%
rename from component/media/default/flags/et.gif
rename to media/default/flags/et.gif
diff --git a/component/media/default/flags/fi.gif b/media/default/flags/fi.gif
similarity index 100%
rename from component/media/default/flags/fi.gif
rename to media/default/flags/fi.gif
diff --git a/component/media/default/flags/fr.gif b/media/default/flags/fr.gif
similarity index 100%
rename from component/media/default/flags/fr.gif
rename to media/default/flags/fr.gif
diff --git a/component/media/default/flags/gr.gif b/media/default/flags/gr.gif
similarity index 100%
rename from component/media/default/flags/gr.gif
rename to media/default/flags/gr.gif
diff --git a/component/media/default/flags/gv.gif b/media/default/flags/gv.gif
similarity index 100%
rename from component/media/default/flags/gv.gif
rename to media/default/flags/gv.gif
diff --git a/component/media/default/flags/he.gif b/media/default/flags/he.gif
similarity index 100%
rename from component/media/default/flags/he.gif
rename to media/default/flags/he.gif
diff --git a/component/media/default/flags/hr.gif b/media/default/flags/hr.gif
similarity index 100%
rename from component/media/default/flags/hr.gif
rename to media/default/flags/hr.gif
diff --git a/component/media/default/flags/hu.gif b/media/default/flags/hu.gif
similarity index 100%
rename from component/media/default/flags/hu.gif
rename to media/default/flags/hu.gif
diff --git a/component/media/default/flags/index.html b/media/default/flags/index.html
similarity index 100%
rename from component/media/default/flags/index.html
rename to media/default/flags/index.html
diff --git a/component/media/default/flags/is.gif b/media/default/flags/is.gif
similarity index 100%
rename from component/media/default/flags/is.gif
rename to media/default/flags/is.gif
diff --git a/component/media/default/flags/it.gif b/media/default/flags/it.gif
similarity index 100%
rename from component/media/default/flags/it.gif
rename to media/default/flags/it.gif
diff --git a/component/media/default/flags/iw.gif b/media/default/flags/iw.gif
similarity index 100%
rename from component/media/default/flags/iw.gif
rename to media/default/flags/iw.gif
diff --git a/component/media/default/flags/ja.gif b/media/default/flags/ja.gif
similarity index 100%
rename from component/media/default/flags/ja.gif
rename to media/default/flags/ja.gif
diff --git a/component/media/default/flags/ka.gif b/media/default/flags/ka.gif
similarity index 100%
rename from component/media/default/flags/ka.gif
rename to media/default/flags/ka.gif
diff --git a/component/media/default/flags/la.gif b/media/default/flags/la.gif
similarity index 100%
rename from component/media/default/flags/la.gif
rename to media/default/flags/la.gif
diff --git a/component/media/default/flags/lt.gif b/media/default/flags/lt.gif
similarity index 100%
rename from component/media/default/flags/lt.gif
rename to media/default/flags/lt.gif
diff --git a/component/media/default/flags/lv.gif b/media/default/flags/lv.gif
similarity index 100%
rename from component/media/default/flags/lv.gif
rename to media/default/flags/lv.gif
diff --git a/component/media/default/flags/md.gif b/media/default/flags/md.gif
similarity index 100%
rename from component/media/default/flags/md.gif
rename to media/default/flags/md.gif
diff --git a/component/media/default/flags/mg.gif b/media/default/flags/mg.gif
similarity index 100%
rename from component/media/default/flags/mg.gif
rename to media/default/flags/mg.gif
diff --git a/component/media/default/flags/mk.gif b/media/default/flags/mk.gif
similarity index 100%
rename from component/media/default/flags/mk.gif
rename to media/default/flags/mk.gif
diff --git a/component/media/default/flags/mt.gif b/media/default/flags/mt.gif
similarity index 100%
rename from component/media/default/flags/mt.gif
rename to media/default/flags/mt.gif
diff --git a/component/media/default/flags/nl.gif b/media/default/flags/nl.gif
similarity index 100%
rename from component/media/default/flags/nl.gif
rename to media/default/flags/nl.gif
diff --git a/component/media/default/flags/no.gif b/media/default/flags/no.gif
similarity index 100%
rename from component/media/default/flags/no.gif
rename to media/default/flags/no.gif
diff --git a/component/media/default/flags/pl.gif b/media/default/flags/pl.gif
similarity index 100%
rename from component/media/default/flags/pl.gif
rename to media/default/flags/pl.gif
diff --git a/component/media/default/flags/pt.gif b/media/default/flags/pt.gif
similarity index 100%
rename from component/media/default/flags/pt.gif
rename to media/default/flags/pt.gif
diff --git a/component/media/default/flags/ro.gif b/media/default/flags/ro.gif
similarity index 100%
rename from component/media/default/flags/ro.gif
rename to media/default/flags/ro.gif
diff --git a/component/media/default/flags/ru.gif b/media/default/flags/ru.gif
similarity index 100%
rename from component/media/default/flags/ru.gif
rename to media/default/flags/ru.gif
diff --git a/component/media/default/flags/se.gif b/media/default/flags/se.gif
similarity index 100%
rename from component/media/default/flags/se.gif
rename to media/default/flags/se.gif
diff --git a/component/media/default/flags/sh.gif b/media/default/flags/sh.gif
similarity index 100%
rename from component/media/default/flags/sh.gif
rename to media/default/flags/sh.gif
diff --git a/component/media/default/flags/sk.gif b/media/default/flags/sk.gif
similarity index 100%
rename from component/media/default/flags/sk.gif
rename to media/default/flags/sk.gif
diff --git a/component/media/default/flags/sl.gif b/media/default/flags/sl.gif
similarity index 100%
rename from component/media/default/flags/sl.gif
rename to media/default/flags/sl.gif
diff --git a/component/media/default/flags/sq.gif b/media/default/flags/sq.gif
similarity index 100%
rename from component/media/default/flags/sq.gif
rename to media/default/flags/sq.gif
diff --git a/component/media/default/flags/sv.gif b/media/default/flags/sv.gif
similarity index 100%
rename from component/media/default/flags/sv.gif
rename to media/default/flags/sv.gif
diff --git a/component/media/default/flags/th.gif b/media/default/flags/th.gif
similarity index 100%
rename from component/media/default/flags/th.gif
rename to media/default/flags/th.gif
diff --git a/component/media/default/flags/tr.gif b/media/default/flags/tr.gif
similarity index 100%
rename from component/media/default/flags/tr.gif
rename to media/default/flags/tr.gif
diff --git a/component/media/default/flags/tw.gif b/media/default/flags/tw.gif
similarity index 100%
rename from component/media/default/flags/tw.gif
rename to media/default/flags/tw.gif
diff --git a/component/media/default/flags/ua.gif b/media/default/flags/ua.gif
similarity index 100%
rename from component/media/default/flags/ua.gif
rename to media/default/flags/ua.gif
diff --git a/component/media/default/flags/uk.gif b/media/default/flags/uk.gif
similarity index 100%
rename from component/media/default/flags/uk.gif
rename to media/default/flags/uk.gif
diff --git a/component/media/default/flags/us.gif b/media/default/flags/us.gif
similarity index 100%
rename from component/media/default/flags/us.gif
rename to media/default/flags/us.gif
diff --git a/component/media/default/flags/zh.gif b/media/default/flags/zh.gif
similarity index 100%
rename from component/media/default/flags/zh.gif
rename to media/default/flags/zh.gif
diff --git a/plugins/jfdatabase/intercept.jdatabasemysql.php b/plugins/system/jfdatabase/intercept.jdatabasemysql.php
similarity index 100%
rename from plugins/jfdatabase/intercept.jdatabasemysql.php
rename to plugins/system/jfdatabase/intercept.jdatabasemysql.php
diff --git a/plugins/jfdatabase/intercept.jdatabasemysqli.php b/plugins/system/jfdatabase/intercept.jdatabasemysqli.php
similarity index 100%
rename from plugins/jfdatabase/intercept.jdatabasemysqli.php
rename to plugins/system/jfdatabase/intercept.jdatabasemysqli.php
diff --git a/plugins/jfdatabase/jfdatabase.php b/plugins/system/jfdatabase/jfdatabase.php
similarity index 100%
rename from plugins/jfdatabase/jfdatabase.php
rename to plugins/system/jfdatabase/jfdatabase.php
diff --git a/plugins/jfdatabase/jfdatabase.xml b/plugins/system/jfdatabase/jfdatabase.xml
similarity index 100%
rename from plugins/jfdatabase/jfdatabase.xml
rename to plugins/system/jfdatabase/jfdatabase.xml
diff --git a/plugins/jfdatabase/jfdatabase_inherit.php b/plugins/system/jfdatabase/jfdatabase_inherit.php
similarity index 100%
rename from plugins/jfdatabase/jfdatabase_inherit.php
rename to plugins/system/jfdatabase/jfdatabase_inherit.php
diff --git a/plugins/jfdatabase/languages/en-GB.plg_system_jfdatabase.ini b/plugins/system/jfdatabase/languages/en-GB.plg_system_jfdatabase.ini
similarity index 100%
rename from plugins/jfdatabase/languages/en-GB.plg_system_jfdatabase.ini
rename to plugins/system/jfdatabase/languages/en-GB.plg_system_jfdatabase.ini
diff --git a/plugins/jfrouter/jfrouter.php b/plugins/system/jfrouter/jfrouter.php
similarity index 100%
rename from plugins/jfrouter/jfrouter.php
rename to plugins/system/jfrouter/jfrouter.php
diff --git a/plugins/jfrouter/jfrouter.xml b/plugins/system/jfrouter/jfrouter.xml
similarity index 100%
rename from plugins/jfrouter/jfrouter.xml
rename to plugins/system/jfrouter/jfrouter.xml
diff --git a/plugins/jfrouter/jfrouter/contact.php b/plugins/system/jfrouter/jfrouter/contact.php
similarity index 100%
rename from plugins/jfrouter/jfrouter/contact.php
rename to plugins/system/jfrouter/jfrouter/contact.php
diff --git a/plugins/jfrouter/jfrouter/elements/index.html b/plugins/system/jfrouter/jfrouter/elements/index.html
similarity index 100%
rename from plugins/jfrouter/jfrouter/elements/index.html
rename to plugins/system/jfrouter/jfrouter/elements/index.html
diff --git a/plugins/jfrouter/jfrouter/elements/sefprefix.php b/plugins/system/jfrouter/jfrouter/elements/sefprefix.php
similarity index 100%
rename from plugins/jfrouter/jfrouter/elements/sefprefix.php
rename to plugins/system/jfrouter/jfrouter/elements/sefprefix.php
diff --git a/plugins/jfrouter/jfrouter/elements/sefsubdomain.php b/plugins/system/jfrouter/jfrouter/elements/sefsubdomain.php
similarity index 100%
rename from plugins/jfrouter/jfrouter/elements/sefsubdomain.php
rename to plugins/system/jfrouter/jfrouter/elements/sefsubdomain.php
diff --git a/plugins/jfrouter/jfrouter/fields/index.html b/plugins/system/jfrouter/jfrouter/fields/index.html
similarity index 100%
rename from plugins/jfrouter/jfrouter/fields/index.html
rename to plugins/system/jfrouter/jfrouter/fields/index.html
diff --git a/plugins/jfrouter/jfrouter/fields/sefprefix.php b/plugins/system/jfrouter/jfrouter/fields/sefprefix.php
similarity index 100%
rename from plugins/jfrouter/jfrouter/fields/sefprefix.php
rename to plugins/system/jfrouter/jfrouter/fields/sefprefix.php
diff --git a/plugins/jfrouter/jfrouter/fields/sefsubdomain.php b/plugins/system/jfrouter/jfrouter/fields/sefsubdomain.php
similarity index 100%
rename from plugins/jfrouter/jfrouter/fields/sefsubdomain.php
rename to plugins/system/jfrouter/jfrouter/fields/sefsubdomain.php
diff --git a/plugins/jfrouter/jfrouter/index.html b/plugins/system/jfrouter/jfrouter/index.html
similarity index 100%
rename from plugins/jfrouter/jfrouter/index.html
rename to plugins/system/jfrouter/jfrouter/index.html
diff --git a/plugins/jfrouter/jfrouter/language/en-GB.plg_system_jfrouter.ini b/plugins/system/jfrouter/jfrouter/language/en-GB.plg_system_jfrouter.ini
similarity index 100%
rename from plugins/jfrouter/jfrouter/language/en-GB.plg_system_jfrouter.ini
rename to plugins/system/jfrouter/jfrouter/language/en-GB.plg_system_jfrouter.ini
diff --git a/component/site/helpers/cache/index.html b/site/helpers/cache/index.html
similarity index 100%
rename from component/site/helpers/cache/index.html
rename to site/helpers/cache/index.html
diff --git a/component/site/helpers/defines.php b/site/helpers/defines.php
similarity index 100%
rename from component/site/helpers/defines.php
rename to site/helpers/defines.php
diff --git a/component/site/helpers/index.html b/site/helpers/index.html
similarity index 100%
rename from component/site/helpers/index.html
rename to site/helpers/index.html
diff --git a/component/site/helpers/joomfish.class.php b/site/helpers/joomfish.class.php
similarity index 100%
rename from component/site/helpers/joomfish.class.php
rename to site/helpers/joomfish.class.php
diff --git a/component/site/images/index.html b/site/images/index.html
similarity index 100%
rename from component/site/images/index.html
rename to site/images/index.html
diff --git a/component/site/images/joomfish.png b/site/images/joomfish.png
similarity index 100%
rename from component/site/images/joomfish.png
rename to site/images/joomfish.png
diff --git a/component/site/images/joomfish_icon.png b/site/images/joomfish_icon.png
similarity index 100%
rename from component/site/images/joomfish_icon.png
rename to site/images/joomfish_icon.png
diff --git a/component/site/images/joomfish_slogan.png b/site/images/joomfish_slogan.png
similarity index 100%
rename from component/site/images/joomfish_slogan.png
rename to site/images/joomfish_slogan.png
diff --git a/component/site/images/status_g.png b/site/images/status_g.png
similarity index 100%
rename from component/site/images/status_g.png
rename to site/images/status_g.png
diff --git a/component/site/images/status_r.png b/site/images/status_r.png
similarity index 100%
rename from component/site/images/status_r.png
rename to site/images/status_r.png
diff --git a/component/site/images/status_y.png b/site/images/status_y.png
similarity index 100%
rename from component/site/images/status_y.png
rename to site/images/status_y.png
diff --git a/component/site/index.html b/site/index.html
similarity index 100%
rename from component/site/index.html
rename to site/index.html
diff --git a/component/site/joomfish.php b/site/joomfish.php
similarity index 100%
rename from component/site/joomfish.php
rename to site/joomfish.php
diff --git a/component/site/language/en-GB/en-GB.com_joomfish.ini b/site/language/en-GB/en-GB.com_joomfish.ini
similarity index 100%
rename from component/site/language/en-GB/en-GB.com_joomfish.ini
rename to site/language/en-GB/en-GB.com_joomfish.ini