diff --git a/cms-safe.ecf b/cms-safe.ecf
index 0c11bd8..e727727 100644
--- a/cms-safe.ecf
+++ b/cms-safe.ecf
@@ -21,7 +21,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"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\library\src\" recursive="true">
+		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/CVS$</exclude>
diff --git a/cms.ecf b/cms.ecf
index ab8b278..9877329 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -22,7 +22,7 @@
 		<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=".\library\src\" recursive="true">
+		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/CVS$</exclude>
diff --git a/library/src/hooks/cms_hook.e b/library/src/hooks/cms_hook.e
deleted file mode 100644
index 0b64ab8..0000000
--- a/library/src/hooks/cms_hook.e
+++ /dev/null
@@ -1,11 +0,0 @@
-note
-	description: "[
-			Marker interface for CMS Hook
-		]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	CMS_HOOK
-
-end
diff --git a/src/configuration/cms_custom_setup.e b/src/configuration/cms_custom_setup.e
new file mode 100644
index 0000000..7aec82a
--- /dev/null
+++ b/src/configuration/cms_custom_setup.e
@@ -0,0 +1,15 @@
+note
+	description: "Summary description for {CMS_CUSTOM_SETUP}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_CUSTOM_SETUP
+
+inherit
+	CMS_DEFAULT_SETUP
+
+create
+	make
+	
+end
diff --git a/library/src/configuration/cms_default_setup.e b/src/configuration/cms_default_setup.e
similarity index 100%
rename from library/src/configuration/cms_default_setup.e
rename to src/configuration/cms_default_setup.e
diff --git a/library/src/configuration/cms_json_configuration.e b/src/configuration/cms_json_configuration.e
similarity index 100%
rename from library/src/configuration/cms_json_configuration.e
rename to src/configuration/cms_json_configuration.e
diff --git a/library/src/configuration/cms_layout.e b/src/configuration/cms_layout.e
similarity index 100%
rename from library/src/configuration/cms_layout.e
rename to src/configuration/cms_layout.e
diff --git a/library/src/configuration/cms_setup.e b/src/configuration/cms_setup.e
similarity index 100%
rename from library/src/configuration/cms_setup.e
rename to src/configuration/cms_setup.e
diff --git a/src/hooks/cms_hook.e b/src/hooks/cms_hook.e
new file mode 100644
index 0000000..5a73009
--- /dev/null
+++ b/src/hooks/cms_hook.e
@@ -0,0 +1,11 @@
+note
+	description: "[
+			Marker interface for CMS Hook
+		]"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
+
+deferred class
+	CMS_HOOK
+
+end
diff --git a/library/src/hooks/cms_hook_auto_register.e b/src/hooks/cms_hook_auto_register.e
similarity index 91%
rename from library/src/hooks/cms_hook_auto_register.e
rename to src/hooks/cms_hook_auto_register.e
index a9238bb..9030c0e 100644
--- a/library/src/hooks/cms_hook_auto_register.e
+++ b/src/hooks/cms_hook_auto_register.e
@@ -5,8 +5,8 @@ note
 			registered, otherwise, each descendant has to add it to the cms service
 			itself.
 		]"
-	date: "$Date: 2014-08-28 08:21:49 -0300 (ju. 28 de ago. de 2014) $"
-	revision: "$Revision: 95708 $"
+	date: "$Date: 2014-11-13 19:34:00 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96086 $"
 
 deferred class
 	CMS_HOOK_AUTO_REGISTER
diff --git a/library/src/hooks/cms_hook_block.e b/src/hooks/cms_hook_block.e
similarity index 81%
rename from library/src/hooks/cms_hook_block.e
rename to src/hooks/cms_hook_block.e
index 2f1898b..349f47c 100644
--- a/library/src/hooks/cms_hook_block.e
+++ b/src/hooks/cms_hook_block.e
@@ -2,8 +2,8 @@ note
 	description: "[
 				Hook providing a way to alter a block.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-19 20:00:19 +0100 (mer., 19 nov. 2014) $"
+	revision: "$Revision: 96123 $"
 
 deferred class
 	CMS_HOOK_BLOCK
diff --git a/library/src/hooks/cms_hook_block_helper.e b/src/hooks/cms_hook_block_helper.e
similarity index 100%
rename from library/src/hooks/cms_hook_block_helper.e
rename to src/hooks/cms_hook_block_helper.e
diff --git a/library/src/hooks/cms_hook_form_alter.e b/src/hooks/cms_hook_form_alter.e
similarity index 85%
rename from library/src/hooks/cms_hook_form_alter.e
rename to src/hooks/cms_hook_form_alter.e
index a9151ec..d908d93 100644
--- a/library/src/hooks/cms_hook_form_alter.e
+++ b/src/hooks/cms_hook_form_alter.e
@@ -2,7 +2,7 @@ note
 	description: "[
 			Hook providing a way to alter a form.
 		]"
