diff --git a/Profile/docs/changelog.txt b/src/modules/Profile/docs/changelog.txt
similarity index 100%
rename from Profile/docs/changelog.txt
rename to src/modules/Profile/docs/changelog.txt
diff --git a/Profile/docs/index.html b/src/modules/Profile/docs/index.html
similarity index 100%
rename from Profile/docs/index.html
rename to src/modules/Profile/docs/index.html
diff --git a/Profile/docs/sectionapi.txt b/src/modules/Profile/docs/sectionapi.txt
similarity index 100%
rename from Profile/docs/sectionapi.txt
rename to src/modules/Profile/docs/sectionapi.txt
diff --git a/Profile/docs/todo.txt b/src/modules/Profile/docs/todo.txt
similarity index 100%
rename from Profile/docs/todo.txt
rename to src/modules/Profile/docs/todo.txt
diff --git a/Profile/images/admin.gif b/src/modules/Profile/images/admin.gif
similarity index 100%
rename from Profile/images/admin.gif
rename to src/modules/Profile/images/admin.gif
diff --git a/Profile/images/index.html b/src/modules/Profile/images/index.html
similarity index 100%
rename from Profile/images/index.html
rename to src/modules/Profile/images/index.html
diff --git a/Profile/images/members.gif b/src/modules/Profile/images/members.gif
similarity index 100%
rename from Profile/images/members.gif
rename to src/modules/Profile/images/members.gif
diff --git a/Profile/images/offline.gif b/src/modules/Profile/images/offline.gif
similarity index 100%
rename from Profile/images/offline.gif
rename to src/modules/Profile/images/offline.gif
diff --git a/Profile/images/online.gif b/src/modules/Profile/images/online.gif
similarity index 100%
rename from Profile/images/online.gif
rename to src/modules/Profile/images/online.gif
diff --git a/Profile/javascript/index.html b/src/modules/Profile/javascript/index.html
similarity index 100%
rename from Profile/javascript/index.html
rename to src/modules/Profile/javascript/index.html
diff --git a/Profile/javascript/profile.js b/src/modules/Profile/javascript/profile.js
similarity index 100%
rename from Profile/javascript/profile.js
rename to src/modules/Profile/javascript/profile.js
diff --git a/Profile/javascript/profile_edit_property.js b/src/modules/Profile/javascript/profile_edit_property.js
similarity index 100%
rename from Profile/javascript/profile_edit_property.js
rename to src/modules/Profile/javascript/profile_edit_property.js
diff --git a/Profile/javascript/showavatar.js b/src/modules/Profile/javascript/showavatar.js
similarity index 100%
rename from Profile/javascript/showavatar.js
rename to src/modules/Profile/javascript/showavatar.js
diff --git a/Profile/lib/Profile/Api/Account.php b/src/modules/Profile/lib/Profile/Api/Account.php
similarity index 100%
rename from Profile/lib/Profile/Api/Account.php
rename to src/modules/Profile/lib/Profile/Api/Account.php
diff --git a/Profile/lib/Profile/Api/Admin.php b/src/modules/Profile/lib/Profile/Api/Admin.php
similarity index 100%
rename from Profile/lib/Profile/Api/Admin.php
rename to src/modules/Profile/lib/Profile/Api/Admin.php
diff --git a/Profile/lib/Profile/Api/Dud.php b/src/modules/Profile/lib/Profile/Api/Dud.php
similarity index 100%
rename from Profile/lib/Profile/Api/Dud.php
rename to src/modules/Profile/lib/Profile/Api/Dud.php
diff --git a/Profile/lib/Profile/Api/Memberslist.php b/src/modules/Profile/lib/Profile/Api/Memberslist.php
similarity index 100%
rename from Profile/lib/Profile/Api/Memberslist.php
rename to src/modules/Profile/lib/Profile/Api/Memberslist.php
diff --git a/Profile/lib/Profile/Api/Section.php b/src/modules/Profile/lib/Profile/Api/Section.php
similarity index 100%
rename from Profile/lib/Profile/Api/Section.php
rename to src/modules/Profile/lib/Profile/Api/Section.php
diff --git a/Profile/lib/Profile/Api/User.php b/src/modules/Profile/lib/Profile/Api/User.php
similarity index 100%
rename from Profile/lib/Profile/Api/User.php
rename to src/modules/Profile/lib/Profile/Api/User.php
diff --git a/Profile/lib/Profile/Block/Featureduser.php b/src/modules/Profile/lib/Profile/Block/Featureduser.php
similarity index 100%
rename from Profile/lib/Profile/Block/Featureduser.php
rename to src/modules/Profile/lib/Profile/Block/Featureduser.php
diff --git a/Profile/lib/Profile/Block/Lastseen.php b/src/modules/Profile/lib/Profile/Block/Lastseen.php
similarity index 100%
rename from Profile/lib/Profile/Block/Lastseen.php
rename to src/modules/Profile/lib/Profile/Block/Lastseen.php
diff --git a/Profile/lib/Profile/Block/Lastxusers.php b/src/modules/Profile/lib/Profile/Block/Lastxusers.php
similarity index 100%
rename from Profile/lib/Profile/Block/Lastxusers.php
rename to src/modules/Profile/lib/Profile/Block/Lastxusers.php
diff --git a/Profile/lib/Profile/Block/Membersonline.php b/src/modules/Profile/lib/Profile/Block/Membersonline.php
similarity index 100%
rename from Profile/lib/Profile/Block/Membersonline.php
rename to src/modules/Profile/lib/Profile/Block/Membersonline.php
diff --git a/Profile/lib/Profile/Controller/Admin.php b/src/modules/Profile/lib/Profile/Controller/Admin.php
similarity index 100%
rename from Profile/lib/Profile/Controller/Admin.php
rename to src/modules/Profile/lib/Profile/Controller/Admin.php
diff --git a/Profile/lib/Profile/Controller/Ajax.php b/src/modules/Profile/lib/Profile/Controller/Ajax.php
similarity index 100%
rename from Profile/lib/Profile/Controller/Ajax.php
rename to src/modules/Profile/lib/Profile/Controller/Ajax.php
diff --git a/Profile/lib/Profile/Controller/Form.php b/src/modules/Profile/lib/Profile/Controller/Form.php
similarity index 100%
rename from Profile/lib/Profile/Controller/Form.php
rename to src/modules/Profile/lib/Profile/Controller/Form.php
diff --git a/Profile/lib/Profile/Controller/User.php b/src/modules/Profile/lib/Profile/Controller/User.php
similarity index 100%
rename from Profile/lib/Profile/Controller/User.php
rename to src/modules/Profile/lib/Profile/Controller/User.php
diff --git a/Profile/lib/Profile/Installer.php b/src/modules/Profile/lib/Profile/Installer.php
similarity index 100%
rename from Profile/lib/Profile/Installer.php
rename to src/modules/Profile/lib/Profile/Installer.php
diff --git a/Profile/lib/Profile/Version.php b/src/modules/Profile/lib/Profile/Version.php
similarity index 100%
rename from Profile/lib/Profile/Version.php
rename to src/modules/Profile/lib/Profile/Version.php
diff --git a/Profile/locale/en/LC_MESSAGES/index.html b/src/modules/Profile/locale/en/LC_MESSAGES/index.html
similarity index 100%
rename from Profile/locale/en/LC_MESSAGES/index.html
rename to src/modules/Profile/locale/en/LC_MESSAGES/index.html
diff --git a/Profile/locale/en/LC_MESSAGES/module_profile.mo b/src/modules/Profile/locale/en/LC_MESSAGES/module_profile.mo
similarity index 100%
rename from Profile/locale/en/LC_MESSAGES/module_profile.mo
rename to src/modules/Profile/locale/en/LC_MESSAGES/module_profile.mo
diff --git a/Profile/locale/en/LC_MESSAGES/module_profile.po b/src/modules/Profile/locale/en/LC_MESSAGES/module_profile.po
similarity index 100%
rename from Profile/locale/en/LC_MESSAGES/module_profile.po
rename to src/modules/Profile/locale/en/LC_MESSAGES/module_profile.po
diff --git a/Profile/locale/en/index.html b/src/modules/Profile/locale/en/index.html
similarity index 100%
rename from Profile/locale/en/index.html
rename to src/modules/Profile/locale/en/index.html
diff --git a/Profile/locale/index.html b/src/modules/Profile/locale/index.html
similarity index 100%
rename from Profile/locale/index.html
rename to src/modules/Profile/locale/index.html
diff --git a/Profile/locale/module_profile.pot b/src/modules/Profile/locale/module_profile.pot
similarity index 100%
rename from Profile/locale/module_profile.pot
rename to src/modules/Profile/locale/module_profile.pot
diff --git a/Profile/pnsectionapi/ezcomments.php b/src/modules/Profile/pnsectionapi/ezcomments.php
similarity index 100%
rename from Profile/pnsectionapi/ezcomments.php
rename to src/modules/Profile/pnsectionapi/ezcomments.php
diff --git a/Profile/pnsectionapi/news.php b/src/modules/Profile/pnsectionapi/news.php
similarity index 100%
rename from Profile/pnsectionapi/news.php
rename to src/modules/Profile/pnsectionapi/news.php
diff --git a/Profile/style/index.html b/src/modules/Profile/style/index.html
similarity index 100%
rename from Profile/style/index.html
rename to src/modules/Profile/style/index.html
diff --git a/Profile/style/style.css b/src/modules/Profile/style/style.css
similarity index 100%
rename from Profile/style/style.css
rename to src/modules/Profile/style/style.css
diff --git a/Profile/tables.php b/src/modules/Profile/tables.php
similarity index 100%
rename from Profile/tables.php
rename to src/modules/Profile/tables.php
diff --git a/Profile/templates/plugins/function.duditemdisplay.php b/src/modules/Profile/templates/plugins/function.duditemdisplay.php
similarity index 100%
rename from Profile/templates/plugins/function.duditemdisplay.php
rename to src/modules/Profile/templates/plugins/function.duditemdisplay.php
diff --git a/Profile/templates/plugins/function.duditemmodify.php b/src/modules/Profile/templates/plugins/function.duditemmodify.php
similarity index 100%
rename from Profile/templates/plugins/function.duditemmodify.php
rename to src/modules/Profile/templates/plugins/function.duditemmodify.php
diff --git a/Profile/templates/plugins/function.profilesection.php b/src/modules/Profile/templates/plugins/function.profilesection.php
similarity index 100%
rename from Profile/templates/plugins/function.profilesection.php
rename to src/modules/Profile/templates/plugins/function.profilesection.php
diff --git a/Profile/templates/plugins/function.profileuserlinks.php b/src/modules/Profile/templates/plugins/function.profileuserlinks.php
similarity index 100%
rename from Profile/templates/plugins/function.profileuserlinks.php
rename to src/modules/Profile/templates/plugins/function.profileuserlinks.php
diff --git a/Profile/templates/profile_admin_delete.htm b/src/modules/Profile/templates/profile_admin_delete.htm
similarity index 100%
rename from Profile/templates/profile_admin_delete.htm
rename to src/modules/Profile/templates/profile_admin_delete.htm
diff --git a/Profile/templates/profile_admin_help.htm b/src/modules/Profile/templates/profile_admin_help.htm
similarity index 100%
rename from Profile/templates/profile_admin_help.htm
rename to src/modules/Profile/templates/profile_admin_help.htm
diff --git a/Profile/templates/profile_admin_main.htm b/src/modules/Profile/templates/profile_admin_main.htm
similarity index 100%
rename from Profile/templates/profile_admin_main.htm
rename to src/modules/Profile/templates/profile_admin_main.htm
diff --git a/Profile/templates/profile_admin_menu.htm b/src/modules/Profile/templates/profile_admin_menu.htm
similarity index 100%
rename from Profile/templates/profile_admin_menu.htm
rename to src/modules/Profile/templates/profile_admin_menu.htm
diff --git a/Profile/templates/profile_admin_modify.htm b/src/modules/Profile/templates/profile_admin_modify.htm
similarity index 100%
rename from Profile/templates/profile_admin_modify.htm
rename to src/modules/Profile/templates/profile_admin_modify.htm
diff --git a/Profile/templates/profile_admin_modifyconfig.htm b/src/modules/Profile/templates/profile_admin_modifyconfig.htm
similarity index 100%
rename from Profile/templates/profile_admin_modifyconfig.htm
rename to src/modules/Profile/templates/profile_admin_modifyconfig.htm
diff --git a/Profile/templates/profile_admin_new.htm b/src/modules/Profile/templates/profile_admin_new.htm
similarity index 100%
rename from Profile/templates/profile_admin_new.htm
rename to src/modules/Profile/templates/profile_admin_new.htm
diff --git a/Profile/templates/profile_admin_view.htm b/src/modules/Profile/templates/profile_admin_view.htm
similarity index 100%
rename from Profile/templates/profile_admin_view.htm
rename to src/modules/Profile/templates/profile_admin_view.htm
diff --git a/Profile/templates/profile_block_featureduser.htm b/src/modules/Profile/templates/profile_block_featureduser.htm
similarity index 100%
rename from Profile/templates/profile_block_featureduser.htm
rename to src/modules/Profile/templates/profile_block_featureduser.htm
diff --git a/Profile/templates/profile_block_featureduser_modify.htm b/src/modules/Profile/templates/profile_block_featureduser_modify.htm
similarity index 100%
rename from Profile/templates/profile_block_featureduser_modify.htm
rename to src/modules/Profile/templates/profile_block_featureduser_modify.htm
diff --git a/Profile/templates/profile_block_lastseen.htm b/src/modules/Profile/templates/profile_block_lastseen.htm
similarity index 100%
rename from Profile/templates/profile_block_lastseen.htm
rename to src/modules/Profile/templates/profile_block_lastseen.htm
diff --git a/Profile/templates/profile_block_lastseen_modify.htm b/src/modules/Profile/templates/profile_block_lastseen_modify.htm
similarity index 100%
rename from Profile/templates/profile_block_lastseen_modify.htm
rename to src/modules/Profile/templates/profile_block_lastseen_modify.htm
diff --git a/Profile/templates/profile_block_lastxusers.htm b/src/modules/Profile/templates/profile_block_lastxusers.htm
similarity index 100%
rename from Profile/templates/profile_block_lastxusers.htm
rename to src/modules/Profile/templates/profile_block_lastxusers.htm
diff --git a/Profile/templates/profile_block_lastxusers_modify.htm b/src/modules/Profile/templates/profile_block_lastxusers_modify.htm
similarity index 100%
rename from Profile/templates/profile_block_lastxusers_modify.htm
rename to src/modules/Profile/templates/profile_block_lastxusers_modify.htm
diff --git a/Profile/templates/profile_block_membersonline.htm b/src/modules/Profile/templates/profile_block_membersonline.htm
similarity index 100%
rename from Profile/templates/profile_block_membersonline.htm
rename to src/modules/Profile/templates/profile_block_membersonline.htm
diff --git a/Profile/templates/profile_block_membersonline_modify.htm b/src/modules/Profile/templates/profile_block_membersonline_modify.htm
similarity index 100%
rename from Profile/templates/profile_block_membersonline_modify.htm
rename to src/modules/Profile/templates/profile_block_membersonline_modify.htm
diff --git a/Profile/templates/profile_duddisplay_generic.htm b/src/modules/Profile/templates/profile_duddisplay_generic.htm
similarity index 100%
rename from Profile/templates/profile_duddisplay_generic.htm
rename to src/modules/Profile/templates/profile_duddisplay_generic.htm
diff --git a/Profile/templates/profile_dudedit_checkbox.htm b/src/modules/Profile/templates/profile_dudedit_checkbox.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_checkbox.htm
rename to src/modules/Profile/templates/profile_dudedit_checkbox.htm
diff --git a/Profile/templates/profile_dudedit_date.htm b/src/modules/Profile/templates/profile_dudedit_date.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_date.htm
rename to src/modules/Profile/templates/profile_dudedit_date.htm
diff --git a/Profile/templates/profile_dudedit_hidden.htm b/src/modules/Profile/templates/profile_dudedit_hidden.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_hidden.htm
rename to src/modules/Profile/templates/profile_dudedit_hidden.htm
diff --git a/Profile/templates/profile_dudedit_link.htm b/src/modules/Profile/templates/profile_dudedit_link.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_link.htm
rename to src/modules/Profile/templates/profile_dudedit_link.htm
diff --git a/Profile/templates/profile_dudedit_multicheckbox.htm b/src/modules/Profile/templates/profile_dudedit_multicheckbox.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_multicheckbox.htm
rename to src/modules/Profile/templates/profile_dudedit_multicheckbox.htm
diff --git a/Profile/templates/profile_dudedit_radio.htm b/src/modules/Profile/templates/profile_dudedit_radio.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_radio.htm
rename to src/modules/Profile/templates/profile_dudedit_radio.htm
diff --git a/Profile/templates/profile_dudedit_select.htm b/src/modules/Profile/templates/profile_dudedit_select.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_select.htm
rename to src/modules/Profile/templates/profile_dudedit_select.htm
diff --git a/Profile/templates/profile_dudedit_text.htm b/src/modules/Profile/templates/profile_dudedit_text.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_text.htm
rename to src/modules/Profile/templates/profile_dudedit_text.htm
diff --git a/Profile/templates/profile_dudedit_textarea.htm b/src/modules/Profile/templates/profile_dudedit_textarea.htm
similarity index 100%
rename from Profile/templates/profile_dudedit_textarea.htm
rename to src/modules/Profile/templates/profile_dudedit_textarea.htm
diff --git a/Profile/templates/profile_form_display.htm b/src/modules/Profile/templates/profile_form_display.htm
similarity index 100%
rename from Profile/templates/profile_form_display.htm
rename to src/modules/Profile/templates/profile_form_display.htm
diff --git a/Profile/templates/profile_form_edit.htm b/src/modules/Profile/templates/profile_form_edit.htm
similarity index 100%
rename from Profile/templates/profile_form_edit.htm
rename to src/modules/Profile/templates/profile_form_edit.htm
diff --git a/Profile/templates/profile_user_main.htm b/src/modules/Profile/templates/profile_user_main.htm
similarity index 100%
rename from Profile/templates/profile_user_main.htm
rename to src/modules/Profile/templates/profile_user_main.htm
diff --git a/Profile/templates/profile_user_members_online.htm b/src/modules/Profile/templates/profile_user_members_online.htm
similarity index 100%
rename from Profile/templates/profile_user_members_online.htm
rename to src/modules/Profile/templates/profile_user_members_online.htm
diff --git a/Profile/templates/profile_user_members_recent.htm b/src/modules/Profile/templates/profile_user_members_recent.htm
similarity index 100%
rename from Profile/templates/profile_user_members_recent.htm
rename to src/modules/Profile/templates/profile_user_members_recent.htm
diff --git a/Profile/templates/profile_user_members_view.htm b/src/modules/Profile/templates/profile_user_members_view.htm
similarity index 100%
rename from Profile/templates/profile_user_members_view.htm
rename to src/modules/Profile/templates/profile_user_members_view.htm
diff --git a/Profile/templates/profile_user_menu.htm b/src/modules/Profile/templates/profile_user_menu.htm
similarity index 100%
rename from Profile/templates/profile_user_menu.htm
rename to src/modules/Profile/templates/profile_user_menu.htm
diff --git a/Profile/templates/profile_user_modify.htm b/src/modules/Profile/templates/profile_user_modify.htm
similarity index 100%
rename from Profile/templates/profile_user_modify.htm
rename to src/modules/Profile/templates/profile_user_modify.htm
diff --git a/Profile/templates/profile_user_view.htm b/src/modules/Profile/templates/profile_user_view.htm
similarity index 100%
rename from Profile/templates/profile_user_view.htm
rename to src/modules/Profile/templates/profile_user_view.htm
diff --git a/Profile/templates/profile_user_view_example.htm b/src/modules/Profile/templates/profile_user_view_example.htm
similarity index 100%
rename from Profile/templates/profile_user_view_example.htm
rename to src/modules/Profile/templates/profile_user_view_example.htm
diff --git a/Profile/templates/sections/profile_section_ezcomments.htm b/src/modules/Profile/templates/sections/profile_section_ezcomments.htm
similarity index 100%
rename from Profile/templates/sections/profile_section_ezcomments.htm
rename to src/modules/Profile/templates/sections/profile_section_ezcomments.htm
diff --git a/Profile/templates/sections/profile_section_news.htm b/src/modules/Profile/templates/sections/profile_section_news.htm
similarity index 100%
rename from Profile/templates/sections/profile_section_news.htm
rename to src/modules/Profile/templates/sections/profile_section_news.htm