diff --git a/README.md b/README.md
index 9792e5e..e043993 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,17 @@ The goal of the library is to provide the following features.
**Directory Structure**
- - cms --Library
+ - library --Library
- layout -- application layout library.
- model -- domain model library.
- persistence -- persistance layer library.
- src -- cms source code.
- example
- demo -- example using the cms library.
+ - doc -- Documentation.
**Documentation**
- >[CMS design](https://github.com/EiffelWebFramework/ROC)
- >[CMS concepts](https://github.com/EiffelWebFramework/ROC)
+ >[CMS design](https://github.com/EiffelWebFramework/ROC).
+ >[CMS concepts](https://github.com/EiffelWebFramework/ROC).
\ No newline at end of file
diff --git a/cms/cms-safe.ecf b/cms-safe.ecf
similarity index 86%
rename from cms/cms-safe.ecf
rename to cms-safe.ecf
index 56aac47..83915ff 100644
--- a/cms/cms-safe.ecf
+++ b/cms-safe.ecf
@@ -9,20 +9,20 @@
-
-
+
+
-
+
-
+
/EIFGENs$
/CVS$
diff --git a/CMS_concepts.md b/doc/CMS_concepts.md
similarity index 100%
rename from CMS_concepts.md
rename to doc/CMS_concepts.md
diff --git a/CMS_design.md b/doc/CMS_design.md
similarity index 100%
rename from CMS_design.md
rename to doc/CMS_design.md
diff --git a/examples/demo/demo-safe.ecf b/examples/demo/demo-safe.ecf
index a98b48a..e09123b 100644
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -10,9 +10,9 @@
-
+
-
+
diff --git a/examples/demo/modules/demo/cms_demo_module-safe.ecf b/examples/demo/modules/demo/cms_demo_module-safe.ecf
index bb9ae6d..c069119 100644
--- a/examples/demo/modules/demo/cms_demo_module-safe.ecf
+++ b/examples/demo/modules/demo/cms_demo_module-safe.ecf
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/cms/Readme.md b/library/Readme.md
similarity index 100%
rename from cms/Readme.md
rename to library/Readme.md
diff --git a/cms/layout/Readme.md b/library/layout/Readme.md
similarity index 100%
rename from cms/layout/Readme.md
rename to library/layout/Readme.md
diff --git a/cms/layout/layout-safe.ecf b/library/layout/layout-safe.ecf
similarity index 100%
rename from cms/layout/layout-safe.ecf
rename to library/layout/layout-safe.ecf
diff --git a/cms/layout/license.lic b/library/layout/license.lic
similarity index 100%
rename from cms/layout/license.lic
rename to library/layout/license.lic
diff --git a/cms/layout/src/application_layout.e b/library/layout/src/application_layout.e
similarity index 100%
rename from cms/layout/src/application_layout.e
rename to library/layout/src/application_layout.e
diff --git a/cms/layout/src/configuration/database_configuration.e b/library/layout/src/configuration/database_configuration.e
similarity index 100%
rename from cms/layout/src/configuration/database_configuration.e
rename to library/layout/src/configuration/database_configuration.e
diff --git a/cms/layout/src/configuration/json_configuration.e b/library/layout/src/configuration/json_configuration.e
similarity index 100%
rename from cms/layout/src/configuration/json_configuration.e
rename to library/layout/src/configuration/json_configuration.e
diff --git a/cms/layout/src/configuration/logger_configuration.e b/library/layout/src/configuration/logger_configuration.e
similarity index 100%
rename from cms/layout/src/configuration/logger_configuration.e
rename to library/layout/src/configuration/logger_configuration.e
diff --git a/cms/layout/src/error/basic_error_handler.e b/library/layout/src/error/basic_error_handler.e
similarity index 100%
rename from cms/layout/src/error/basic_error_handler.e
rename to library/layout/src/error/basic_error_handler.e
diff --git a/cms/layout/src/error/shared_error.e b/library/layout/src/error/shared_error.e
similarity index 100%
rename from cms/layout/src/error/shared_error.e
rename to library/layout/src/error/shared_error.e
diff --git a/cms/layout/src/logger/logging_facility.e b/library/layout/src/logger/logging_facility.e
similarity index 100%
rename from cms/layout/src/logger/logging_facility.e
rename to library/layout/src/logger/logging_facility.e
diff --git a/cms/layout/src/logger/shared_logger.e b/library/layout/src/logger/shared_logger.e
similarity index 100%
rename from cms/layout/src/logger/shared_logger.e
rename to library/layout/src/logger/shared_logger.e
diff --git a/cms/license.lic b/library/license.lic
similarity index 100%
rename from cms/license.lic
rename to library/license.lic
diff --git a/cms/model/cms_model-safe.ecf b/library/model/cms_model-safe.ecf
similarity index 100%
rename from cms/model/cms_model-safe.ecf
rename to library/model/cms_model-safe.ecf
diff --git a/cms/model/license.lic b/library/model/license.lic
similarity index 100%
rename from cms/model/license.lic
rename to library/model/license.lic
diff --git a/cms/model/src/content/cms_content_type.e b/library/model/src/content/cms_content_type.e
similarity index 100%
rename from cms/model/src/content/cms_content_type.e
rename to library/model/src/content/cms_content_type.e
diff --git a/cms/model/src/content/cms_node.e b/library/model/src/content/cms_node.e
similarity index 100%
rename from cms/model/src/content/cms_node.e
rename to library/model/src/content/cms_node.e
diff --git a/cms/model/src/link/cms_external_link.e b/library/model/src/link/cms_external_link.e
similarity index 100%
rename from cms/model/src/link/cms_external_link.e
rename to library/model/src/link/cms_external_link.e
diff --git a/cms/model/src/link/cms_link.e b/library/model/src/link/cms_link.e
similarity index 100%
rename from cms/model/src/link/cms_link.e
rename to library/model/src/link/cms_link.e
diff --git a/cms/model/src/link/cms_link_composite.e b/library/model/src/link/cms_link_composite.e
similarity index 100%
rename from cms/model/src/link/cms_link_composite.e
rename to library/model/src/link/cms_link_composite.e
diff --git a/cms/model/src/link/cms_local_link.e b/library/model/src/link/cms_local_link.e
similarity index 100%
rename from cms/model/src/link/cms_local_link.e
rename to library/model/src/link/cms_local_link.e
diff --git a/cms/model/src/link/cms_menu.e b/library/model/src/link/cms_menu.e
similarity index 100%
rename from cms/model/src/link/cms_menu.e
rename to library/model/src/link/cms_menu.e
diff --git a/cms/model/src/user/cms_user.e b/library/model/src/user/cms_user.e
similarity index 100%
rename from cms/model/src/user/cms_user.e
rename to library/model/src/user/cms_user.e
diff --git a/cms/model/src/user/cms_user_profile.e b/library/model/src/user/cms_user_profile.e
similarity index 100%
rename from cms/model/src/user/cms_user_profile.e
rename to library/model/src/user/cms_user_profile.e
diff --git a/cms/model/src/user/cms_user_role.e b/library/model/src/user/cms_user_role.e
similarity index 100%
rename from cms/model/src/user/cms_user_role.e
rename to library/model/src/user/cms_user_role.e
diff --git a/cms/persistence/Readme.md b/library/persistence/Readme.md
similarity index 100%
rename from cms/persistence/Readme.md
rename to library/persistence/Readme.md
diff --git a/cms/persistence/implementation/common/cms_storage_null.e b/library/persistence/implementation/common/cms_storage_null.e
similarity index 100%
rename from cms/persistence/implementation/common/cms_storage_null.e
rename to library/persistence/implementation/common/cms_storage_null.e
diff --git a/cms/persistence/implementation/common/database/database_config.e b/library/persistence/implementation/common/database/database_config.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_config.e
rename to library/persistence/implementation/common/database/database_config.e
diff --git a/cms/persistence/implementation/common/database/database_connection.e b/library/persistence/implementation/common/database/database_connection.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_connection.e
rename to library/persistence/implementation/common/database/database_connection.e
diff --git a/cms/persistence/implementation/common/database/database_connection_null.e b/library/persistence/implementation/common/database/database_connection_null.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_connection_null.e
rename to library/persistence/implementation/common/database/database_connection_null.e
diff --git a/cms/persistence/implementation/common/database/database_connection_odbc.e b/library/persistence/implementation/common/database/database_connection_odbc.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_connection_odbc.e
rename to library/persistence/implementation/common/database/database_connection_odbc.e
diff --git a/cms/persistence/implementation/common/database/database_handler.e b/library/persistence/implementation/common/database/database_handler.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_handler.e
rename to library/persistence/implementation/common/database/database_handler.e
diff --git a/cms/persistence/implementation/common/database/database_handler_impl.e b/library/persistence/implementation/common/database/database_handler_impl.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_handler_impl.e
rename to library/persistence/implementation/common/database/database_handler_impl.e
diff --git a/cms/persistence/implementation/common/database/database_iteration_cursor.e b/library/persistence/implementation/common/database/database_iteration_cursor.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_iteration_cursor.e
rename to library/persistence/implementation/common/database/database_iteration_cursor.e
diff --git a/cms/persistence/implementation/common/database/database_null.e b/library/persistence/implementation/common/database/database_null.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_null.e
rename to library/persistence/implementation/common/database/database_null.e
diff --git a/cms/persistence/implementation/common/database/database_query.e b/library/persistence/implementation/common/database/database_query.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_query.e
rename to library/persistence/implementation/common/database/database_query.e
diff --git a/cms/persistence/implementation/common/database/database_sql_server_encoder.e b/library/persistence/implementation/common/database/database_sql_server_encoder.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_sql_server_encoder.e
rename to library/persistence/implementation/common/database/database_sql_server_encoder.e
diff --git a/cms/persistence/implementation/common/database/database_store_procedure.e b/library/persistence/implementation/common/database/database_store_procedure.e
similarity index 100%
rename from cms/persistence/implementation/common/database/database_store_procedure.e
rename to library/persistence/implementation/common/database/database_store_procedure.e
diff --git a/cms/persistence/implementation/common/database/error/database_error.e b/library/persistence/implementation/common/database/error/database_error.e
similarity index 100%
rename from cms/persistence/implementation/common/database/error/database_error.e
rename to library/persistence/implementation/common/database/error/database_error.e
diff --git a/cms/persistence/implementation/common/database/error/database_error_handler.e b/library/persistence/implementation/common/database/error/database_error_handler.e
similarity index 100%
rename from cms/persistence/implementation/common/database/error/database_error_handler.e
rename to library/persistence/implementation/common/database/error/database_error_handler.e
diff --git a/cms/persistence/implementation/common/database/error/database_no_change_error.e b/library/persistence/implementation/common/database/error/database_no_change_error.e
similarity index 100%
rename from cms/persistence/implementation/common/database/error/database_no_change_error.e
rename to library/persistence/implementation/common/database/error/database_no_change_error.e
diff --git a/cms/persistence/implementation/common/database/parameter_name_helper.e b/library/persistence/implementation/common/database/parameter_name_helper.e
similarity index 100%
rename from cms/persistence/implementation/common/database/parameter_name_helper.e
rename to library/persistence/implementation/common/database/parameter_name_helper.e
diff --git a/cms/persistence/implementation/common/security/security_provider.e b/library/persistence/implementation/common/security/security_provider.e
similarity index 100%
rename from cms/persistence/implementation/common/security/security_provider.e
rename to library/persistence/implementation/common/security/security_provider.e
diff --git a/cms/persistence/implementation/common/string_helper.e b/library/persistence/implementation/common/string_helper.e
similarity index 100%
rename from cms/persistence/implementation/common/string_helper.e
rename to library/persistence/implementation/common/string_helper.e
diff --git a/cms/persistence/implementation/mysql/persistence_mysql-safe.ecf b/library/persistence/implementation/mysql/persistence_mysql-safe.ecf
similarity index 100%
rename from cms/persistence/implementation/mysql/persistence_mysql-safe.ecf
rename to library/persistence/implementation/mysql/persistence_mysql-safe.ecf
diff --git a/cms/persistence/implementation/mysql/scripts/Readme.txt b/library/persistence/implementation/mysql/scripts/Readme.txt
similarity index 100%
rename from cms/persistence/implementation/mysql/scripts/Readme.txt
rename to library/persistence/implementation/mysql/scripts/Readme.txt
diff --git a/cms/persistence/implementation/mysql/scripts/create_database.sql b/library/persistence/implementation/mysql/scripts/create_database.sql
similarity index 100%
rename from cms/persistence/implementation/mysql/scripts/create_database.sql
rename to library/persistence/implementation/mysql/scripts/create_database.sql
diff --git a/cms/persistence/implementation/mysql/scripts/tables.sql b/library/persistence/implementation/mysql/scripts/tables.sql
similarity index 100%
rename from cms/persistence/implementation/mysql/scripts/tables.sql
rename to library/persistence/implementation/mysql/scripts/tables.sql
diff --git a/cms/persistence/implementation/mysql/scripts/triggers.sql b/library/persistence/implementation/mysql/scripts/triggers.sql
similarity index 100%
rename from cms/persistence/implementation/mysql/scripts/triggers.sql
rename to library/persistence/implementation/mysql/scripts/triggers.sql
diff --git a/cms/persistence/implementation/mysql/src/cms_storage_mysql.e b/library/persistence/implementation/mysql/src/cms_storage_mysql.e
similarity index 100%
rename from cms/persistence/implementation/mysql/src/cms_storage_mysql.e
rename to library/persistence/implementation/mysql/src/cms_storage_mysql.e
diff --git a/cms/persistence/implementation/mysql/src/database/database_connection_mysql.e b/library/persistence/implementation/mysql/src/database/database_connection_mysql.e
similarity index 100%
rename from cms/persistence/implementation/mysql/src/database/database_connection_mysql.e
rename to library/persistence/implementation/mysql/src/database/database_connection_mysql.e
diff --git a/cms/persistence/implementation/mysql/src/provider/node_data_provider.e b/library/persistence/implementation/mysql/src/provider/node_data_provider.e
similarity index 100%
rename from cms/persistence/implementation/mysql/src/provider/node_data_provider.e
rename to library/persistence/implementation/mysql/src/provider/node_data_provider.e
diff --git a/cms/persistence/implementation/mysql/src/provider/role_data_provider.e b/library/persistence/implementation/mysql/src/provider/role_data_provider.e
similarity index 100%
rename from cms/persistence/implementation/mysql/src/provider/role_data_provider.e
rename to library/persistence/implementation/mysql/src/provider/role_data_provider.e
diff --git a/cms/persistence/implementation/mysql/src/provider/user_data_provider.e b/library/persistence/implementation/mysql/src/provider/user_data_provider.e
similarity index 100%
rename from cms/persistence/implementation/mysql/src/provider/user_data_provider.e
rename to library/persistence/implementation/mysql/src/provider/user_data_provider.e
diff --git a/cms/persistence/implementation/mysql/tests/application.e b/library/persistence/implementation/mysql/tests/application.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/application.e
rename to library/persistence/implementation/mysql/tests/application.e
diff --git a/cms/persistence/implementation/mysql/tests/handler/database_handler_test.e b/library/persistence/implementation/mysql/tests/handler/database_handler_test.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/handler/database_handler_test.e
rename to library/persistence/implementation/mysql/tests/handler/database_handler_test.e
diff --git a/cms/persistence/implementation/mysql/tests/nodes/node_test_set.e b/library/persistence/implementation/mysql/tests/nodes/node_test_set.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/nodes/node_test_set.e
rename to library/persistence/implementation/mysql/tests/nodes/node_test_set.e
diff --git a/cms/persistence/implementation/mysql/tests/roles/role_test_set.e b/library/persistence/implementation/mysql/tests/roles/role_test_set.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/roles/role_test_set.e
rename to library/persistence/implementation/mysql/tests/roles/role_test_set.e
diff --git a/cms/persistence/implementation/mysql/tests/storage/storage_test_set.e b/library/persistence/implementation/mysql/tests/storage/storage_test_set.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/storage/storage_test_set.e
rename to library/persistence/implementation/mysql/tests/storage/storage_test_set.e
diff --git a/cms/persistence/implementation/mysql/tests/tests.ecf b/library/persistence/implementation/mysql/tests/tests.ecf
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/tests.ecf
rename to library/persistence/implementation/mysql/tests/tests.ecf
diff --git a/cms/persistence/implementation/mysql/tests/transactions/transaction_test_set.e b/library/persistence/implementation/mysql/tests/transactions/transaction_test_set.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/transactions/transaction_test_set.e
rename to library/persistence/implementation/mysql/tests/transactions/transaction_test_set.e
diff --git a/cms/persistence/implementation/mysql/tests/users/user_test_set.e b/library/persistence/implementation/mysql/tests/users/user_test_set.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/users/user_test_set.e
rename to library/persistence/implementation/mysql/tests/users/user_test_set.e
diff --git a/cms/persistence/implementation/mysql/tests/util/abstract_db_test.e b/library/persistence/implementation/mysql/tests/util/abstract_db_test.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/util/abstract_db_test.e
rename to library/persistence/implementation/mysql/tests/util/abstract_db_test.e
diff --git a/cms/persistence/implementation/mysql/tests/util/clean_db.e b/library/persistence/implementation/mysql/tests/util/clean_db.e
similarity index 100%
rename from cms/persistence/implementation/mysql/tests/util/clean_db.e
rename to library/persistence/implementation/mysql/tests/util/clean_db.e
diff --git a/cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf b/library/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
similarity index 100%
rename from cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
rename to library/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
diff --git a/cms/persistence/implementation/sqlite/scripts/Readme.txt b/library/persistence/implementation/sqlite/scripts/Readme.txt
similarity index 100%
rename from cms/persistence/implementation/sqlite/scripts/Readme.txt
rename to library/persistence/implementation/sqlite/scripts/Readme.txt
diff --git a/cms/persistence/implementation/sqlite/scripts/create_database.sql b/library/persistence/implementation/sqlite/scripts/create_database.sql
similarity index 100%
rename from cms/persistence/implementation/sqlite/scripts/create_database.sql
rename to library/persistence/implementation/sqlite/scripts/create_database.sql
diff --git a/cms/persistence/implementation/sqlite/scripts/tables.sql b/library/persistence/implementation/sqlite/scripts/tables.sql
similarity index 100%
rename from cms/persistence/implementation/sqlite/scripts/tables.sql
rename to library/persistence/implementation/sqlite/scripts/tables.sql
diff --git a/cms/persistence/implementation/sqlite/src/cms_storage_sqlite.e b/library/persistence/implementation/sqlite/src/cms_storage_sqlite.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/src/cms_storage_sqlite.e
rename to library/persistence/implementation/sqlite/src/cms_storage_sqlite.e
diff --git a/cms/persistence/implementation/sqlite/src/database/database_connection_mysql.e b/library/persistence/implementation/sqlite/src/database/database_connection_mysql.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/src/database/database_connection_mysql.e
rename to library/persistence/implementation/sqlite/src/database/database_connection_mysql.e
diff --git a/cms/persistence/implementation/sqlite/src/provider/node_data_provider.e b/library/persistence/implementation/sqlite/src/provider/node_data_provider.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/src/provider/node_data_provider.e
rename to library/persistence/implementation/sqlite/src/provider/node_data_provider.e
diff --git a/cms/persistence/implementation/sqlite/src/provider/user_data_provider.e b/library/persistence/implementation/sqlite/src/provider/user_data_provider.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/src/provider/user_data_provider.e
rename to library/persistence/implementation/sqlite/src/provider/user_data_provider.e
diff --git a/cms/persistence/implementation/sqlite/tests/Readme.md b/library/persistence/implementation/sqlite/tests/Readme.md
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/Readme.md
rename to library/persistence/implementation/sqlite/tests/Readme.md
diff --git a/cms/persistence/implementation/sqlite/tests/application.e b/library/persistence/implementation/sqlite/tests/application.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/application.e
rename to library/persistence/implementation/sqlite/tests/application.e
diff --git a/cms/persistence/implementation/sqlite/tests/cms_lite.db b/library/persistence/implementation/sqlite/tests/cms_lite.db
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/cms_lite.db
rename to library/persistence/implementation/sqlite/tests/cms_lite.db
diff --git a/cms/persistence/implementation/sqlite/tests/nodes/node_test_set.e b/library/persistence/implementation/sqlite/tests/nodes/node_test_set.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/nodes/node_test_set.e
rename to library/persistence/implementation/sqlite/tests/nodes/node_test_set.e
diff --git a/cms/persistence/implementation/sqlite/tests/storage/storage_test_set.e b/library/persistence/implementation/sqlite/tests/storage/storage_test_set.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/storage/storage_test_set.e
rename to library/persistence/implementation/sqlite/tests/storage/storage_test_set.e
diff --git a/cms/persistence/implementation/sqlite/tests/tests-safe.ecf b/library/persistence/implementation/sqlite/tests/tests-safe.ecf
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/tests-safe.ecf
rename to library/persistence/implementation/sqlite/tests/tests-safe.ecf
diff --git a/cms/persistence/implementation/sqlite/tests/users/user_test_set.e b/library/persistence/implementation/sqlite/tests/users/user_test_set.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/users/user_test_set.e
rename to library/persistence/implementation/sqlite/tests/users/user_test_set.e
diff --git a/cms/persistence/implementation/sqlite/tests/util/abstract_db_test.e b/library/persistence/implementation/sqlite/tests/util/abstract_db_test.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/util/abstract_db_test.e
rename to library/persistence/implementation/sqlite/tests/util/abstract_db_test.e
diff --git a/cms/persistence/implementation/sqlite/tests/util/clean_db.e b/library/persistence/implementation/sqlite/tests/util/clean_db.e
similarity index 100%
rename from cms/persistence/implementation/sqlite/tests/util/clean_db.e
rename to library/persistence/implementation/sqlite/tests/util/clean_db.e
diff --git a/cms/persistence/interface/cms_storage.e b/library/persistence/interface/cms_storage.e
similarity index 100%
rename from cms/persistence/interface/cms_storage.e
rename to library/persistence/interface/cms_storage.e
diff --git a/cms/src/configuration/cms_configuration.e b/library/src/configuration/cms_configuration.e
similarity index 100%
rename from cms/src/configuration/cms_configuration.e
rename to library/src/configuration/cms_configuration.e
diff --git a/cms/src/configuration/cms_custom_setup.e b/library/src/configuration/cms_custom_setup.e
similarity index 100%
rename from cms/src/configuration/cms_custom_setup.e
rename to library/src/configuration/cms_custom_setup.e
diff --git a/cms/src/configuration/cms_default_setup.e b/library/src/configuration/cms_default_setup.e
similarity index 100%
rename from cms/src/configuration/cms_default_setup.e
rename to library/src/configuration/cms_default_setup.e
diff --git a/cms/src/configuration/cms_json_configuration.e b/library/src/configuration/cms_json_configuration.e
similarity index 100%
rename from cms/src/configuration/cms_json_configuration.e
rename to library/src/configuration/cms_json_configuration.e
diff --git a/cms/src/configuration/cms_layout.e b/library/src/configuration/cms_layout.e
similarity index 100%
rename from cms/src/configuration/cms_layout.e
rename to library/src/configuration/cms_layout.e
diff --git a/cms/src/configuration/cms_setup.e b/library/src/configuration/cms_setup.e
similarity index 100%
rename from cms/src/configuration/cms_setup.e
rename to library/src/configuration/cms_setup.e
diff --git a/cms/src/hooks/cms_hook.e b/library/src/hooks/cms_hook.e
similarity index 100%
rename from cms/src/hooks/cms_hook.e
rename to library/src/hooks/cms_hook.e
diff --git a/cms/src/hooks/cms_hook_auto_register.e b/library/src/hooks/cms_hook_auto_register.e
similarity index 100%
rename from cms/src/hooks/cms_hook_auto_register.e
rename to library/src/hooks/cms_hook_auto_register.e
diff --git a/cms/src/hooks/cms_hook_block.e b/library/src/hooks/cms_hook_block.e
similarity index 100%
rename from cms/src/hooks/cms_hook_block.e
rename to library/src/hooks/cms_hook_block.e
diff --git a/cms/src/hooks/cms_hook_form_alter.e b/library/src/hooks/cms_hook_form_alter.e
similarity index 100%
rename from cms/src/hooks/cms_hook_form_alter.e
rename to library/src/hooks/cms_hook_form_alter.e
diff --git a/cms/src/hooks/cms_hook_menu_alter.e b/library/src/hooks/cms_hook_menu_alter.e
similarity index 100%
rename from cms/src/hooks/cms_hook_menu_alter.e
rename to library/src/hooks/cms_hook_menu_alter.e
diff --git a/cms/src/hooks/cms_hook_menu_system_alter.e b/library/src/hooks/cms_hook_menu_system_alter.e
similarity index 100%
rename from cms/src/hooks/cms_hook_menu_system_alter.e
rename to library/src/hooks/cms_hook_menu_system_alter.e
diff --git a/cms/src/hooks/cms_hook_value_table_alter.e b/library/src/hooks/cms_hook_value_table_alter.e
similarity index 100%
rename from cms/src/hooks/cms_hook_value_table_alter.e
rename to library/src/hooks/cms_hook_value_table_alter.e
diff --git a/cms/src/kernel/cms_common_api.e b/library/src/kernel/cms_common_api.e
similarity index 100%
rename from cms/src/kernel/cms_common_api.e
rename to library/src/kernel/cms_common_api.e
diff --git a/cms/src/kernel/content/cms_block.e b/library/src/kernel/content/cms_block.e
similarity index 100%
rename from cms/src/kernel/content/cms_block.e
rename to library/src/kernel/content/cms_block.e
diff --git a/cms/src/kernel/content/cms_block_region.e b/library/src/kernel/content/cms_block_region.e
similarity index 100%
rename from cms/src/kernel/content/cms_block_region.e
rename to library/src/kernel/content/cms_block_region.e
diff --git a/cms/src/kernel/content/cms_content_block.e b/library/src/kernel/content/cms_content_block.e
similarity index 100%
rename from cms/src/kernel/content/cms_content_block.e
rename to library/src/kernel/content/cms_content_block.e
diff --git a/cms/src/kernel/content/cms_encoders.e b/library/src/kernel/content/cms_encoders.e
similarity index 100%
rename from cms/src/kernel/content/cms_encoders.e
rename to library/src/kernel/content/cms_encoders.e
diff --git a/cms/src/kernel/content/cms_menu_block.e b/library/src/kernel/content/cms_menu_block.e
similarity index 100%
rename from cms/src/kernel/content/cms_menu_block.e
rename to library/src/kernel/content/cms_menu_block.e
diff --git a/cms/src/kernel/content/cms_value_table.e b/library/src/kernel/content/cms_value_table.e
similarity index 100%
rename from cms/src/kernel/content/cms_value_table.e
rename to library/src/kernel/content/cms_value_table.e
diff --git a/cms/src/kernel/content/format/cms_formats.e b/library/src/kernel/content/format/cms_formats.e
similarity index 100%
rename from cms/src/kernel/content/format/cms_formats.e
rename to library/src/kernel/content/format/cms_formats.e
diff --git a/cms/src/kernel/form/cms_form.e b/library/src/kernel/form/cms_form.e
similarity index 100%
rename from cms/src/kernel/form/cms_form.e
rename to library/src/kernel/form/cms_form.e
diff --git a/cms/src/kernel/link/cms_menu_system.e b/library/src/kernel/link/cms_menu_system.e
similarity index 100%
rename from cms/src/kernel/link/cms_menu_system.e
rename to library/src/kernel/link/cms_menu_system.e
diff --git a/cms/src/modules/basic_auth/basic_auth_module.e b/library/src/modules/basic_auth/basic_auth_module.e
similarity index 100%
rename from cms/src/modules/basic_auth/basic_auth_module.e
rename to library/src/modules/basic_auth/basic_auth_module.e
diff --git a/cms/src/modules/basic_auth/filter/basic_auth_filter.e b/library/src/modules/basic_auth/filter/basic_auth_filter.e
similarity index 100%
rename from cms/src/modules/basic_auth/filter/basic_auth_filter.e
rename to library/src/modules/basic_auth/filter/basic_auth_filter.e
diff --git a/cms/src/modules/basic_auth/filter/cors_filter.e b/library/src/modules/basic_auth/filter/cors_filter.e
similarity index 100%
rename from cms/src/modules/basic_auth/filter/cors_filter.e
rename to library/src/modules/basic_auth/filter/cors_filter.e
diff --git a/cms/src/modules/basic_auth/handler/basic_auth_login_handler.e b/library/src/modules/basic_auth/handler/basic_auth_login_handler.e
similarity index 100%
rename from cms/src/modules/basic_auth/handler/basic_auth_login_handler.e
rename to library/src/modules/basic_auth/handler/basic_auth_login_handler.e
diff --git a/cms/src/modules/basic_auth/handler/basic_auth_logoff_handler.e b/library/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
similarity index 100%
rename from cms/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
rename to library/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
diff --git a/cms/src/modules/cms_module.e b/library/src/modules/cms_module.e
similarity index 100%
rename from cms/src/modules/cms_module.e
rename to library/src/modules/cms_module.e
diff --git a/cms/src/modules/cms_module_collection.e b/library/src/modules/cms_module_collection.e
similarity index 100%
rename from cms/src/modules/cms_module_collection.e
rename to library/src/modules/cms_module_collection.e
diff --git a/cms/src/modules/node/handler/node_content_handler.e b/library/src/modules/node/handler/node_content_handler.e
similarity index 100%
rename from cms/src/modules/node/handler/node_content_handler.e
rename to library/src/modules/node/handler/node_content_handler.e
diff --git a/cms/src/modules/node/handler/node_handler.e b/library/src/modules/node/handler/node_handler.e
similarity index 100%
rename from cms/src/modules/node/handler/node_handler.e
rename to library/src/modules/node/handler/node_handler.e
diff --git a/cms/src/modules/node/handler/node_summary_handler.e b/library/src/modules/node/handler/node_summary_handler.e
similarity index 100%
rename from cms/src/modules/node/handler/node_summary_handler.e
rename to library/src/modules/node/handler/node_summary_handler.e
diff --git a/cms/src/modules/node/handler/node_title_handler.e b/library/src/modules/node/handler/node_title_handler.e
similarity index 100%
rename from cms/src/modules/node/handler/node_title_handler.e
rename to library/src/modules/node/handler/node_title_handler.e
diff --git a/cms/src/modules/node/handler/nodes_handler.e b/library/src/modules/node/handler/nodes_handler.e
similarity index 100%
rename from cms/src/modules/node/handler/nodes_handler.e
rename to library/src/modules/node/handler/nodes_handler.e
diff --git a/cms/src/modules/node/node_module.e b/library/src/modules/node/node_module.e
similarity index 100%
rename from cms/src/modules/node/node_module.e
rename to library/src/modules/node/node_module.e
diff --git a/cms/src/service/cms_api.e b/library/src/service/cms_api.e
similarity index 100%
rename from cms/src/service/cms_api.e
rename to library/src/service/cms_api.e
diff --git a/cms/src/service/cms_api_options.e b/library/src/service/cms_api_options.e
similarity index 100%
rename from cms/src/service/cms_api_options.e
rename to library/src/service/cms_api_options.e
diff --git a/cms/src/service/cms_request_util.e b/library/src/service/cms_request_util.e
similarity index 100%
rename from cms/src/service/cms_request_util.e
rename to library/src/service/cms_request_util.e
diff --git a/cms/src/service/cms_service.e b/library/src/service/cms_service.e
similarity index 100%
rename from cms/src/service/cms_service.e
rename to library/src/service/cms_service.e
diff --git a/cms/src/service/cms_url_utilities.e b/library/src/service/cms_url_utilities.e
similarity index 100%
rename from cms/src/service/cms_url_utilities.e
rename to library/src/service/cms_url_utilities.e
diff --git a/cms/src/service/filter/cms_error_filter.e b/library/src/service/filter/cms_error_filter.e
similarity index 100%
rename from cms/src/service/filter/cms_error_filter.e
rename to library/src/service/filter/cms_error_filter.e
diff --git a/cms/src/service/handler/cms_handler.e b/library/src/service/handler/cms_handler.e
similarity index 100%
rename from cms/src/service/handler/cms_handler.e
rename to library/src/service/handler/cms_handler.e
diff --git a/cms/src/service/handler/cms_root_handler.e b/library/src/service/handler/cms_root_handler.e
similarity index 100%
rename from cms/src/service/handler/cms_root_handler.e
rename to library/src/service/handler/cms_root_handler.e
diff --git a/cms/src/service/response/cms_generic_response.e b/library/src/service/response/cms_generic_response.e
similarity index 100%
rename from cms/src/service/response/cms_generic_response.e
rename to library/src/service/response/cms_generic_response.e
diff --git a/cms/src/service/response/cms_response.e b/library/src/service/response/cms_response.e
similarity index 100%
rename from cms/src/service/response/cms_response.e
rename to library/src/service/response/cms_response.e
diff --git a/cms/src/service/response/error_500_cms_response.e b/library/src/service/response/error_500_cms_response.e
similarity index 100%
rename from cms/src/service/response/error_500_cms_response.e
rename to library/src/service/response/error_500_cms_response.e
diff --git a/cms/src/service/response/generic_view_cms_response.e b/library/src/service/response/generic_view_cms_response.e
similarity index 100%
rename from cms/src/service/response/generic_view_cms_response.e
rename to library/src/service/response/generic_view_cms_response.e
diff --git a/cms/src/service/response/home_cms_response.e b/library/src/service/response/home_cms_response.e
similarity index 100%
rename from cms/src/service/response/home_cms_response.e
rename to library/src/service/response/home_cms_response.e
diff --git a/cms/src/service/response/not_implemented_error_cms_response.e b/library/src/service/response/not_implemented_error_cms_response.e
similarity index 100%
rename from cms/src/service/response/not_implemented_error_cms_response.e
rename to library/src/service/response/not_implemented_error_cms_response.e
diff --git a/cms/src/theme/cms_html_page.e b/library/src/theme/cms_html_page.e
similarity index 100%
rename from cms/src/theme/cms_html_page.e
rename to library/src/theme/cms_html_page.e
diff --git a/cms/src/theme/cms_html_page_response.e b/library/src/theme/cms_html_page_response.e
similarity index 100%
rename from cms/src/theme/cms_html_page_response.e
rename to library/src/theme/cms_html_page_response.e
diff --git a/cms/src/theme/cms_html_template.e b/library/src/theme/cms_html_template.e
similarity index 100%
rename from cms/src/theme/cms_html_template.e
rename to library/src/theme/cms_html_template.e
diff --git a/cms/src/theme/cms_page_template.e b/library/src/theme/cms_page_template.e
similarity index 100%
rename from cms/src/theme/cms_page_template.e
rename to library/src/theme/cms_page_template.e
diff --git a/cms/src/theme/cms_template.e b/library/src/theme/cms_template.e
similarity index 100%
rename from cms/src/theme/cms_template.e
rename to library/src/theme/cms_template.e
diff --git a/cms/src/theme/cms_theme.e b/library/src/theme/cms_theme.e
similarity index 100%
rename from cms/src/theme/cms_theme.e
rename to library/src/theme/cms_theme.e
diff --git a/cms/src/theme/cms_theme_information.e b/library/src/theme/cms_theme_information.e
similarity index 100%
rename from cms/src/theme/cms_theme_information.e
rename to library/src/theme/cms_theme_information.e
diff --git a/cms/src/theme/default_cms_template.e b/library/src/theme/default_cms_template.e
similarity index 100%
rename from cms/src/theme/default_cms_template.e
rename to library/src/theme/default_cms_template.e
diff --git a/cms/src/theme/default_theme/default_cms_html_template.e b/library/src/theme/default_theme/default_cms_html_template.e
similarity index 100%
rename from cms/src/theme/default_theme/default_cms_html_template.e
rename to library/src/theme/default_theme/default_cms_html_template.e
diff --git a/cms/src/theme/default_theme/default_cms_page_template.e b/library/src/theme/default_theme/default_cms_page_template.e
similarity index 100%
rename from cms/src/theme/default_theme/default_cms_page_template.e
rename to library/src/theme/default_theme/default_cms_page_template.e
diff --git a/cms/src/theme/default_theme/default_cms_theme.e b/library/src/theme/default_theme/default_cms_theme.e
similarity index 100%
rename from cms/src/theme/default_theme/default_cms_theme.e
rename to library/src/theme/default_theme/default_cms_theme.e
diff --git a/cms/src/theme/smarty_theme/smarty_cms_html_page_inspector.e b/library/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
similarity index 100%
rename from cms/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
rename to library/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
diff --git a/cms/src/theme/smarty_theme/smarty_cms_page_template.e b/library/src/theme/smarty_theme/smarty_cms_page_template.e
similarity index 100%
rename from cms/src/theme/smarty_theme/smarty_cms_page_template.e
rename to library/src/theme/smarty_theme/smarty_cms_page_template.e
diff --git a/cms/src/theme/smarty_theme/smarty_cms_regions_inspector.e b/library/src/theme/smarty_theme/smarty_cms_regions_inspector.e
similarity index 100%
rename from cms/src/theme/smarty_theme/smarty_cms_regions_inspector.e
rename to library/src/theme/smarty_theme/smarty_cms_regions_inspector.e
diff --git a/cms/src/theme/smarty_theme/smarty_cms_theme.e b/library/src/theme/smarty_theme/smarty_cms_theme.e
similarity index 100%
rename from cms/src/theme/smarty_theme/smarty_cms_theme.e
rename to library/src/theme/smarty_theme/smarty_cms_theme.e
diff --git a/cms/src/theme/smarty_theme/string_table_of_string_inspector.e b/library/src/theme/smarty_theme/string_table_of_string_inspector.e
similarity index 100%
rename from cms/src/theme/smarty_theme/string_table_of_string_inspector.e
rename to library/src/theme/smarty_theme/string_table_of_string_inspector.e