-	date: "$Date$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
 
 deferred class
 	CMS_HOOK_FORM_ALTER
diff --git a/library/src/hooks/cms_hook_menu_alter.e b/src/hooks/cms_hook_menu_alter.e
similarity index 82%
rename from library/src/hooks/cms_hook_menu_alter.e
rename to src/hooks/cms_hook_menu_alter.e
index 17735b6..8c9c7cf 100644
--- a/library/src/hooks/cms_hook_menu_alter.e
+++ b/src/hooks/cms_hook_menu_alter.e
@@ -2,7 +2,7 @@ note
 	description: "[
 			Hook providing a way to alter a menu
 		]"
-	date: "$Date$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
 
 deferred class
 	CMS_HOOK_MENU_ALTER
diff --git a/library/src/hooks/cms_hook_menu_system_alter.e b/src/hooks/cms_hook_menu_system_alter.e
similarity index 85%
rename from library/src/hooks/cms_hook_menu_system_alter.e
rename to src/hooks/cms_hook_menu_system_alter.e
index 2bcb5e1..89358a8 100644
--- a/library/src/hooks/cms_hook_menu_system_alter.e
+++ b/src/hooks/cms_hook_menu_system_alter.e
@@ -2,7 +2,7 @@ note
 	description: "[
 			Hook providing a way to alter the CMS menu system.
 		]"
-	date: "$Date$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
 
 deferred class
 	CMS_HOOK_MENU_SYSTEM_ALTER
diff --git a/library/src/hooks/cms_hook_value_table_alter.e b/src/hooks/cms_hook_value_table_alter.e
similarity index 86%
rename from library/src/hooks/cms_hook_value_table_alter.e
rename to src/hooks/cms_hook_value_table_alter.e
index 564a8fb..dde0473 100644
--- a/library/src/hooks/cms_hook_value_table_alter.e
+++ b/src/hooks/cms_hook_value_table_alter.e
@@ -2,8 +2,8 @@ note
 	description: "[
 			Hook providing a way to alter the value table for a response.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_HOOK_VALUE_TABLE_ALTER
diff --git a/library/src/kernel/cms_common_api.e b/src/kernel/cms_common_api.e
similarity index 95%
rename from library/src/kernel/cms_common_api.e
rename to src/kernel/cms_common_api.e
index 9301ddf..7f94604 100644
--- a/library/src/kernel/cms_common_api.e
+++ b/src/kernel/cms_common_api.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {WSF_CMS_COMMON_API}."
 	author: ""
-	date: "$Date: 2014-08-28 08:21:49 -0300 (ju. 28 de ago. de 2014) $"
-	revision: "$Revision: 95708 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_COMMON_API
diff --git a/library/src/kernel/content/cms_block.e b/src/kernel/content/cms_block.e
similarity index 89%
rename from library/src/kernel/content/cms_block.e
rename to src/kernel/content/cms_block.e
index 16ce3ae..4da3f62 100644
--- a/library/src/kernel/content/cms_block.e
+++ b/src/kernel/content/cms_block.e
@@ -1,6 +1,6 @@
 note
 	description: "Describe content to be placed inside Regions."
-	date: "$Date: 2014-08-28 08:21:49 -0300 (ju. 28 de ago. de 2014) $"
+	date: "$Date: 2014-11-17 18:47:30 +0100 (lun., 17 nov. 2014) $"
 
 deferred class
 	CMS_BLOCK
diff --git a/library/src/kernel/content/cms_block_region.e b/src/kernel/content/cms_block_region.e
similarity index 91%
rename from library/src/kernel/content/cms_block_region.e
rename to src/kernel/content/cms_block_region.e
index baef14f..4634da8 100644
--- a/library/src/kernel/content/cms_block_region.e
+++ b/src/kernel/content/cms_block_region.e
@@ -1,6 +1,6 @@
 note
 	description: "Summary description for {CMS_BLOCK_REGION}."
-	date: "$Date: 2014-10-30 12:55:33 -0300 (ju. 30 de oct. de 2014) $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
 
 class
 	CMS_BLOCK_REGION
diff --git a/library/src/kernel/content/cms_content_block.e b/src/kernel/content/cms_content_block.e
similarity index 95%
rename from library/src/kernel/content/cms_content_block.e
rename to src/kernel/content/cms_content_block.e
index 7d43464..b084a89 100644
--- a/library/src/kernel/content/cms_content_block.e
+++ b/src/kernel/content/cms_content_block.e
@@ -1,7 +1,7 @@
 note
 	description: "CMS_BLOCK implemented with a `content' associated with a specific `format'."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-18 10:13:13 +0100 (mar., 18 nov. 2014) $"
