diff --git a/system/api/Api.php b/api/Api.php
similarity index 100%
rename from system/api/Api.php
rename to api/Api.php
diff --git a/system/api/apiclass.php b/api/apiclass.php
similarity index 100%
rename from system/api/apiclass.php
rename to api/apiclass.php
diff --git a/system/api/apiloginclass.php b/api/apiloginclass.php
similarity index 100%
rename from system/api/apiloginclass.php
rename to api/apiloginclass.php
diff --git a/system/autoload.inc.php b/autoload.inc.php
similarity index 100%
rename from system/autoload.inc.php
rename to autoload.inc.php
diff --git a/system/cache/cache.php b/cache/cache.php
similarity index 100%
rename from system/cache/cache.php
rename to cache/cache.php
diff --git a/system/db/connection/Connection.php b/db/connection/Connection.php
similarity index 100%
rename from system/db/connection/Connection.php
rename to db/connection/Connection.php
diff --git a/system/db/connection/ConnectionAMQP.php b/db/connection/ConnectionAMQP.php
similarity index 100%
rename from system/db/connection/ConnectionAMQP.php
rename to db/connection/ConnectionAMQP.php
diff --git a/system/db/connection/ConnectionAbstr.php b/db/connection/ConnectionAbstr.php
similarity index 100%
rename from system/db/connection/ConnectionAbstr.php
rename to db/connection/ConnectionAbstr.php
diff --git a/system/db/connection/ConnectionMYS.php b/db/connection/ConnectionMYS.php
similarity index 100%
rename from system/db/connection/ConnectionMYS.php
rename to db/connection/ConnectionMYS.php
diff --git a/system/db/connection/ConnectionPG.php b/db/connection/ConnectionPG.php
similarity index 100%
rename from system/db/connection/ConnectionPG.php
rename to db/connection/ConnectionPG.php
diff --git a/system/db/dbinfo/DBInfo.php b/db/dbinfo/DBInfo.php
similarity index 100%
rename from system/db/dbinfo/DBInfo.php
rename to db/dbinfo/DBInfo.php
diff --git a/system/db/dbinfo/DBInfoAMQP.php b/db/dbinfo/DBInfoAMQP.php
similarity index 100%
rename from system/db/dbinfo/DBInfoAMQP.php
rename to db/dbinfo/DBInfoAMQP.php
diff --git a/system/db/dbinfo/DBInfoMYS.php b/db/dbinfo/DBInfoMYS.php
similarity index 100%
rename from system/db/dbinfo/DBInfoMYS.php
rename to db/dbinfo/DBInfoMYS.php
diff --git a/system/db/dbinfo/DBInfoPG.php b/db/dbinfo/DBInfoPG.php
similarity index 100%
rename from system/db/dbinfo/DBInfoPG.php
rename to db/dbinfo/DBInfoPG.php
diff --git a/system/db/result/Result.php b/db/result/Result.php
similarity index 100%
rename from system/db/result/Result.php
rename to db/result/Result.php
diff --git a/system/db/result/ResultAMQP.php b/db/result/ResultAMQP.php
similarity index 100%
rename from system/db/result/ResultAMQP.php
rename to db/result/ResultAMQP.php
diff --git a/system/db/result/ResultMysqli.php b/db/result/ResultMysqli.php
similarity index 100%
rename from system/db/result/ResultMysqli.php
rename to db/result/ResultMysqli.php
diff --git a/system/db/result/ResultMysqliPrepare.php b/db/result/ResultMysqliPrepare.php
similarity index 100%
rename from system/db/result/ResultMysqliPrepare.php
rename to db/result/ResultMysqliPrepare.php
diff --git a/system/db/result/ResultPostgres.php b/db/result/ResultPostgres.php
similarity index 100%
rename from system/db/result/ResultPostgres.php
rename to db/result/ResultPostgres.php
diff --git a/system/dbd/autoload.inc.php b/dbd/autoload.inc.php
similarity index 100%
rename from system/dbd/autoload.inc.php
rename to dbd/autoload.inc.php
diff --git a/system/dbd/db/systemPostgres.php b/dbd/db/systemPostgres.php
similarity index 100%
rename from system/dbd/db/systemPostgres.php
rename to dbd/db/systemPostgres.php
diff --git a/system/dbd/tbl/APITable.php b/dbd/tbl/APITable.php
similarity index 100%
rename from system/dbd/tbl/APITable.php
rename to dbd/tbl/APITable.php
diff --git a/system/dbd/tbl/PAGETable.php b/dbd/tbl/PAGETable.php
similarity index 100%
rename from system/dbd/tbl/PAGETable.php
rename to dbd/tbl/PAGETable.php
diff --git a/system/dbd/tbl/UserLoginsTable.php b/dbd/tbl/UserLoginsTable.php
similarity index 100%
rename from system/dbd/tbl/UserLoginsTable.php
rename to dbd/tbl/UserLoginsTable.php
diff --git a/system/dbd/tbl/UserRightsTable.php b/dbd/tbl/UserRightsTable.php
similarity index 100%
rename from system/dbd/tbl/UserRightsTable.php
rename to dbd/tbl/UserRightsTable.php
diff --git a/system/dbd/tbl/UserTable.php b/dbd/tbl/UserTable.php
similarity index 100%
rename from system/dbd/tbl/UserTable.php
rename to dbd/tbl/UserTable.php
diff --git a/system/dbd/tbl/locale_string.php b/dbd/tbl/locale_string.php
similarity index 100%
rename from system/dbd/tbl/locale_string.php
rename to dbd/tbl/locale_string.php
diff --git a/system/docu/apiclass/ApiClass.php b/docu/apiclass/ApiClass.php
similarity index 100%
rename from system/docu/apiclass/ApiClass.php
rename to docu/apiclass/ApiClass.php
diff --git a/system/docu/apiclass/ApiVerify.php b/docu/apiclass/ApiVerify.php
similarity index 100%
rename from system/docu/apiclass/ApiVerify.php
rename to docu/apiclass/ApiVerify.php
diff --git a/system/docu/apiclass/PageApi.php b/docu/apiclass/PageApi.php
similarity index 100%
rename from system/docu/apiclass/PageApi.php
rename to docu/apiclass/PageApi.php
diff --git a/system/docu/index/api.php b/docu/index/api.php
similarity index 100%
rename from system/docu/index/api.php
rename to docu/index/api.php
diff --git a/system/docu/index/index.php b/docu/index/index.php
similarity index 100%
rename from system/docu/index/index.php
rename to docu/index/index.php
diff --git a/system/log/LOG.php b/log/LOG.php
similarity index 100%
rename from system/log/LOG.php
rename to log/LOG.php
diff --git a/system/log/error_handler/error_handler.php b/log/error_handler/error_handler.php
similarity index 100%
rename from system/log/error_handler/error_handler.php
rename to log/error_handler/error_handler.php
diff --git a/system/log/error_handler/error_handler_dbwriter.php b/log/error_handler/error_handler_dbwriter.php
similarity index 100%
rename from system/log/error_handler/error_handler_dbwriter.php
rename to log/error_handler/error_handler_dbwriter.php
diff --git a/system/log/error_handler/error_handler_jsonoutput.php b/log/error_handler/error_handler_jsonoutput.php
similarity index 100%
rename from system/log/error_handler/error_handler_jsonoutput.php
rename to log/error_handler/error_handler_jsonoutput.php
diff --git a/system/log/exceptions/DEPRECATED.php b/log/exceptions/DEPRECATED.php
similarity index 100%
rename from system/log/exceptions/DEPRECATED.php
rename to log/exceptions/DEPRECATED.php
diff --git a/system/log/exceptions/ERROR.php b/log/exceptions/ERROR.php
similarity index 100%
rename from system/log/exceptions/ERROR.php
rename to log/exceptions/ERROR.php
diff --git a/system/log/exceptions/INFO.php b/log/exceptions/INFO.php
similarity index 100%
rename from system/log/exceptions/INFO.php
rename to log/exceptions/INFO.php
diff --git a/system/log/exceptions/TranslatableError.php b/log/exceptions/TranslatableError.php
similarity index 100%
rename from system/log/exceptions/TranslatableError.php
rename to log/exceptions/TranslatableError.php
diff --git a/system/log/exceptions/WARNING.php b/log/exceptions/WARNING.php
similarity index 100%
rename from system/log/exceptions/WARNING.php
rename to log/exceptions/WARNING.php
diff --git a/system/log/exceptions_shortcut/DEPRECATED.php b/log/exceptions_shortcut/DEPRECATED.php
similarity index 100%
rename from system/log/exceptions_shortcut/DEPRECATED.php
rename to log/exceptions_shortcut/DEPRECATED.php
diff --git a/system/log/exceptions_shortcut/ERROR.php b/log/exceptions_shortcut/ERROR.php
similarity index 100%
rename from system/log/exceptions_shortcut/ERROR.php
rename to log/exceptions_shortcut/ERROR.php
diff --git a/system/log/exceptions_shortcut/INFO.php b/log/exceptions_shortcut/INFO.php
similarity index 100%
rename from system/log/exceptions_shortcut/INFO.php
rename to log/exceptions_shortcut/INFO.php
diff --git a/system/log/exceptions_shortcut/WARNING.php b/log/exceptions_shortcut/WARNING.php
similarity index 100%
rename from system/log/exceptions_shortcut/WARNING.php
rename to log/exceptions_shortcut/WARNING.php
diff --git a/system/log/register_errorhandler_jsonoutput.php b/log/register_errorhandler_jsonoutput.php
similarity index 100%
rename from system/log/register_errorhandler_jsonoutput.php
rename to log/register_errorhandler_jsonoutput.php
diff --git a/system/log/register_exception_shortcut.php b/log/register_exception_shortcut.php
similarity index 100%
rename from system/log/register_exception_shortcut.php
rename to log/register_exception_shortcut.php
diff --git a/system/log/register_result_shortcut.php b/log/register_result_shortcut.php
similarity index 100%
rename from system/log/register_result_shortcut.php
rename to log/register_result_shortcut.php
diff --git a/system/log/result/AbstractResult.php b/log/result/AbstractResult.php
similarity index 100%
rename from system/log/result/AbstractResult.php
rename to log/result/AbstractResult.php
diff --git a/system/log/result/JsonResult.php b/log/result/JsonResult.php
similarity index 100%
rename from system/log/result/JsonResult.php
rename to log/result/JsonResult.php
diff --git a/system/log/result_shortcut/JsonResult.php b/log/result_shortcut/JsonResult.php
similarity index 100%
rename from system/log/result_shortcut/JsonResult.php
rename to log/result_shortcut/JsonResult.php
diff --git a/system/page/Page.php b/page/Page.php
similarity index 100%
rename from system/page/Page.php
rename to page/Page.php
diff --git a/system/page/PageApi.php b/page/PageApi.php
similarity index 100%
rename from system/page/PageApi.php
rename to page/PageApi.php
diff --git a/system/page/PageClass.php b/page/PageClass.php
similarity index 100%
rename from system/page/PageClass.php
rename to page/PageClass.php
diff --git a/system/page/replace.php b/page/replace.php
similarity index 100%
rename from system/page/replace.php
rename to page/replace.php
diff --git a/system/sai/SaiModule.php b/sai/SaiModule.php
similarity index 100%
rename from system/sai/SaiModule.php
rename to sai/SaiModule.php
diff --git a/system/sai/index.php b/sai/index.php
similarity index 100%
rename from system/sai/index.php
rename to sai/index.php
diff --git a/system/sai/sai.php b/sai/sai.php
similarity index 100%
rename from system/sai/sai.php
rename to sai/sai.php
diff --git a/system/sai/sai/autoload.inc.php b/sai/sai/autoload.inc.php
similarity index 100%
rename from system/sai/sai/autoload.inc.php
rename to sai/sai/autoload.inc.php
diff --git a/system/sai/sai/modules/badge_creator/badgecreator.js b/sai/sai/modules/badge_creator/badgecreator.js
similarity index 100%
rename from system/sai/sai/modules/badge_creator/badgecreator.js
rename to sai/sai/modules/badge_creator/badgecreator.js
diff --git a/system/sai/sai/modules/badge_creator/badgecreator.tpl b/sai/sai/modules/badge_creator/badgecreator.tpl
similarity index 100%
rename from system/sai/sai/modules/badge_creator/badgecreator.tpl
rename to sai/sai/modules/badge_creator/badgecreator.tpl
diff --git a/system/sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php b/sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php
similarity index 100%
rename from system/sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php
rename to sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php
diff --git a/system/sai/sai/modules/register_modules.php b/sai/sai/modules/register_modules.php
similarity index 100%
rename from system/sai/sai/modules/register_modules.php
rename to sai/sai/modules/register_modules.php
diff --git a/system/sai/sai/modules/saimod_dasense_api_reference.php b/sai/sai/modules/saimod_dasense_api_reference.php
similarity index 100%
rename from system/sai/sai/modules/saimod_dasense_api_reference.php
rename to sai/sai/modules/saimod_dasense_api_reference.php
diff --git a/system/sai/sai/modules/saimod_dasense_bonusarea_creator.php b/sai/sai/modules/saimod_dasense_bonusarea_creator.php
similarity index 100%
rename from system/sai/sai/modules/saimod_dasense_bonusarea_creator.php
rename to sai/sai/modules/saimod_dasense_bonusarea_creator.php
diff --git a/system/sai/sai/modules/saimod_dasense_monitoring.php b/sai/sai/modules/saimod_dasense_monitoring.php
similarity index 100%
rename from system/sai/sai/modules/saimod_dasense_monitoring.php
rename to sai/sai/modules/saimod_dasense_monitoring.php
diff --git a/system/sai/sai/modules/saimod_dasense_push_message.php b/sai/sai/modules/saimod_dasense_push_message.php
similarity index 100%
rename from system/sai/sai/modules/saimod_dasense_push_message.php
rename to sai/sai/modules/saimod_dasense_push_message.php
diff --git a/system/sai/sai/modules/saimod_dasense_text_handler.php b/sai/sai/modules/saimod_dasense_text_handler.php
similarity index 100%
rename from system/sai/sai/modules/saimod_dasense_text_handler.php
rename to sai/sai/modules/saimod_dasense_text_handler.php
diff --git a/system/sai/sai/modules/saimod_sys_api.php b/sai/sai/modules/saimod_sys_api.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_api.php
rename to sai/sai/modules/saimod_sys_api.php
diff --git a/system/sai/sai/modules/saimod_sys_docu.php b/sai/sai/modules/saimod_sys_docu.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_docu.php
rename to sai/sai/modules/saimod_sys_docu.php
diff --git a/system/sai/sai/modules/saimod_sys_error.php b/sai/sai/modules/saimod_sys_error.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_error.php
rename to sai/sai/modules/saimod_sys_error.php
diff --git a/system/sai/sai/modules/saimod_sys_page.php b/sai/sai/modules/saimod_sys_page.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_page.php
rename to sai/sai/modules/saimod_sys_page.php
diff --git a/system/sai/sai/modules/saimod_sys_security.php b/sai/sai/modules/saimod_sys_security.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_security.php
rename to sai/sai/modules/saimod_sys_security.php
diff --git a/system/sai/sai/modules/saimod_sys_sys.php b/sai/sai/modules/saimod_sys_sys.php
similarity index 100%
rename from system/sai/sai/modules/saimod_sys_sys.php
rename to sai/sai/modules/saimod_sys_sys.php
diff --git a/system/sai/sai/page/default_page/carousel.tpl b/sai/sai/page/default_page/carousel.tpl
similarity index 100%
rename from system/sai/sai/page/default_page/carousel.tpl
rename to sai/sai/page/default_page/carousel.tpl
diff --git a/system/sai/sai/page/default_page/css/apireference.css b/sai/sai/page/default_page/css/apireference.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/apireference.css
rename to sai/sai/page/default_page/css/apireference.css
diff --git a/system/sai/sai/page/default_page/css/img/glyphicons-halflings-white.png b/sai/sai/page/default_page/css/img/glyphicons-halflings-white.png
similarity index 100%
rename from system/sai/sai/page/default_page/css/img/glyphicons-halflings-white.png
rename to sai/sai/page/default_page/css/img/glyphicons-halflings-white.png
diff --git a/system/sai/sai/page/default_page/css/img/glyphicons-halflings.png b/sai/sai/page/default_page/css/img/glyphicons-halflings.png
similarity index 100%
rename from system/sai/sai/page/default_page/css/img/glyphicons-halflings.png
rename to sai/sai/page/default_page/css/img/glyphicons-halflings.png
diff --git a/system/sai/sai/page/default_page/css/index.css b/sai/sai/page/default_page/css/index.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/index.css
rename to sai/sai/page/default_page/css/index.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap-responsive.css b/sai/sai/page/default_page/css/libs/bootstrap-responsive.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap-responsive.css
rename to sai/sai/page/default_page/css/libs/bootstrap-responsive.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css b/sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css
rename to sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap-switch.css b/sai/sai/page/default_page/css/libs/bootstrap-switch.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap-switch.css
rename to sai/sai/page/default_page/css/libs/bootstrap-switch.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css b/sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css
rename to sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap.css b/sai/sai/page/default_page/css/libs/bootstrap.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap.css
rename to sai/sai/page/default_page/css/libs/bootstrap.css
diff --git a/system/sai/sai/page/default_page/css/libs/bootstrap.min.css b/sai/sai/page/default_page/css/libs/bootstrap.min.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/bootstrap.min.css
rename to sai/sai/page/default_page/css/libs/bootstrap.min.css
diff --git a/system/sai/sai/page/default_page/css/libs/datepicker.css b/sai/sai/page/default_page/css/libs/datepicker.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/datepicker.css
rename to sai/sai/page/default_page/css/libs/datepicker.css
diff --git a/system/sai/sai/page/default_page/css/libs/jquery.miniColors.css b/sai/sai/page/default_page/css/libs/jquery.miniColors.css
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/jquery.miniColors.css
rename to sai/sai/page/default_page/css/libs/jquery.miniColors.css
diff --git a/system/sai/sai/page/default_page/css/libs/jquery.minicolors.png b/sai/sai/page/default_page/css/libs/jquery.minicolors.png
similarity index 100%
rename from system/sai/sai/page/default_page/css/libs/jquery.minicolors.png
rename to sai/sai/page/default_page/css/libs/jquery.minicolors.png
diff --git a/system/sai/sai/page/default_page/default_page.php b/sai/sai/page/default_page/default_page.php
similarity index 100%
rename from system/sai/sai/page/default_page/default_page.php
rename to sai/sai/page/default_page/default_page.php
diff --git a/system/sai/sai/page/default_page/img/apns.png b/sai/sai/page/default_page/img/apns.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/apns.png
rename to sai/sai/page/default_page/img/apns.png
diff --git a/system/sai/sai/page/default_page/img/badge.png b/sai/sai/page/default_page/img/badge.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/badge.png
rename to sai/sai/page/default_page/img/badge.png
diff --git a/system/sai/sai/page/default_page/img/carousel/verteidigung_immanuel.jpg b/sai/sai/page/default_page/img/carousel/verteidigung_immanuel.jpg
similarity index 100%
rename from system/sai/sai/page/default_page/img/carousel/verteidigung_immanuel.jpg
rename to sai/sai/page/default_page/img/carousel/verteidigung_immanuel.jpg
diff --git a/system/sai/sai/page/default_page/img/carousel/webseite.jpg b/sai/sai/page/default_page/img/carousel/webseite.jpg
similarity index 100%
rename from system/sai/sai/page/default_page/img/carousel/webseite.jpg
rename to sai/sai/page/default_page/img/carousel/webseite.jpg
diff --git a/system/sai/sai/page/default_page/img/cronjob-logo.png b/sai/sai/page/default_page/img/cronjob-logo.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/cronjob-logo.png
rename to sai/sai/page/default_page/img/cronjob-logo.png
diff --git a/system/sai/sai/page/default_page/img/flag_de.png b/sai/sai/page/default_page/img/flag_de.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/flag_de.png
rename to sai/sai/page/default_page/img/flag_de.png
diff --git a/system/sai/sai/page/default_page/img/flag_en.png b/sai/sai/page/default_page/img/flag_en.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/flag_en.png
rename to sai/sai/page/default_page/img/flag_en.png
diff --git a/system/sai/sai/page/default_page/img/flow_upload.png b/sai/sai/page/default_page/img/flow_upload.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/flow_upload.png
rename to sai/sai/page/default_page/img/flow_upload.png
diff --git a/system/sai/sai/page/default_page/img/gcm-logo.png b/sai/sai/page/default_page/img/gcm-logo.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/gcm-logo.png
rename to sai/sai/page/default_page/img/gcm-logo.png
diff --git a/system/sai/sai/page/default_page/img/geo_point.png b/sai/sai/page/default_page/img/geo_point.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/geo_point.png
rename to sai/sai/page/default_page/img/geo_point.png
diff --git a/system/sai/sai/page/default_page/img/geo_resize.png b/sai/sai/page/default_page/img/geo_resize.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/geo_resize.png
rename to sai/sai/page/default_page/img/geo_resize.png
diff --git a/system/sai/sai/page/default_page/img/logo.png b/sai/sai/page/default_page/img/logo.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/logo.png
rename to sai/sai/page/default_page/img/logo.png
diff --git a/system/sai/sai/page/default_page/img/nodejs-logo.png b/sai/sai/page/default_page/img/nodejs-logo.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/nodejs-logo.png
rename to sai/sai/page/default_page/img/nodejs-logo.png
diff --git a/system/sai/sai/page/default_page/img/postgresql-logo.png b/sai/sai/page/default_page/img/postgresql-logo.png
similarity index 100%
rename from system/sai/sai/page/default_page/img/postgresql-logo.png
rename to sai/sai/page/default_page/img/postgresql-logo.png
diff --git a/system/sai/sai/page/default_page/img/rabbitmq-logo.jpg b/sai/sai/page/default_page/img/rabbitmq-logo.jpg
similarity index 100%
rename from system/sai/sai/page/default_page/img/rabbitmq-logo.jpg
rename to sai/sai/page/default_page/img/rabbitmq-logo.jpg
diff --git a/system/sai/sai/page/default_page/js/apireference.js b/sai/sai/page/default_page/js/apireference.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/apireference.js
rename to sai/sai/page/default_page/js/apireference.js
diff --git a/system/sai/sai/page/default_page/js/bonusareacreator.js b/sai/sai/page/default_page/js/bonusareacreator.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/bonusareacreator.js
rename to sai/sai/page/default_page/js/bonusareacreator.js
diff --git a/system/sai/sai/page/default_page/js/documentation.js b/sai/sai/page/default_page/js/documentation.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/documentation.js
rename to sai/sai/page/default_page/js/documentation.js
diff --git a/system/sai/sai/page/default_page/js/index.js b/sai/sai/page/default_page/js/index.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/index.js
rename to sai/sai/page/default_page/js/index.js
diff --git a/system/sai/sai/page/default_page/js/libs/bootstrap-datepicker.js b/sai/sai/page/default_page/js/libs/bootstrap-datepicker.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/bootstrap-datepicker.js
rename to sai/sai/page/default_page/js/libs/bootstrap-datepicker.js
diff --git a/system/sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js b/sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js
rename to sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js
diff --git a/system/sai/sai/page/default_page/js/libs/bootstrap.js b/sai/sai/page/default_page/js/libs/bootstrap.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/bootstrap.js
rename to sai/sai/page/default_page/js/libs/bootstrap.js
diff --git a/system/sai/sai/page/default_page/js/libs/bootstrap.min.js b/sai/sai/page/default_page/js/libs/bootstrap.min.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/bootstrap.min.js
rename to sai/sai/page/default_page/js/libs/bootstrap.min.js
diff --git a/system/sai/sai/page/default_page/js/libs/geoFunctions.js b/sai/sai/page/default_page/js/libs/geoFunctions.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/geoFunctions.js
rename to sai/sai/page/default_page/js/libs/geoFunctions.js
diff --git a/system/sai/sai/page/default_page/js/libs/jquery.min.js b/sai/sai/page/default_page/js/libs/jquery.min.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/jquery.min.js
rename to sai/sai/page/default_page/js/libs/jquery.min.js
diff --git a/system/sai/sai/page/default_page/js/libs/jquery.miniColors.js b/sai/sai/page/default_page/js/libs/jquery.miniColors.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/jquery.miniColors.js
rename to sai/sai/page/default_page/js/libs/jquery.miniColors.js
diff --git a/system/sai/sai/page/default_page/js/libs/jquery.switch.js b/sai/sai/page/default_page/js/libs/jquery.switch.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/libs/jquery.switch.js
rename to sai/sai/page/default_page/js/libs/jquery.switch.js
diff --git a/system/sai/sai/page/default_page/js/monitoring.js b/sai/sai/page/default_page/js/monitoring.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/monitoring.js
rename to sai/sai/page/default_page/js/monitoring.js
diff --git a/system/sai/sai/page/default_page/js/pushmessage.js b/sai/sai/page/default_page/js/pushmessage.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/pushmessage.js
rename to sai/sai/page/default_page/js/pushmessage.js
diff --git a/system/sai/sai/page/default_page/js/texthandler.js b/sai/sai/page/default_page/js/texthandler.js
similarity index 100%
rename from system/sai/sai/page/default_page/js/texthandler.js
rename to sai/sai/page/default_page/js/texthandler.js
diff --git a/system/sai/sai/page/default_page/modules/apireference/account/login.html b/sai/sai/page/default_page/modules/apireference/account/login.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/account/login.html
rename to sai/sai/page/default_page/modules/apireference/account/login.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/account/push.html b/sai/sai/page/default_page/modules/apireference/account/push.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/account/push.html
rename to sai/sai/page/default_page/modules/apireference/account/push.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/account/registration.html b/sai/sai/page/default_page/modules/apireference/account/registration.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/account/registration.html
rename to sai/sai/page/default_page/modules/apireference/account/registration.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/data/acquisition.html b/sai/sai/page/default_page/modules/apireference/data/acquisition.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/data/acquisition.html
rename to sai/sai/page/default_page/modules/apireference/data/acquisition.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/data/series.html b/sai/sai/page/default_page/modules/apireference/data/series.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/data/series.html
rename to sai/sai/page/default_page/modules/apireference/data/series.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/achievements.html b/sai/sai/page/default_page/modules/apireference/incentive/achievements.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/achievements.html
rename to sai/sai/page/default_page/modules/apireference/incentive/achievements.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/badges.html b/sai/sai/page/default_page/modules/apireference/incentive/badges.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/badges.html
rename to sai/sai/page/default_page/modules/apireference/incentive/badges.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html b/sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html
rename to sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/ranking.html b/sai/sai/page/default_page/modules/apireference/incentive/ranking.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/ranking.html
rename to sai/sai/page/default_page/modules/apireference/incentive/ranking.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/statistics.html b/sai/sai/page/default_page/modules/apireference/incentive/statistics.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/statistics.html
rename to sai/sai/page/default_page/modules/apireference/incentive/statistics.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/incentive/titles.html b/sai/sai/page/default_page/modules/apireference/incentive/titles.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/incentive/titles.html
rename to sai/sai/page/default_page/modules/apireference/incentive/titles.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/main.html b/sai/sai/page/default_page/modules/apireference/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/main.html
rename to sai/sai/page/default_page/modules/apireference/main.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/overview/request.html b/sai/sai/page/default_page/modules/apireference/overview/request.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/overview/request.html
rename to sai/sai/page/default_page/modules/apireference/overview/request.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/overview/response.html b/sai/sai/page/default_page/modules/apireference/overview/response.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/overview/response.html
rename to sai/sai/page/default_page/modules/apireference/overview/response.html
diff --git a/system/sai/sai/page/default_page/modules/apireference/overview/statuscode.html b/sai/sai/page/default_page/modules/apireference/overview/statuscode.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/apireference/overview/statuscode.html
rename to sai/sai/page/default_page/modules/apireference/overview/statuscode.html
diff --git a/system/sai/sai/page/default_page/modules/bonusareacreator/main.html b/sai/sai/page/default_page/modules/bonusareacreator/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/bonusareacreator/main.html
rename to sai/sai/page/default_page/modules/bonusareacreator/main.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/client/empty.html b/sai/sai/page/default_page/modules/documentation/client/empty.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/client/empty.html
rename to sai/sai/page/default_page/modules/documentation/client/empty.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/main.html b/sai/sai/page/default_page/modules/documentation/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/main.html
rename to sai/sai/page/default_page/modules/documentation/main.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/architecture.html b/sai/sai/page/default_page/modules/documentation/server/architecture.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/architecture.html
rename to sai/sai/page/default_page/modules/documentation/server/architecture.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/barea.html b/sai/sai/page/default_page/modules/documentation/server/barea.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/barea.html
rename to sai/sai/page/default_page/modules/documentation/server/barea.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/database.html b/sai/sai/page/default_page/modules/documentation/server/database.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/database.html
rename to sai/sai/page/default_page/modules/documentation/server/database.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/incentive.html b/sai/sai/page/default_page/modules/documentation/server/incentive.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/incentive.html
rename to sai/sai/page/default_page/modules/documentation/server/incentive.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/nodejs.html b/sai/sai/page/default_page/modules/documentation/server/nodejs.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/nodejs.html
rename to sai/sai/page/default_page/modules/documentation/server/nodejs.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/push.html b/sai/sai/page/default_page/modules/documentation/server/push.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/push.html
rename to sai/sai/page/default_page/modules/documentation/server/push.html
diff --git a/system/sai/sai/page/default_page/modules/documentation/server/queue.html b/sai/sai/page/default_page/modules/documentation/server/queue.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/documentation/server/queue.html
rename to sai/sai/page/default_page/modules/documentation/server/queue.html
diff --git a/system/sai/sai/page/default_page/modules/monitoring/main.html b/sai/sai/page/default_page/modules/monitoring/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/monitoring/main.html
rename to sai/sai/page/default_page/modules/monitoring/main.html
diff --git a/system/sai/sai/page/default_page/modules/pushmessage/main.html b/sai/sai/page/default_page/modules/pushmessage/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/pushmessage/main.html
rename to sai/sai/page/default_page/modules/pushmessage/main.html
diff --git a/system/sai/sai/page/default_page/modules/texthandler/export.html b/sai/sai/page/default_page/modules/texthandler/export.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/texthandler/export.html
rename to sai/sai/page/default_page/modules/texthandler/export.html
diff --git a/system/sai/sai/page/default_page/modules/texthandler/import.html b/sai/sai/page/default_page/modules/texthandler/import.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/texthandler/import.html
rename to sai/sai/page/default_page/modules/texthandler/import.html
diff --git a/system/sai/sai/page/default_page/modules/texthandler/main.html b/sai/sai/page/default_page/modules/texthandler/main.html
similarity index 100%
rename from system/sai/sai/page/default_page/modules/texthandler/main.html
rename to sai/sai/page/default_page/modules/texthandler/main.html
diff --git a/system/sai/sai/page/default_page/sai.tpl b/sai/sai/page/default_page/sai.tpl
similarity index 100%
rename from system/sai/sai/page/default_page/sai.tpl
rename to sai/sai/page/default_page/sai.tpl
diff --git a/system/sai/sai/page/login_page/login.tpl b/sai/sai/page/login_page/login.tpl
similarity index 100%
rename from system/sai/sai/page/login_page/login.tpl
rename to sai/sai/page/login_page/login.tpl
diff --git a/system/sai/sai/page/login_page/login_page.php b/sai/sai/page/login_page/login_page.php
similarity index 100%
rename from system/sai/sai/page/login_page/login_page.php
rename to sai/sai/page/login_page/login_page.php
diff --git a/system/sai/saigui.php b/sai/saigui.php
similarity index 100%
rename from system/sai/saigui.php
rename to sai/saigui.php
diff --git a/system/security/RIGHTS.php b/security/RIGHTS.php
similarity index 100%
rename from system/security/RIGHTS.php
rename to security/RIGHTS.php
diff --git a/system/security/Security.php b/security/Security.php
similarity index 100%
rename from system/security/Security.php
rename to security/Security.php
diff --git a/system/security/User.php b/security/User.php
similarity index 100%
rename from system/security/User.php
rename to security/User.php
diff --git a/system/system/HEADER.php b/system/HEADER.php
similarity index 100%
rename from system/system/HEADER.php
rename to system/HEADER.php
diff --git a/system/system/autoload.php b/system/autoload.php
similarity index 100%
rename from system/system/autoload.php
rename to system/autoload.php
diff --git a/system/system/locale.php b/system/locale.php
similarity index 100%
rename from system/system/locale.php
rename to system/locale.php
diff --git a/system/system/path.php b/system/path.php
similarity index 100%
rename from system/system/path.php
rename to system/path.php
diff --git a/system/system/register_system_autoload_classes.php b/system/register_system_autoload_classes.php
similarity index 100%
rename from system/system/register_system_autoload_classes.php
rename to system/register_system_autoload_classes.php
diff --git a/system/system/time.php b/system/time.php
similarity index 100%
rename from system/system/time.php
rename to system/time.php
diff --git a/system/system/verifyclass.php b/system/verifyclass.php
similarity index 100%
rename from system/system/verifyclass.php
rename to system/verifyclass.php