diff --git a/examples/demo/demo-safe.ecf b/examples/demo/demo-safe.ecf
index 9c26c82..0112f9c 100644
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -18,7 +18,7 @@
 	<library name="cms_blog_module" location="modules\blog\cms_blog_module-safe.ecf" readonly="false"/>
 	<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
 	<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
-	<library name="cms_auth_module" location="..\..\modules\login\auth-safe.ecf" readonly="false"/>
+	<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
 	<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
 	<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" readonly="false"/>
 	<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" readonly="false"/>
diff --git a/modules/login/auth-safe.ecf b/modules/auth/auth-safe.ecf
similarity index 100%
rename from modules/login/auth-safe.ecf
rename to modules/auth/auth-safe.ecf
diff --git a/modules/login/cms_authentication_constants.e b/modules/auth/cms_authentication_constants.e
similarity index 100%
rename from modules/login/cms_authentication_constants.e
rename to modules/auth/cms_authentication_constants.e
diff --git a/modules/login/cms_authentication_email_service_parameters.e b/modules/auth/cms_authentication_email_service_parameters.e
similarity index 100%
rename from modules/login/cms_authentication_email_service_parameters.e
rename to modules/auth/cms_authentication_email_service_parameters.e
diff --git a/modules/login/cms_authentication_module.e b/modules/auth/cms_authentication_module.e
similarity index 100%
rename from modules/login/cms_authentication_module.e
rename to modules/auth/cms_authentication_module.e
diff --git a/modules/login/cms_authenticaton_email_service.e b/modules/auth/cms_authenticaton_email_service.e
similarity index 100%
rename from modules/login/cms_authenticaton_email_service.e
rename to modules/auth/cms_authenticaton_email_service.e
diff --git a/modules/login/cms_oauth_20_api.e b/modules/auth/cms_oauth_20_api.e
similarity index 100%
rename from modules/login/cms_oauth_20_api.e
rename to modules/auth/cms_oauth_20_api.e
diff --git a/modules/login/cms_oauth_20_consumer.e b/modules/auth/cms_oauth_20_consumer.e
similarity index 100%
rename from modules/login/cms_oauth_20_consumer.e
rename to modules/auth/cms_oauth_20_consumer.e
diff --git a/modules/login/cms_oauth_20_workflow.e b/modules/auth/cms_oauth_20_workflow.e
similarity index 100%
rename from modules/login/cms_oauth_20_workflow.e
rename to modules/auth/cms_oauth_20_workflow.e
diff --git a/modules/login/filter/cms_oauth_20_filter.e b/modules/auth/filter/cms_oauth_20_filter.e
similarity index 100%
rename from modules/login/filter/cms_oauth_20_filter.e
rename to modules/auth/filter/cms_oauth_20_filter.e
diff --git a/modules/login/persistence/cms_oauth_20_generic_api.e b/modules/auth/persistence/cms_oauth_20_generic_api.e
similarity index 100%
rename from modules/login/persistence/cms_oauth_20_generic_api.e
rename to modules/auth/persistence/cms_oauth_20_generic_api.e
diff --git a/modules/login/persistence/cms_oauth_20_storage_i.e b/modules/auth/persistence/cms_oauth_20_storage_i.e
similarity index 100%
rename from modules/login/persistence/cms_oauth_20_storage_i.e
rename to modules/auth/persistence/cms_oauth_20_storage_i.e
diff --git a/modules/login/persistence/cms_oauth_20_storage_null.e b/modules/auth/persistence/cms_oauth_20_storage_null.e
similarity index 100%
rename from modules/login/persistence/cms_oauth_20_storage_null.e
rename to modules/auth/persistence/cms_oauth_20_storage_null.e
diff --git a/modules/login/persistence/cms_oauth_20_storage_sql.e b/modules/auth/persistence/cms_oauth_20_storage_sql.e
similarity index 100%
rename from modules/login/persistence/cms_oauth_20_storage_sql.e
rename to modules/auth/persistence/cms_oauth_20_storage_sql.e