+	revision: "$Revision: 96110 $"
 
 class
 	CMS_CONTENT_BLOCK
diff --git a/library/src/kernel/content/cms_encoders.e b/src/kernel/content/cms_encoders.e
similarity index 85%
rename from library/src/kernel/content/cms_encoders.e
rename to src/kernel/content/cms_encoders.e
index 36b60fc..348d70d 100644
--- a/library/src/kernel/content/cms_encoders.e
+++ b/src/kernel/content/cms_encoders.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_ENCODERS}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_ENCODERS
diff --git a/src/kernel/content/cms_file_block.e b/src/kernel/content/cms_file_block.e
new file mode 100644
index 0000000..9548732
--- /dev/null
+++ b/src/kernel/content/cms_file_block.e
@@ -0,0 +1,148 @@
+note
+	description: "[
+			CMS block with file content.
+		]"
+	date: "$Date: 2014-12-05 22:39:27 +0100 (ven., 05 déc. 2014) $"
+	revision: "$Revision: 96260 $"
+
+class
+	CMS_FILE_BLOCK
+
+inherit
+	CMS_BLOCK
+		redefine
+			out
+		end
+
+create
+	make,
+	make_raw
+
+feature {NONE} -- Initialization
+
+	make (a_name: like name; a_title: like title; a_files_root_path: detachable PATH; a_file_location: PATH)
+			-- Create Current with `a_name', `a_title', `a_file_location'
+			-- inside root directory `a_files_root_path' for the files.
+		require
+			a_name_not_blank: not a_name.is_whitespace
+		do
+			is_enabled := True
+			name := a_name
+			title := a_title
+			location := a_file_location
+			root_path := a_files_root_path
+		end
+
+	make_raw (a_name: like name; a_title: like title; a_files_root_path: PATH; a_file_location: PATH)
+			-- Create Current with `a_name', `a_title', `a_file_location'
+			-- inside root directory `a_files_root_path' for the files.
+		require
+			a_name_not_blank: not a_name.is_whitespace
+		do
+			make (a_name, a_title, a_files_root_path, a_file_location)
+			set_is_raw (True)
+		end
+
+feature -- Access
+
+	name: READABLE_STRING_8
+			-- <Precursor>
+
+	title: detachable READABLE_STRING_32
+			-- <Precursor>
+
+	location: PATH
+			-- Location of file.
+
+	root_path: detachable PATH
+			-- Root location for files universe.
+
+feature -- Status report
+
+	is_raw: BOOLEAN
+			-- Is raw?
+			-- If True, do not get wrapped it with block specific div	
+
+feature -- Element change
+
+	set_is_raw (b: BOOLEAN)
+		do
+			is_raw := b
+		end
+
+	set_name (n: like name)
+			-- Set `name' to `n'.
+		require
+			not n.is_whitespace
+		do
+			name := n
+		end
+
+	set_title (a_title: like title)
+			-- Set `title' to `a_title'.
+		do
+			title := a_title
+		end
+
+feature -- Conversion
+
+	to_html (a_theme: CMS_THEME): STRING_8
+			-- <Precursor>
+		local
+			p: detachable PATH
+			f: RAW_FILE
+			ut: FILE_UTILITIES
+		do
+				-- Process html generation
+			if attached root_path as l_root_path then
+				p := l_root_path.extended_path (location)
+			else
+				p := location
+			end
+			if ut.file_path_exists (p) then
+				create f.make_with_path (p)
+				if f.exists and then f.is_access_readable then
+					create Result.make (f.count)
+					f.open_read
+					from
+					until
+						f.end_of_file or f.exhausted
+					loop
+						f.read_stream_thread_aware (1_024)
+						Result.append (f.last_string)
+					end
+					f.close
+				else
+					Result := ""
+					debug ("cms")
+						Result := "File block #" + name
+					end
+				end
+			else
+				Result := ""
+				debug ("cms")
+					Result := "File block #" + name
+				end
+			end
+		end
+
+feature -- Debug
+
+	out: STRING
+		do
+			create Result.make_from_string (generator)
+			Result.append ("%Nname:")
+			Result.append (name)
+			if attached title as l_title then
+				Result.append ("%N%Ttitle:")
+				Result.append (l_title)
+			end
+			Result.append ("%Nlocation:")
+			Result.append (location.out)
+			if attached root_path as l_root_path then
+				Result.append ("%Nroot_path:")
+				Result.append (l_root_path.out)
+			end
+			Result.append ("%N")
+		end
+end
diff --git a/library/src/kernel/content/cms_menu_block.e b/src/kernel/content/cms_menu_block.e
similarity index 100%
rename from library/src/kernel/content/cms_menu_block.e
rename to src/kernel/content/cms_menu_block.e
diff --git a/library/src/kernel/content/cms_smarty_template_block.e b/src/kernel/content/cms_smarty_template_block.e
similarity index 100%
rename from library/src/kernel/content/cms_smarty_template_block.e
rename to src/kernel/content/cms_smarty_template_block.e
diff --git a/library/src/kernel/content/cms_value_table.e b/src/kernel/content/cms_value_table.e
similarity index 94%
rename from library/src/kernel/content/cms_value_table.e
rename to src/kernel/content/cms_value_table.e
index e29e2de..07c540b 100644
--- a/library/src/kernel/content/cms_value_table.e
+++ b/src/kernel/content/cms_value_table.e
@@ -3,8 +3,8 @@ note
 			Object containing a collection of values.
 			It is typically used by `{CMS_RESPONSE}.values' .
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_VALUE_TABLE
diff --git a/library/src/kernel/content/format/cms_formats.e b/src/kernel/content/format/cms_formats.e
similarity index 92%
rename from library/src/kernel/content/format/cms_formats.e
rename to src/kernel/content/format/cms_formats.e
index 11823ae..3a5d52d 100644
--- a/library/src/kernel/content/format/cms_formats.e
+++ b/src/kernel/content/format/cms_formats.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_FORMATS}."
 	author: ""
-	date: "$Date: 2014-10-16 04:45:23 -0300 (ju. 16 de oct. de 2014) $"
-	revision: "$Revision: 95932 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_FORMATS
diff --git a/library/src/kernel/form/cms_form.e b/src/kernel/form/cms_form.e
similarity index 87%
rename from library/src/kernel/form/cms_form.e
rename to src/kernel/form/cms_form.e
index b98fd06..1799394 100644
--- a/library/src/kernel/form/cms_form.e
+++ b/src/kernel/form/cms_form.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {CMS_FORM}."
-	date: "$Date: 2014-08-28 08:21:49 -0300 (ju. 28 de ago. de 2014) $"
-	revision: "$Revision: 95708 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_FORM
diff --git a/library/src/kernel/link/cms_menu_system.e b/src/kernel/link/cms_menu_system.e
similarity index 94%
rename from library/src/kernel/link/cms_menu_system.e
rename to src/kernel/link/cms_menu_system.e
index 73e519e..b67d255 100644
--- a/library/src/kernel/link/cms_menu_system.e
+++ b/src/kernel/link/cms_menu_system.e
@@ -2,8 +2,8 @@ note
 	description: "[
 			Menu associated with CMS system.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_MENU_SYSTEM
diff --git a/library/src/modules/basic_auth/basic_auth_module.e b/src/modules/basic_auth/basic_auth_module.e
similarity index 94%
rename from library/src/modules/basic_auth/basic_auth_module.e
rename to src/modules/basic_auth/basic_auth_module.e
index b17d608..c015ec0 100644
--- a/library/src/modules/basic_auth/basic_auth_module.e
+++ b/src/modules/basic_auth/basic_auth_module.e
@@ -1,7 +1,7 @@
 note
 	description: "This module allows the use of HTTP Basic Authentication to restrict access by looking up users in the given providers."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	BASIC_AUTH_MODULE
diff --git a/library/src/modules/basic_auth/filter/basic_auth_filter.e b/src/modules/basic_auth/filter/basic_auth_filter.e
similarity index 94%
rename from library/src/modules/basic_auth/filter/basic_auth_filter.e
rename to src/modules/basic_auth/filter/basic_auth_filter.e
index a96379a..e77073f 100644
--- a/library/src/modules/basic_auth/filter/basic_auth_filter.e
+++ b/src/modules/basic_auth/filter/basic_auth_filter.e
@@ -1,7 +1,7 @@
 note
 	description: "Processes a HTTP request's BASIC authorization headers, putting the result into the execution variable user."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	BASIC_AUTH_FILTER
diff --git a/library/src/modules/basic_auth/filter/cors_filter.e b/src/modules/basic_auth/filter/cors_filter.e
similarity index 86%
rename from library/src/modules/basic_auth/filter/cors_filter.e
rename to src/modules/basic_auth/filter/cors_filter.e
index bea5958..370a545 100644
--- a/library/src/modules/basic_auth/filter/cors_filter.e
+++ b/src/modules/basic_auth/filter/cors_filter.e
@@ -1,7 +1,7 @@
 note
 	description: "CORS filter"
-	date: "$Date: 2014-08-08 16:02:11 -0300 (vi., 08 ago. 2014) $"
-	revision: "$Revision: 95593 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CORS_FILTER
diff --git a/library/src/modules/basic_auth/handler/basic_auth_login_handler.e b/src/modules/basic_auth/handler/basic_auth_login_handler.e
similarity index 91%
rename from library/src/modules/basic_auth/handler/basic_auth_login_handler.e
rename to src/modules/basic_auth/handler/basic_auth_login_handler.e
index 4035e0f..fd1ca36 100644
--- a/library/src/modules/basic_auth/handler/basic_auth_login_handler.e
+++ b/src/modules/basic_auth/handler/basic_auth_login_handler.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {BASIC_AUTH_LOGIN_HANDLER}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	BASIC_AUTH_LOGIN_HANDLER
diff --git a/library/src/modules/basic_auth/handler/basic_auth_logoff_handler.e b/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
similarity index 91%
rename from library/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
rename to src/modules/basic_auth/handler/basic_auth_logoff_handler.e
index 300eafe..0a0f524 100644
--- a/library/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
+++ b/src/modules/basic_auth/handler/basic_auth_logoff_handler.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {BASIC_AUTH_LOGOFF_HANDLER}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	BASIC_AUTH_LOGOFF_HANDLER
diff --git a/library/src/modules/cms_debug_module.e b/src/modules/cms_debug_module.e
similarity index 100%
rename from library/src/modules/cms_debug_module.e
rename to src/modules/cms_debug_module.e
diff --git a/library/src/modules/cms_module.e b/src/modules/cms_module.e
similarity index 93%
rename from library/src/modules/cms_module.e
rename to src/modules/cms_module.e
index 88e2141..ed05acb 100644
--- a/library/src/modules/cms_module.e
+++ b/src/modules/cms_module.e
@@ -1,7 +1,7 @@
 note
 	description: "Describe module features that adds one or more features to your web site."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_MODULE
diff --git a/library/src/modules/cms_module_collection.e b/src/modules/cms_module_collection.e
similarity index 90%
rename from library/src/modules/cms_module_collection.e
rename to src/modules/cms_module_collection.e
index a7f94d2..4533341 100644
--- a/library/src/modules/cms_module_collection.e
+++ b/src/modules/cms_module_collection.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_MODULE_COLLECTION}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_MODULE_COLLECTION
diff --git a/library/src/modules/node/handler/node_content_handler.e b/src/modules/node/handler/node_content_handler.e
similarity index 100%
rename from library/src/modules/node/handler/node_content_handler.e
rename to src/modules/node/handler/node_content_handler.e
diff --git a/library/src/modules/node/handler/node_handler.e b/src/modules/node/handler/node_handler.e
similarity index 100%
rename from library/src/modules/node/handler/node_handler.e
rename to src/modules/node/handler/node_handler.e
diff --git a/library/src/modules/node/handler/node_summary_handler.e b/src/modules/node/handler/node_summary_handler.e
similarity index 100%
rename from library/src/modules/node/handler/node_summary_handler.e
rename to src/modules/node/handler/node_summary_handler.e
diff --git a/library/src/modules/node/handler/node_title_handler.e b/src/modules/node/handler/node_title_handler.e
similarity index 100%
rename from library/src/modules/node/handler/node_title_handler.e
rename to src/modules/node/handler/node_title_handler.e
diff --git a/library/src/modules/node/handler/nodes_handler.e b/src/modules/node/handler/nodes_handler.e
similarity index 91%
rename from library/src/modules/node/handler/nodes_handler.e
rename to src/modules/node/handler/nodes_handler.e
index 651e8e7..a5c4a48 100644
--- a/library/src/modules/node/handler/nodes_handler.e
+++ b/src/modules/node/handler/nodes_handler.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {NODES_HANDLER}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	NODES_HANDLER
diff --git a/library/src/modules/node/node_module.e b/src/modules/node/node_module.e
similarity index 100%
rename from library/src/modules/node/node_module.e
rename to src/modules/node/node_module.e
diff --git a/library/src/persistence/cms_storage.e b/src/persistence/cms_storage.e
similarity index 100%
rename from library/src/persistence/cms_storage.e
rename to src/persistence/cms_storage.e
diff --git a/library/src/persistence/cms_storage_builder.e b/src/persistence/cms_storage_builder.e
similarity index 100%
rename from library/src/persistence/cms_storage_builder.e
rename to src/persistence/cms_storage_builder.e
diff --git a/library/src/persistence/cms_storage_null.e b/src/persistence/cms_storage_null.e
similarity index 100%
rename from library/src/persistence/cms_storage_null.e
rename to src/persistence/cms_storage_null.e
diff --git a/library/src/persistence/cms_storage_null_builder.e b/src/persistence/cms_storage_null_builder.e
similarity index 100%
rename from library/src/persistence/cms_storage_null_builder.e
rename to src/persistence/cms_storage_null_builder.e
diff --git a/library/src/persistence/cms_storage_sql.e b/src/persistence/cms_storage_sql.e
similarity index 100%
rename from library/src/persistence/cms_storage_sql.e
rename to src/persistence/cms_storage_sql.e
diff --git a/library/src/persistence/node/cms_node_storage.e b/src/persistence/node/cms_node_storage.e
similarity index 100%
rename from library/src/persistence/node/cms_node_storage.e
rename to src/persistence/node/cms_node_storage.e
diff --git a/library/src/persistence/node/cms_node_storage_sql.e b/src/persistence/node/cms_node_storage_sql.e
similarity index 100%
rename from library/src/persistence/node/cms_node_storage_sql.e
rename to src/persistence/node/cms_node_storage_sql.e
diff --git a/library/src/persistence/user/cms_user_storage.e b/src/persistence/user/cms_user_storage.e
similarity index 100%
rename from library/src/persistence/user/cms_user_storage.e
rename to src/persistence/user/cms_user_storage.e
diff --git a/library/src/persistence/user/cms_user_storage_sql.e b/src/persistence/user/cms_user_storage_sql.e
similarity index 100%
rename from library/src/persistence/user/cms_user_storage_sql.e
rename to src/persistence/user/cms_user_storage_sql.e
diff --git a/library/src/security/security_provider.e b/src/security/security_provider.e
similarity index 100%
rename from library/src/security/security_provider.e
rename to src/security/security_provider.e
diff --git a/library/src/service/cms_api.e b/src/service/cms_api.e
similarity index 100%
rename from library/src/service/cms_api.e
rename to src/service/cms_api.e
diff --git a/library/src/service/cms_api_options.e b/src/service/cms_api_options.e
similarity index 63%
rename from library/src/service/cms_api_options.e
rename to src/service/cms_api_options.e
index 1a5dc6e..2ce3f29 100644
--- a/library/src/service/cms_api_options.e
+++ b/src/service/cms_api_options.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_API_OPTIONS}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_API_OPTIONS
diff --git a/library/src/service/cms_request_util.e b/src/service/cms_request_util.e
similarity index 92%
rename from library/src/service/cms_request_util.e
rename to src/service/cms_request_util.e
index e6a1be6..eefc49b 100644
--- a/library/src/service/cms_request_util.e
+++ b/src/service/cms_request_util.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_REQUEST_UTIL}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_REQUEST_UTIL
diff --git a/library/src/service/cms_service.e b/src/service/cms_service.e
similarity index 100%
rename from library/src/service/cms_service.e
rename to src/service/cms_service.e
diff --git a/library/src/service/cms_url_utilities.e b/src/service/cms_url_utilities.e
similarity index 96%
rename from library/src/service/cms_url_utilities.e
rename to src/service/cms_url_utilities.e
index 8fff472..378bbde 100644
--- a/library/src/service/cms_url_utilities.e
+++ b/src/service/cms_url_utilities.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_URL_UTILITIES}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_URL_UTILITIES
diff --git a/library/src/service/filter/cms_error_filter.e b/src/service/filter/cms_error_filter.e
similarity index 100%
rename from library/src/service/filter/cms_error_filter.e
rename to src/service/filter/cms_error_filter.e
diff --git a/library/src/service/handler/cms_handler.e b/src/service/handler/cms_handler.e
similarity index 79%
rename from library/src/service/handler/cms_handler.e
rename to src/service/handler/cms_handler.e
index 9de1552..366d853 100644
--- a/library/src/service/handler/cms_handler.e
+++ b/src/service/handler/cms_handler.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_HANDLER}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_HANDLER
diff --git a/library/src/service/handler/cms_root_handler.e b/src/service/handler/cms_root_handler.e
similarity index 88%
rename from library/src/service/handler/cms_root_handler.e
rename to src/service/handler/cms_root_handler.e
index cf1284d..1364e1c 100644
--- a/library/src/service/handler/cms_root_handler.e
+++ b/src/service/handler/cms_root_handler.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {CMS_ROOT_HANDLER}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_ROOT_HANDLER
diff --git a/library/src/service/response/bad_request_error_cms_response.e b/src/service/response/bad_request_error_cms_response.e
similarity index 100%
rename from library/src/service/response/bad_request_error_cms_response.e
rename to src/service/response/bad_request_error_cms_response.e
diff --git a/library/src/service/response/cms_generic_response.e b/src/service/response/cms_generic_response.e
similarity index 93%
rename from library/src/service/response/cms_generic_response.e
rename to src/service/response/cms_generic_response.e
index 371bc05..8728865 100644
--- a/library/src/service/response/cms_generic_response.e
+++ b/src/service/response/cms_generic_response.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {CMS_GENERIC_RESPONSE}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_GENERIC_RESPONSE
diff --git a/library/src/service/response/cms_response.e b/src/service/response/cms_response.e
similarity index 100%
rename from library/src/service/response/cms_response.e
rename to src/service/response/cms_response.e
diff --git a/library/src/service/response/generic_view_cms_response.e b/src/service/response/generic_view_cms_response.e
similarity index 84%
rename from library/src/service/response/generic_view_cms_response.e
rename to src/service/response/generic_view_cms_response.e
index 80ce094..3644c1b 100644
--- a/library/src/service/response/generic_view_cms_response.e
+++ b/src/service/response/generic_view_cms_response.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {NODE_VIEW_CMS_RESPONSE}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	GENERIC_VIEW_CMS_RESPONSE
diff --git a/library/src/service/response/home_cms_response.e b/src/service/response/home_cms_response.e
similarity index 100%
rename from library/src/service/response/home_cms_response.e
rename to src/service/response/home_cms_response.e
diff --git a/library/src/service/response/internal_server_error_cms_response.e b/src/service/response/internal_server_error_cms_response.e
similarity index 100%
rename from library/src/service/response/internal_server_error_cms_response.e
rename to src/service/response/internal_server_error_cms_response.e
diff --git a/library/src/service/response/not_found_error_cms_response.e b/src/service/response/not_found_error_cms_response.e
similarity index 87%
rename from library/src/service/response/not_found_error_cms_response.e
rename to src/service/response/not_found_error_cms_response.e
index 1f6c87c..2f9ae36 100644
--- a/library/src/service/response/not_found_error_cms_response.e
+++ b/src/service/response/not_found_error_cms_response.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {NOT_FOUND_ERROR_CMS_RESPONSE}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 19:34:00 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96086 $"
 
 class
 	NOT_FOUND_ERROR_CMS_RESPONSE
diff --git a/library/src/service/response/not_implemented_error_cms_response.e b/src/service/response/not_implemented_error_cms_response.e
similarity index 100%
rename from library/src/service/response/not_implemented_error_cms_response.e
rename to src/service/response/not_implemented_error_cms_response.e
diff --git a/library/src/theme/cms_html_page.e b/src/theme/cms_html_page.e
similarity index 97%
rename from library/src/theme/cms_html_page.e
rename to src/theme/cms_html_page.e
index ca3353e..e9ff518 100644
--- a/library/src/theme/cms_html_page.e
+++ b/src/theme/cms_html_page.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_HTML_PAGE}."
 	author: ""
-	date: "$Date: 2014-11-04 09:57:24 -0300 (ma. 04 de nov. de 2014) $"
-	revision: "$Revision: 96034 $"
+	date: "$Date: 2014-11-13 19:34:00 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96086 $"
 
 class
 	CMS_HTML_PAGE
diff --git a/library/src/theme/cms_html_page_response.e b/src/theme/cms_html_page_response.e
similarity index 93%
rename from library/src/theme/cms_html_page_response.e
rename to src/theme/cms_html_page_response.e
index 97af15f..3d8c871 100644
--- a/library/src/theme/cms_html_page_response.e
+++ b/src/theme/cms_html_page_response.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_HTML_PAGE_RESPONSE}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_HTML_PAGE_RESPONSE
diff --git a/library/src/theme/cms_html_template.e b/src/theme/cms_html_template.e
similarity index 59%
rename from library/src/theme/cms_html_template.e
rename to src/theme/cms_html_template.e
index 86a93f5..35fe2f3 100644
--- a/library/src/theme/cms_html_template.e
+++ b/src/theme/cms_html_template.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {WSF_CMS_HTML_TEMPLATE}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_HTML_TEMPLATE
diff --git a/library/src/theme/cms_page_template.e b/src/theme/cms_page_template.e
similarity index 59%
rename from library/src/theme/cms_page_template.e
rename to src/theme/cms_page_template.e
index 74c3664..002ad08 100644
--- a/library/src/theme/cms_page_template.e
+++ b/src/theme/cms_page_template.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_PAGE_TEMPLATE}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	CMS_PAGE_TEMPLATE
diff --git a/library/src/theme/cms_template.e b/src/theme/cms_template.e
similarity index 100%
rename from library/src/theme/cms_template.e
rename to src/theme/cms_template.e
diff --git a/library/src/theme/cms_theme.e b/src/theme/cms_theme.e
similarity index 96%
rename from library/src/theme/cms_theme.e
rename to src/theme/cms_theme.e
index 51081c0..a038482 100644
--- a/library/src/theme/cms_theme.e
+++ b/src/theme/cms_theme.e
@@ -1,7 +1,7 @@
 note
 	description: "Abstract class describing a generic theme"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-18 02:49:56 +0100 (mar., 18 nov. 2014) $"
+	revision: "$Revision: 96108 $"
 
 deferred class
 	CMS_THEME
diff --git a/library/src/theme/cms_theme_information.e b/src/theme/cms_theme_information.e
similarity index 97%
rename from library/src/theme/cms_theme_information.e
rename to src/theme/cms_theme_information.e
index 719b3c1..504437f 100644
--- a/library/src/theme/cms_theme_information.e
+++ b/src/theme/cms_theme_information.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {CMS_THEME_INFORMATION}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	CMS_THEME_INFORMATION
diff --git a/library/src/theme/default_cms_template.e b/src/theme/default_cms_template.e
similarity index 93%
rename from library/src/theme/default_cms_template.e
rename to src/theme/default_cms_template.e
index e919318..47f208d 100644
--- a/library/src/theme/default_cms_template.e
+++ b/src/theme/default_cms_template.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {DEFAULT_CMS_TEMPLATE}."
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 deferred class
 	DEFAULT_CMS_TEMPLATE
diff --git a/library/src/theme/missing_theme/missing_cms_template.e b/src/theme/missing_theme/missing_cms_template.e
similarity index 86%
rename from library/src/theme/missing_theme/missing_cms_template.e
rename to src/theme/missing_theme/missing_cms_template.e
index e228bcc..3c2de87 100644
--- a/library/src/theme/missing_theme/missing_cms_template.e
+++ b/src/theme/missing_theme/missing_cms_template.e
@@ -2,8 +2,8 @@ note
 	description: "[
 			Template to be used with missing theme.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-19 20:00:19 +0100 (mer., 19 nov. 2014) $"
+	revision: "$Revision: 96123 $"
 
 class
 	MISSING_CMS_TEMPLATE
diff --git a/library/src/theme/missing_theme/missing_cms_theme.e b/src/theme/missing_theme/missing_cms_theme.e
similarity index 88%
rename from library/src/theme/missing_theme/missing_cms_theme.e
rename to src/theme/missing_theme/missing_cms_theme.e
index 8c2c531..b6c5ab9 100644
--- a/library/src/theme/missing_theme/missing_cms_theme.e
+++ b/src/theme/missing_theme/missing_cms_theme.e
@@ -3,8 +3,8 @@ note
 			Theme used when expected theme is missing.
 			It is mainly used to report missing theme error.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-19 20:00:19 +0100 (mer., 19 nov. 2014) $"
+	revision: "$Revision: 96123 $"
 
 class
 	MISSING_CMS_THEME
diff --git a/library/src/theme/smarty_theme/smarty_cms_html_page_inspector.e b/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
similarity index 93%
rename from library/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
rename to src/theme/smarty_theme/smarty_cms_html_page_inspector.e
index cbe3c4a..8a17b91 100644
--- a/library/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
+++ b/src/theme/smarty_theme/smarty_cms_html_page_inspector.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {SMARTY_CMS_HTML_PAGE_INSPECTOR}."
 	author: ""
-	date: "$Date: 2014-11-07 04:58:41 -0300 (vi. 07 de nov. de 2014) $"
-	revision: "$Revision: 96042 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	SMARTY_CMS_HTML_PAGE_INSPECTOR
diff --git a/library/src/theme/smarty_theme/smarty_cms_page_template.e b/src/theme/smarty_theme/smarty_cms_page_template.e
similarity index 100%
rename from library/src/theme/smarty_theme/smarty_cms_page_template.e
rename to src/theme/smarty_theme/smarty_cms_page_template.e
diff --git a/library/src/theme/smarty_theme/smarty_cms_regions_inspector.e b/src/theme/smarty_theme/smarty_cms_regions_inspector.e
similarity index 91%
rename from library/src/theme/smarty_theme/smarty_cms_regions_inspector.e
rename to src/theme/smarty_theme/smarty_cms_regions_inspector.e
index 6325103..32597e2 100644
--- a/library/src/theme/smarty_theme/smarty_cms_regions_inspector.e
+++ b/src/theme/smarty_theme/smarty_cms_regions_inspector.e
@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {SMARTY_CMS_REGIONS_INSPECTOR}."
 	author: ""
-	date: "$Date: 2014-11-06 17:59:12 -0300 (ju. 06 de nov. de 2014) $"
-	revision: "$Revision: 96040 $"
+	date: "$Date: 2014-11-13 16:23:47 +0100 (jeu., 13 nov. 2014) $"
+	revision: "$Revision: 96085 $"
 
 class
 	SMARTY_CMS_REGIONS_INSPECTOR
diff --git a/library/src/theme/smarty_theme/smarty_cms_theme.e b/src/theme/smarty_theme/smarty_cms_theme.e
similarity index 100%
rename from library/src/theme/smarty_theme/smarty_cms_theme.e
rename to src/theme/smarty_theme/smarty_cms_theme.e
diff --git a/library/src/theme/smarty_theme/string_table_of_string_inspector.e b/src/theme/smarty_theme/string_table_of_string_inspector.e
similarity index 100%
rename from library/src/theme/smarty_theme/string_table_of_string_inspector.e
rename to src/theme/smarty_theme/string_table_of_string_inspector.e