diff --git a/cms.ecf b/cms.ecf
index 727cca1..d61f355 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -2,6 +2,11 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
 	<target name="cms">
 		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option warning="true" full_class_checking="false" void_safety="none" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
@@ -11,22 +16,17 @@
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
-		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
-		<library name="layout" location=".\library\layout\layout.ecf"/>
+		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
 		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
-		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
+		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<cluster name="modules" location=".\modules\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/src/modules/basic_auth/basic_auth_module.e b/modules/basic_auth/basic_auth_module.e
similarity index 100%
rename from src/modules/basic_auth/basic_auth_module.e
rename to modules/basic_auth/basic_auth_module.e
diff --git a/src/modules/basic_auth/filter/basic_auth_filter.e b/modules/basic_auth/filter/basic_auth_filter.e
similarity index 100%
rename from src/modules/basic_auth/filter/basic_auth_filter.e
rename to modules/basic_auth/filter/basic_auth_filter.e
diff --git a/src/modules/basic_auth/filter/cors_filter.e b/modules/basic_auth/filter/cors_filter.e
similarity index 100%
rename from src/modules/basic_auth/filter/cors_filter.e
rename to modules/basic_auth/filter/cors_filter.e
diff --git a/src/modules/basic_auth/handler/basic_auth_login_handler.e b/modules/basic_auth/handler/basic_auth_login_handler.e
similarity index 100%
rename from src/modules/basic_auth/handler/basic_auth_login_handler.e
rename to modules/basic_auth/handler/basic_auth_login_handler.e
diff --git a/src/modules/basic_auth/handler/basic_auth_logoff_handler.e b/modules/basic_auth/handler/basic_auth_logoff_handler.e
similarity index 100%
rename from src/modules/basic_auth/handler/basic_auth_logoff_handler.e
rename to modules/basic_auth/handler/basic_auth_logoff_handler.e
diff --git a/src/modules/node/cms_content_type.e b/modules/node/cms_content_type.e
similarity index 100%
rename from src/modules/node/cms_content_type.e
rename to modules/node/cms_content_type.e
diff --git a/src/modules/node/cms_node_api.e b/modules/node/cms_node_api.e
similarity index 100%
rename from src/modules/node/cms_node_api.e
rename to modules/node/cms_node_api.e
diff --git a/src/modules/node/cms_node_type.e b/modules/node/cms_node_type.e
similarity index 100%
rename from src/modules/node/cms_node_type.e
rename to modules/node/cms_node_type.e
diff --git a/src/modules/node/content/cms_node.e b/modules/node/content/cms_node.e
similarity index 100%
rename from src/modules/node/content/cms_node.e
rename to modules/node/content/cms_node.e
diff --git a/src/modules/node/content/cms_partial_node.e b/modules/node/content/cms_partial_node.e
similarity index 100%
rename from src/modules/node/content/cms_partial_node.e
rename to modules/node/content/cms_partial_node.e
diff --git a/src/modules/node/content_type/cms_page.e b/modules/node/content_type/cms_page.e
similarity index 100%
rename from src/modules/node/content_type/cms_page.e
rename to modules/node/content_type/cms_page.e
diff --git a/src/modules/node/content_type/cms_page_node_type.e b/modules/node/content_type/cms_page_node_type.e
similarity index 100%
rename from src/modules/node/content_type/cms_page_node_type.e
rename to modules/node/content_type/cms_page_node_type.e
diff --git a/src/modules/node/content_type/cms_partial_page.e b/modules/node/content_type/cms_partial_page.e
similarity index 100%
rename from src/modules/node/content_type/cms_partial_page.e
rename to modules/node/content_type/cms_partial_page.e
diff --git a/src/modules/node/handler/cms_content_type_webform_manager.e b/modules/node/handler/cms_content_type_webform_manager.e
similarity index 100%
rename from src/modules/node/handler/cms_content_type_webform_manager.e
rename to modules/node/handler/cms_content_type_webform_manager.e
diff --git a/src/modules/node/handler/cms_node_handler.e b/modules/node/handler/cms_node_handler.e
similarity index 100%
rename from src/modules/node/handler/cms_node_handler.e
rename to modules/node/handler/cms_node_handler.e
diff --git a/src/modules/node/handler/cms_node_type_webform_manager.e b/modules/node/handler/cms_node_type_webform_manager.e
similarity index 100%
rename from src/modules/node/handler/cms_node_type_webform_manager.e
rename to modules/node/handler/cms_node_type_webform_manager.e
diff --git a/src/modules/node/handler/cms_node_type_webform_manager_i.e b/modules/node/handler/cms_node_type_webform_manager_i.e
similarity index 100%
rename from src/modules/node/handler/cms_node_type_webform_manager_i.e
rename to modules/node/handler/cms_node_type_webform_manager_i.e
diff --git a/src/modules/node/handler/cms_page_node_type_webform_manager.e b/modules/node/handler/cms_page_node_type_webform_manager.e
similarity index 100%
rename from src/modules/node/handler/cms_page_node_type_webform_manager.e
rename to modules/node/handler/cms_page_node_type_webform_manager.e
diff --git a/src/modules/node/handler/experimental/node_content_handler.e b/modules/node/handler/experimental/node_content_handler.e
similarity index 100%
rename from src/modules/node/handler/experimental/node_content_handler.e
rename to modules/node/handler/experimental/node_content_handler.e
diff --git a/src/modules/node/handler/experimental/node_resource_handler.e b/modules/node/handler/experimental/node_resource_handler.e
similarity index 100%
rename from src/modules/node/handler/experimental/node_resource_handler.e
rename to modules/node/handler/experimental/node_resource_handler.e
diff --git a/src/modules/node/handler/experimental/node_resources_handler.e b/modules/node/handler/experimental/node_resources_handler.e
similarity index 100%
rename from src/modules/node/handler/experimental/node_resources_handler.e
rename to modules/node/handler/experimental/node_resources_handler.e
diff --git a/src/modules/node/handler/experimental/node_summary_handler.e b/modules/node/handler/experimental/node_summary_handler.e
similarity index 100%
rename from src/modules/node/handler/experimental/node_summary_handler.e
rename to modules/node/handler/experimental/node_summary_handler.e
diff --git a/src/modules/node/handler/experimental/node_title_handler.e b/modules/node/handler/experimental/node_title_handler.e
similarity index 100%
rename from src/modules/node/handler/experimental/node_title_handler.e
rename to modules/node/handler/experimental/node_title_handler.e
diff --git a/src/modules/node/handler/node_form_response.e b/modules/node/handler/node_form_response.e
similarity index 100%
rename from src/modules/node/handler/node_form_response.e
rename to modules/node/handler/node_form_response.e
diff --git a/src/modules/node/handler/node_handler.e b/modules/node/handler/node_handler.e
similarity index 100%
rename from src/modules/node/handler/node_handler.e
rename to modules/node/handler/node_handler.e
diff --git a/src/modules/node/handler/node_response.e b/modules/node/handler/node_response.e
similarity index 100%
rename from src/modules/node/handler/node_response.e
rename to modules/node/handler/node_response.e
diff --git a/src/modules/node/handler/node_view_response.e b/modules/node/handler/node_view_response.e
similarity index 100%
rename from src/modules/node/handler/node_view_response.e
rename to modules/node/handler/node_view_response.e
diff --git a/src/modules/node/handler/nodes_handler.e b/modules/node/handler/nodes_handler.e
similarity index 100%
rename from src/modules/node/handler/nodes_handler.e
rename to modules/node/handler/nodes_handler.e
diff --git a/src/modules/node/handler/wsf_cms_theme.e b/modules/node/handler/wsf_cms_theme.e
similarity index 100%
rename from src/modules/node/handler/wsf_cms_theme.e
rename to modules/node/handler/wsf_cms_theme.e
diff --git a/src/modules/node/handler/wsf_null_theme.e b/modules/node/handler/wsf_null_theme.e
similarity index 100%
rename from src/modules/node/handler/wsf_null_theme.e
rename to modules/node/handler/wsf_null_theme.e
diff --git a/src/modules/node/node_module.e b/modules/node/node_module.e
similarity index 100%
rename from src/modules/node/node_module.e
rename to modules/node/node_module.e
diff --git a/src/modules/node/persistence/cms_node_storage_extension.e b/modules/node/persistence/cms_node_storage_extension.e
similarity index 100%
rename from src/modules/node/persistence/cms_node_storage_extension.e
rename to modules/node/persistence/cms_node_storage_extension.e
diff --git a/src/modules/node/persistence/cms_node_storage_i.e b/modules/node/persistence/cms_node_storage_i.e
similarity index 100%
rename from src/modules/node/persistence/cms_node_storage_i.e
rename to modules/node/persistence/cms_node_storage_i.e
diff --git a/src/modules/node/persistence/cms_node_storage_null.e b/modules/node/persistence/cms_node_storage_null.e
similarity index 100%
rename from src/modules/node/persistence/cms_node_storage_null.e
rename to modules/node/persistence/cms_node_storage_null.e
diff --git a/src/modules/node/persistence/cms_node_storage_sql.e b/modules/node/persistence/cms_node_storage_sql.e
similarity index 100%
rename from src/modules/node/persistence/cms_node_storage_sql.e
rename to modules/node/persistence/cms_node_storage_sql.e
diff --git a/src/modules/node/persistence/cms_node_storage_sql_page_extension.e b/modules/node/persistence/cms_node_storage_sql_page_extension.e
similarity index 100%
rename from src/modules/node/persistence/cms_node_storage_sql_page_extension.e
rename to modules/node/persistence/cms_node_storage_sql_page_extension.e