diff --git a/library/server/wsf_js_widget/autocompletion/wsf_autocompletion.e b/draft/library/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e
similarity index 100%
rename from library/server/wsf_js_widget/autocompletion/wsf_autocompletion.e
rename to draft/library/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e
diff --git a/library/server/wsf_js_widget/autocompletion/wsf_simple_autocompletion.e b/draft/library/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
similarity index 100%
rename from library/server/wsf_js_widget/autocompletion/wsf_simple_autocompletion.e
rename to draft/library/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
diff --git a/library/server/wsf_js_widget/grid/wsf_datasource.e b/draft/library/wsf_js_widget/kernel/grid/wsf_datasource.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_datasource.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_datasource.e
diff --git a/library/server/wsf_js_widget/grid/wsf_entity.e b/draft/library/wsf_js_widget/kernel/grid/wsf_entity.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_entity.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_entity.e
diff --git a/library/server/wsf_js_widget/grid/wsf_grid_column.e b/draft/library/wsf_js_widget/kernel/grid/wsf_grid_column.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_grid_column.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_grid_column.e
diff --git a/library/server/wsf_js_widget/grid/wsf_grid_control.e b/draft/library/wsf_js_widget/kernel/grid/wsf_grid_control.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_grid_control.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_grid_control.e
diff --git a/library/server/wsf_js_widget/grid/wsf_grid_image_column.e b/draft/library/wsf_js_widget/kernel/grid/wsf_grid_image_column.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_grid_image_column.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_grid_image_column.e
diff --git a/library/server/wsf_js_widget/grid/wsf_pagable_datasource.e b/draft/library/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_pagable_datasource.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e
diff --git a/library/server/wsf_js_widget/grid/wsf_pagination_control.e b/draft/library/wsf_js_widget/kernel/grid/wsf_pagination_control.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_pagination_control.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_pagination_control.e
diff --git a/library/server/wsf_js_widget/grid/wsf_repeater_control.e b/draft/library/wsf_js_widget/kernel/grid/wsf_repeater_control.e
similarity index 100%
rename from library/server/wsf_js_widget/grid/wsf_repeater_control.e
rename to draft/library/wsf_js_widget/kernel/grid/wsf_repeater_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_autocomplete_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_autocomplete_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_autocomplete_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_autocomplete_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_checkbox_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_checkbox_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_checkbox_list_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_checkbox_list_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_input_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_input_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_input_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_password_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_password_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_password_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_password_control.e
diff --git a/library/server/wsf_js_widget/input/wsf_textarea_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_textarea_control.e
similarity index 100%
rename from library/server/wsf_js_widget/input/wsf_textarea_control.e
rename to draft/library/wsf_js_widget/kernel/input/wsf_textarea_control.e
diff --git a/library/server/wsf_js_widget/navbar/wsf_navbar_control.e b/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
similarity index 100%
rename from library/server/wsf_js_widget/navbar/wsf_navbar_control.e
rename to draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
diff --git a/library/server/wsf_js_widget/progressbar/wsf_progress_control.e b/draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_control.e
similarity index 100%
rename from library/server/wsf_js_widget/progressbar/wsf_progress_control.e
rename to draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_control.e
diff --git a/library/server/wsf_js_widget/progressbar/wsf_progresssource.e b/draft/library/wsf_js_widget/kernel/progressbar/wsf_progresssource.e
similarity index 100%
rename from library/server/wsf_js_widget/progressbar/wsf_progresssource.e
rename to draft/library/wsf_js_widget/kernel/progressbar/wsf_progresssource.e
diff --git a/library/server/wsf_js_widget/wsf_image_slider_control.e b/draft/library/wsf_js_widget/kernel/slider/wsf_image_slider_control.e
similarity index 100%
rename from library/server/wsf_js_widget/wsf_image_slider_control.e
rename to draft/library/wsf_js_widget/kernel/slider/wsf_image_slider_control.e
diff --git a/library/server/wsf_js_widget/validator/wsf_decimal_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_decimal_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_decimal_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_decimal_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_email_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_email_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_email_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_email_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_max_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_max_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_max_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_max_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_min_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_min_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_min_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_min_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_phone_number_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_phone_number_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_phone_number_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_phone_number_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_regexp_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_regexp_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e
diff --git a/library/server/wsf_js_widget/validator/wsf_validatable.e b/draft/library/wsf_js_widget/kernel/validator/wsf_validatable.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_validatable.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_validatable.e
diff --git a/library/server/wsf_js_widget/validator/wsf_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validator/wsf_validator.e
rename to draft/library/wsf_js_widget/kernel/validator/wsf_validator.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_basic_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_basic_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_button_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_button_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_button_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_button_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_form_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_form_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_form_element_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_form_element_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_html_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_html_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_multi_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_multi_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_page_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_page_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_stateless_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_stateless_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
diff --git a/library/server/wsf_js_widget/webcontrol/wsf_value_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e
similarity index 100%
rename from library/server/wsf_js_widget/webcontrol/wsf_value_control.e
rename to draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e
diff --git a/library/server/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
similarity index 56%
rename from library/server/wsf_js_widget/wsf_js_widget-safe.ecf
rename to draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
index 901f9d88..e7f38069 100644
--- a/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -10,19 +10,12 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
-		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
+		<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf"/>
+		<library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<library name="pcre" location="$ISE_EIFFEL\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
-		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
-		<library name="wsf" location="..\wsf\wsf-safe.ecf"/>
-		<cluster name="autocompletion" location=".\autocompletion\"/>
-		<cluster name="grid" location=".\grid\"/>
-		<cluster name="image_slider" location="\home\severin\Documents\EWF\EWF\library\server\wsf_js_widget\"/>
-		<cluster name="input" location=".\input\"/>
-		<cluster name="navbar" location=".\navbar\"/>
-		<cluster name="progressbar" location=".\progressbar\"/>
-		<cluster name="validator" location=".\validator\"/>
-		<cluster name="webcontrol" location=".\webcontrol\"/>
+		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template-safe.ecf"/>
+		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf"/>
+		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf_js_widget/wsf_js_widget.ecf b/draft/library/wsf_js_widget/wsf_js_widget.ecf
similarity index 59%
rename from library/server/wsf_js_widget/wsf_js_widget.ecf
rename to draft/library/wsf_js_widget/wsf_js_widget.ecf
index 6bcb5bed..5da166aa 100644
--- a/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/wsf_js_widget/wsf_js_widget.ecf
@@ -10,18 +10,12 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
-		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
+		<library name="encoder" location="..\..\..\library\text\encoder\encoder.ecf"/>
+		<library name="http" location="..\..\..\library\network\protocol\http\http.ecf"/>
 		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json.ecf"/>
 		<library name="pcre" location="$ISE_EIFFEL\unstable\library\text\regexp\pcre\pcre.ecf"/>
-		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template.ecf"/>
-		<library name="wsf" location="..\wsf\wsf.ecf"/>
-		<cluster name="webcontrol" location=".\webcontrol\"/>
-		<cluster name="validator" location=".\validator\"/>
-		<cluster name="input" location=".\input\"/>
-		<cluster name="grid" location=".\grid\"/>
-		<cluster name="autocompletion" location=".\autocompletion\"/>
-		<cluster name="navbar" location=".\navbar\"/>
-		<cluster name="progressbar" location=".\progressbar\"/>
+		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template.ecf"/>
+		<library name="wsf" location="..\..\..\library\server\wsf\wsf.ecf"/>
+		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>
 </system>
diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf
index 7611e274..4e95c200 100644
--- a/examples/widgetapp/widgetapp.ecf
+++ b/examples/widgetapp/widgetapp.ecf
@@ -13,7 +13,7 @@
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
-		<library name="wsf_js_widget" location="..\..\library\server\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
+		<library name="wsf_js_widget" location="..\..\draft\library\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
 	</target>
 	<target name="widgetapp_nino" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>