diff --git a/examples/roc_api/Readme.md b/CMS_concepts.md
similarity index 100%
rename from examples/roc_api/Readme.md
rename to CMS_concepts.md
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/page_bottom.tpl b/CMS_design.md
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/page_bottom.tpl
rename to CMS_design.md
diff --git a/README.md b/README.md
index a1123e9..9792e5e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,30 @@
-ROC: The "REST On CMS" solution
 
-Simple content management system built with Eiffel, and the Eiffel Web Framework, with REST API in mind.
+Eiffel CMS Library
+===============
 
+Eiffel CMS library is build with [EWF](http://eiffelwebframework.github.io/EWF/) and inspired by [Drupal](https://www.drupal.org/).
+
+The goal of the library is to provide the following features.
+
+    - content type
+    - user management
+    - module design
+    - theme
+    - API
+
+
+**Directory Structure**
+
+ - cms --Library
+	 - layout -- application layout library.
+	 - model -- domain model library.
+	 - persistence -- persistance layer library.
+	 - src -- cms source code.
+ - example
+	 - demo -- example using the cms library.
+
+**Documentation**
+ >[CMS design](https://github.com/EiffelWebFramework/ROC)
+ >[CMS concepts](https://github.com/EiffelWebFramework/ROC)
+ 
+	 
\ No newline at end of file
diff --git a/cms/model/src/link/cms_menu.e b/cms/model/src/link/cms_menu.e
index fd38a5a..5da0bb0 100644
--- a/cms/model/src/link/cms_menu.e
+++ b/cms/model/src/link/cms_menu.e
@@ -26,6 +26,9 @@ feature {NONE} -- Initialization
 		do
 			name := a_name
 			create items.make (a_capacity)
+		ensure
+			name_set:  name = a_name
+			items_set: items.capacity = a_capacity
 		end
 
 	make_with_title (a_name: like name; a_title: READABLE_STRING_32; a_capacity: INTEGER)
@@ -33,6 +36,10 @@ feature {NONE} -- Initialization
 		do
 			make (a_name, a_capacity)
 			set_title (a_title)
+		ensure
+			name_set: name = a_name
+			title_set: title = a_title
+			items_set: items.capacity = a_capacity
 		end
 
 feature -- Access
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/page_top.tpl b/examples/demo/Readme.md
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/page_top.tpl
rename to examples/demo/Readme.md
diff --git a/examples/roc_api/roc_api-safe.ecf b/examples/demo/demo-safe.ecf
similarity index 89%
rename from examples/roc_api/roc_api-safe.ecf
rename to examples/demo/demo-safe.ecf
index bee02ef..a98b48a 100644
--- a/examples/roc_api/roc_api-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="roc_api" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="roc_api">
+<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="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
@@ -16,7 +16,7 @@
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 	</target>
-	<target name="roc_api_any" extends="common">
+	<target name="demo_any" extends="common">
 		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
 		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
@@ -24,24 +24,24 @@
 		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="roc_api_nino" extends="common">
+	<target name="demo_nino" extends="common">
 		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="roc_api_cgi" extends="common">
+	<target name="demo_cgi" extends="common">
 		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="roc_api_libfcgi" extends="common">
+	<target name="demo_libfcgi" extends="common">
 		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="roc_api" extends="roc_api_nino">
+	<target name="demo" extends="demo_nino">
 	</target>
 </system>
diff --git a/examples/roc_api/roc.ini b/examples/demo/demo.ini
similarity index 100%
rename from examples/roc_api/roc.ini
rename to examples/demo/demo.ini
diff --git a/examples/roc_api/launcher/any/application_launcher.e b/examples/demo/launcher/any/application_launcher.e
similarity index 100%
rename from examples/roc_api/launcher/any/application_launcher.e
rename to examples/demo/launcher/any/application_launcher.e
diff --git a/examples/roc_api/launcher/any/application_launcher_i.e b/examples/demo/launcher/any/application_launcher_i.e
similarity index 100%
rename from examples/roc_api/launcher/any/application_launcher_i.e
rename to examples/demo/launcher/any/application_launcher_i.e
diff --git a/examples/roc_api/launcher/default/application_launcher.e b/examples/demo/launcher/default/application_launcher.e
similarity index 100%
rename from examples/roc_api/launcher/default/application_launcher.e
rename to examples/demo/launcher/default/application_launcher.e
diff --git a/examples/roc_api/launcher/default/application_launcher_i.e b/examples/demo/launcher/default/application_launcher_i.e
similarity index 100%
rename from examples/roc_api/launcher/default/application_launcher_i.e
rename to examples/demo/launcher/default/application_launcher_i.e
diff --git a/examples/roc_api/modules/demo/cms_demo_module-safe.ecf b/examples/demo/modules/demo/cms_demo_module-safe.ecf
similarity index 100%
rename from examples/roc_api/modules/demo/cms_demo_module-safe.ecf
rename to examples/demo/modules/demo/cms_demo_module-safe.ecf
diff --git a/examples/roc_api/modules/demo/cms_demo_module.e b/examples/demo/modules/demo/cms_demo_module.e
similarity index 100%
rename from examples/roc_api/modules/demo/cms_demo_module.e
rename to examples/demo/modules/demo/cms_demo_module.e
diff --git a/examples/roc_api/site/config/application_configuration.json b/examples/demo/site/config/application_configuration.json
similarity index 100%
rename from examples/roc_api/site/config/application_configuration.json
rename to examples/demo/site/config/application_configuration.json
diff --git a/examples/roc_api/site/config/cms.ini b/examples/demo/site/config/cms.ini
similarity index 100%
rename from examples/roc_api/site/config/cms.ini
rename to examples/demo/site/config/cms.ini
diff --git a/examples/roc_api/site/www/static/css/bootstrap.css b/examples/demo/site/www/static/css/bootstrap.css
similarity index 100%
rename from examples/roc_api/site/www/static/css/bootstrap.css
rename to examples/demo/site/www/static/css/bootstrap.css
diff --git a/examples/roc_api/site/www/static/css/dashboard.css b/examples/demo/site/www/static/css/dashboard.css
similarity index 100%
rename from examples/roc_api/site/www/static/css/dashboard.css
rename to examples/demo/site/www/static/css/dashboard.css
diff --git a/examples/roc_api/site/www/static/images/ajax-loader.gif b/examples/demo/site/www/static/images/ajax-loader.gif
similarity index 100%
rename from examples/roc_api/site/www/static/images/ajax-loader.gif
rename to examples/demo/site/www/static/images/ajax-loader.gif
diff --git a/examples/roc_api/site/www/static/images/favicon.ico b/examples/demo/site/www/static/images/favicon.ico
similarity index 100%
rename from examples/roc_api/site/www/static/images/favicon.ico
rename to examples/demo/site/www/static/images/favicon.ico
diff --git a/examples/roc_api/site/www/static/js/roc.js b/examples/demo/site/www/static/js/roc.js
similarity index 100%
rename from examples/roc_api/site/www/static/js/roc.js
rename to examples/demo/site/www/static/js/roc.js
diff --git a/examples/roc_api/site/www/themes/api/layout.tpl b/examples/demo/site/www/themes/api/layout.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/layout.tpl
rename to examples/demo/site/www/themes/api/layout.tpl
diff --git a/examples/roc_api/site/www/themes/api/layout2.tpl b/examples/demo/site/www/themes/api/layout2.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/layout2.tpl
rename to examples/demo/site/www/themes/api/layout2.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/basic_auth/logoff.tpl b/examples/demo/site/www/themes/api/master2/basic_auth/logoff.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/basic_auth/logoff.tpl
rename to examples/demo/site/www/themes/api/master2/basic_auth/logoff.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/content.tpl b/examples/demo/site/www/themes/api/master2/content.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/content.tpl
rename to examples/demo/site/www/themes/api/master2/content.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/error.tpl b/examples/demo/site/www/themes/api/master2/error.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/error.tpl
rename to examples/demo/site/www/themes/api/master2/error.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/footer.tpl b/examples/demo/site/www/themes/api/master2/footer.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/footer.tpl
rename to examples/demo/site/www/themes/api/master2/footer.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/head.tpl b/examples/demo/site/www/themes/api/master2/head.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/head.tpl
rename to examples/demo/site/www/themes/api/master2/head.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/header.tpl b/examples/demo/site/www/themes/api/master2/header.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/header.tpl
rename to examples/demo/site/www/themes/api/master2/header.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/main_navigation.tpl b/examples/demo/site/www/themes/api/master2/main_navigation.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/main_navigation.tpl
rename to examples/demo/site/www/themes/api/master2/main_navigation.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/optional_enhancement_js.tpl b/examples/demo/site/www/themes/api/master2/optional_enhancement_js.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/optional_enhancement_js.tpl
rename to examples/demo/site/www/themes/api/master2/optional_enhancement_js.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/optional_styling_css.tpl b/examples/demo/site/www/themes/api/master2/optional_styling_css.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/optional_styling_css.tpl
rename to examples/demo/site/www/themes/api/master2/optional_styling_css.tpl
diff --git a/examples/roc_api/site/www/themes/api/master2/site_navigation.tpl b/examples/demo/site/www/themes/api/master2/site_navigation.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/master2/site_navigation.tpl
rename to examples/demo/site/www/themes/api/master2/site_navigation.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/navigation.tpl b/examples/demo/site/www/themes/api/modules/navigation.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/navigation.tpl
rename to examples/demo/site/www/themes/api/modules/navigation.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/node.tpl b/examples/demo/site/www/themes/api/modules/node.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/node.tpl
rename to examples/demo/site/www/themes/api/modules/node.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/node_content.tpl b/examples/demo/site/www/themes/api/modules/node_content.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/node_content.tpl
rename to examples/demo/site/www/themes/api/modules/node_content.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/node_summary.tpl b/examples/demo/site/www/themes/api/modules/node_summary.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/node_summary.tpl
rename to examples/demo/site/www/themes/api/modules/node_summary.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/node_title.tpl b/examples/demo/site/www/themes/api/modules/node_title.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/node_title.tpl
rename to examples/demo/site/www/themes/api/modules/node_title.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/nodes.tpl b/examples/demo/site/www/themes/api/modules/nodes.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/nodes.tpl
rename to examples/demo/site/www/themes/api/modules/nodes.tpl
diff --git a/examples/roc_api/site/www/themes/api/modules/register.tpl b/examples/demo/site/www/themes/api/modules/register.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/api/modules/register.tpl
rename to examples/demo/site/www/themes/api/modules/register.tpl
diff --git a/examples/roc_api/site/www/themes/api/theme.info b/examples/demo/site/www/themes/api/theme.info
similarity index 100%
rename from examples/roc_api/site/www/themes/api/theme.info
rename to examples/demo/site/www/themes/api/theme.info
diff --git a/examples/roc_api/site/www/themes/bootstrap.7z b/examples/demo/site/www/themes/bootstrap.7z
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap.7z
rename to examples/demo/site/www/themes/bootstrap.7z
diff --git a/examples/roc_api/site/www/themes/bootstrap/block/header_block.tpl b/examples/demo/site/www/themes/bootstrap/block/header_block.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/block/header_block.tpl
rename to examples/demo/site/www/themes/bootstrap/block/header_block.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/page.tpl b/examples/demo/site/www/themes/bootstrap/page.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/page.tpl
rename to examples/demo/site/www/themes/bootstrap/page.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/roc_template -2.html b/examples/demo/site/www/themes/bootstrap/roc_template -2.html
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/roc_template -2.html
rename to examples/demo/site/www/themes/bootstrap/roc_template -2.html
diff --git a/examples/roc_api/site/www/themes/bootstrap/roc_template.html b/examples/demo/site/www/themes/bootstrap/roc_template.html
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/roc_template.html
rename to examples/demo/site/www/themes/bootstrap/roc_template.html
diff --git a/examples/roc_api/site/www/themes/bootstrap/theme.info b/examples/demo/site/www/themes/bootstrap/theme.info
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/theme.info
rename to examples/demo/site/www/themes/bootstrap/theme.info
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/help_section.tpl b/examples/demo/site/www/themes/bootstrap/tpl/help_section.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/help_section.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/help_section.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/highlighted_section.tpl b/examples/demo/site/www/themes/bootstrap/tpl/highlighted_section.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/highlighted_section.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/highlighted_section.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/left_sidebar.tpl b/examples/demo/site/www/themes/bootstrap/tpl/left_sidebar.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/left_sidebar.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/left_sidebar.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/main_content.tpl b/examples/demo/site/www/themes/bootstrap/tpl/main_content.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/main_content.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/main_content.tpl
diff --git a/examples/demo/site/www/themes/bootstrap/tpl/page_bottom.tpl b/examples/demo/site/www/themes/bootstrap/tpl/page_bottom.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/page_footer.tpl b/examples/demo/site/www/themes/bootstrap/tpl/page_footer.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/page_footer.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/page_footer.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/page_header.tpl b/examples/demo/site/www/themes/bootstrap/tpl/page_header.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/page_header.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/page_header.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/page_header2.tpl b/examples/demo/site/www/themes/bootstrap/tpl/page_header2.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/page_header2.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/page_header2.tpl
diff --git a/examples/demo/site/www/themes/bootstrap/tpl/page_top.tpl b/examples/demo/site/www/themes/bootstrap/tpl/page_top.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/primary_nav.tpl b/examples/demo/site/www/themes/bootstrap/tpl/primary_nav.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/primary_nav.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/primary_nav.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/right_sidebar.tpl b/examples/demo/site/www/themes/bootstrap/tpl/right_sidebar.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/right_sidebar.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/right_sidebar.tpl
diff --git a/examples/roc_api/site/www/themes/bootstrap/tpl/secondary_nav.tpl b/examples/demo/site/www/themes/bootstrap/tpl/secondary_nav.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/bootstrap/tpl/secondary_nav.tpl
rename to examples/demo/site/www/themes/bootstrap/tpl/secondary_nav.tpl
diff --git a/examples/roc_api/site/www/themes/smarty/front-page.tpl b/examples/demo/site/www/themes/smarty/front-page.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/front-page.tpl
rename to examples/demo/site/www/themes/smarty/front-page.tpl
diff --git a/examples/roc_api/site/www/themes/smarty/page.tpl b/examples/demo/site/www/themes/smarty/page.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/page.tpl
rename to examples/demo/site/www/themes/smarty/page.tpl
diff --git a/examples/roc_api/site/www/themes/smarty/res/ewfcms.js b/examples/demo/site/www/themes/smarty/res/ewfcms.js
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/ewfcms.js
rename to examples/demo/site/www/themes/smarty/res/ewfcms.js
diff --git a/examples/roc_api/site/www/themes/smarty/res/favicon.ico b/examples/demo/site/www/themes/smarty/res/favicon.ico
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/favicon.ico
rename to examples/demo/site/www/themes/smarty/res/favicon.ico
diff --git a/examples/roc_api/site/www/themes/smarty/res/logo.png b/examples/demo/site/www/themes/smarty/res/logo.png
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/logo.png
rename to examples/demo/site/www/themes/smarty/res/logo.png
diff --git a/examples/roc_api/site/www/themes/smarty/res/menu-collapsed.png b/examples/demo/site/www/themes/smarty/res/menu-collapsed.png
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/menu-collapsed.png
rename to examples/demo/site/www/themes/smarty/res/menu-collapsed.png
diff --git a/examples/roc_api/site/www/themes/smarty/res/menu-expanded.png b/examples/demo/site/www/themes/smarty/res/menu-expanded.png
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/menu-expanded.png
rename to examples/demo/site/www/themes/smarty/res/menu-expanded.png
diff --git a/examples/roc_api/site/www/themes/smarty/res/style.css b/examples/demo/site/www/themes/smarty/res/style.css
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/res/style.css
rename to examples/demo/site/www/themes/smarty/res/style.css
diff --git a/examples/roc_api/site/www/themes/smarty/theme.info b/examples/demo/site/www/themes/smarty/theme.info
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/theme.info
rename to examples/demo/site/www/themes/smarty/theme.info
diff --git a/examples/roc_api/site/www/themes/smarty/tpl/page-footer.tpl b/examples/demo/site/www/themes/smarty/tpl/page-footer.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/tpl/page-footer.tpl
rename to examples/demo/site/www/themes/smarty/tpl/page-footer.tpl
diff --git a/examples/roc_api/site/www/themes/smarty/tpl/page-header.tpl b/examples/demo/site/www/themes/smarty/tpl/page-header.tpl
similarity index 100%
rename from examples/roc_api/site/www/themes/smarty/tpl/page-header.tpl
rename to examples/demo/site/www/themes/smarty/tpl/page-header.tpl
diff --git a/examples/roc_api/src/ewf_roc_server.e b/examples/demo/src/ewf_roc_server.e
similarity index 99%
rename from examples/roc_api/src/ewf_roc_server.e
rename to examples/demo/src/ewf_roc_server.e
index 15e77f3..51e5462 100644
--- a/examples/roc_api/src/ewf_roc_server.e
+++ b/examples/demo/src/ewf_roc_server.e
@@ -42,7 +42,7 @@ feature {NONE} -- Initialization
 			-- Initialize current service.
 		do
 			Precursor
-			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("roc.ini")
+			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("demo.ini")
 			initialize_cms (cms_setup)
 		end