diff --git a/draft/library/wsf_js_widget/README.md b/draft/library/server/wsf_js_widget/README.md
similarity index 100%
rename from draft/library/wsf_js_widget/README.md
rename to draft/library/server/wsf_js_widget/README.md
diff --git a/draft/library/wsf_js_widget/assets/bootstrap-datepicker.js b/draft/library/server/wsf_js_widget/assets/bootstrap-datepicker.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/bootstrap-datepicker.js
rename to draft/library/server/wsf_js_widget/assets/bootstrap-datepicker.js
diff --git a/draft/library/wsf_js_widget/assets/bootstrap-datetimepicker.css b/draft/library/server/wsf_js_widget/assets/bootstrap-datetimepicker.css
similarity index 100%
rename from draft/library/wsf_js_widget/assets/bootstrap-datetimepicker.css
rename to draft/library/server/wsf_js_widget/assets/bootstrap-datetimepicker.css
diff --git a/draft/library/wsf_js_widget/assets/bootstrap-datetimepicker.js b/draft/library/server/wsf_js_widget/assets/bootstrap-datetimepicker.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/bootstrap-datetimepicker.js
rename to draft/library/server/wsf_js_widget/assets/bootstrap-datetimepicker.js
diff --git a/draft/library/wsf_js_widget/assets/bootstrap.min.css b/draft/library/server/wsf_js_widget/assets/bootstrap.min.css
similarity index 100%
rename from draft/library/wsf_js_widget/assets/bootstrap.min.css
rename to draft/library/server/wsf_js_widget/assets/bootstrap.min.css
diff --git a/draft/library/wsf_js_widget/assets/bootstrap.min.js b/draft/library/server/wsf_js_widget/assets/bootstrap.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/bootstrap.min.js
rename to draft/library/server/wsf_js_widget/assets/bootstrap.min.js
diff --git a/draft/library/wsf_js_widget/assets/datepicker.css b/draft/library/server/wsf_js_widget/assets/datepicker.css
similarity index 100%
rename from draft/library/wsf_js_widget/assets/datepicker.css
rename to draft/library/server/wsf_js_widget/assets/datepicker.css
diff --git a/draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.eot b/draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.eot
similarity index 100%
rename from draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.eot
rename to draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.eot
diff --git a/draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.svg b/draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.svg
similarity index 100%
rename from draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.svg
rename to draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.svg
diff --git a/draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.ttf b/draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.ttf
similarity index 100%
rename from draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.ttf
rename to draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.ttf
diff --git a/draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.woff b/draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.woff
similarity index 100%
rename from draft/library/wsf_js_widget/assets/glyphicons-halflings-regular.woff
rename to draft/library/server/wsf_js_widget/assets/glyphicons-halflings-regular.woff
diff --git a/draft/library/wsf_js_widget/assets/jquery.min.js b/draft/library/server/wsf_js_widget/assets/jquery.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/jquery.min.js
rename to draft/library/server/wsf_js_widget/assets/jquery.min.js
diff --git a/draft/library/wsf_js_widget/assets/typeahead.min.js b/draft/library/server/wsf_js_widget/assets/typeahead.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/typeahead.min.js
rename to draft/library/server/wsf_js_widget/assets/typeahead.min.js
diff --git a/draft/library/wsf_js_widget/assets/widget.coffee b/draft/library/server/wsf_js_widget/assets/widget.coffee
similarity index 100%
rename from draft/library/wsf_js_widget/assets/widget.coffee
rename to draft/library/server/wsf_js_widget/assets/widget.coffee
diff --git a/draft/library/wsf_js_widget/assets/widget.css b/draft/library/server/wsf_js_widget/assets/widget.css
similarity index 100%
rename from draft/library/wsf_js_widget/assets/widget.css
rename to draft/library/server/wsf_js_widget/assets/widget.css
diff --git a/draft/library/wsf_js_widget/assets/widget.js b/draft/library/server/wsf_js_widget/assets/widget.js
similarity index 100%
rename from draft/library/wsf_js_widget/assets/widget.js
rename to draft/library/server/wsf_js_widget/assets/widget.js
diff --git a/draft/library/wsf_js_widget/examples/demo/application.e b/draft/library/server/wsf_js_widget/examples/demo/application.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/application.e
rename to draft/library/server/wsf_js_widget/examples/demo/application.e
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datepicker.js b/draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datepicker.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datepicker.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datepicker.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.css b/draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.js b/draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap-datetimepicker.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/bootstrap.min.css b/draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap.min.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/bootstrap.min.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap.min.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/bootstrap.min.js b/draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/bootstrap.min.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/bootstrap.min.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/codemirror/codemirror.css b/draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/codemirror.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/codemirror/codemirror.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/codemirror.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/codemirror/codemirror.js b/draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/codemirror.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/codemirror/codemirror.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/codemirror.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/codemirror/eiffel.js b/draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/eiffel.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/codemirror/eiffel.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/eiffel.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/codemirror/estudio.css b/draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/estudio.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/codemirror/estudio.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/codemirror/estudio.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/datepicker.css b/draft/library/server/wsf_js_widget/examples/demo/assets/datepicker.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/datepicker.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/datepicker.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.eot b/draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.eot
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.eot
rename to draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.eot
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.svg b/draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.svg
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.svg
rename to draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.svg
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.ttf b/draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.ttf
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.ttf
rename to draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.ttf
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.woff b/draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.woff
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.woff
rename to draft/library/server/wsf_js_widget/examples/demo/assets/glyphicons-halflings-regular.woff
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/jquery.min.js b/draft/library/server/wsf_js_widget/examples/demo/assets/jquery.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/jquery.min.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/jquery.min.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/typeahead.min.js b/draft/library/server/wsf_js_widget/examples/demo/assets/typeahead.min.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/typeahead.min.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/typeahead.min.js
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/widget.coffee b/draft/library/server/wsf_js_widget/examples/demo/assets/widget.coffee
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/widget.coffee
rename to draft/library/server/wsf_js_widget/examples/demo/assets/widget.coffee
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/widget.css b/draft/library/server/wsf_js_widget/examples/demo/assets/widget.css
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/widget.css
rename to draft/library/server/wsf_js_widget/examples/demo/assets/widget.css
diff --git a/draft/library/wsf_js_widget/examples/demo/assets/widget.js b/draft/library/server/wsf_js_widget/examples/demo/assets/widget.js
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/assets/widget.js
rename to draft/library/server/wsf_js_widget/examples/demo/assets/widget.js
diff --git a/draft/library/wsf_js_widget/examples/demo/autocompletion/contact_autocompletion.e b/draft/library/server/wsf_js_widget/examples/demo/autocompletion/contact_autocompletion.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/autocompletion/contact_autocompletion.e
rename to draft/library/server/wsf_js_widget/examples/demo/autocompletion/contact_autocompletion.e
diff --git a/draft/library/wsf_js_widget/examples/demo/autocompletion/flag_autocompletion.e b/draft/library/server/wsf_js_widget/examples/demo/autocompletion/flag_autocompletion.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/autocompletion/flag_autocompletion.e
rename to draft/library/server/wsf_js_widget/examples/demo/autocompletion/flag_autocompletion.e
diff --git a/draft/library/wsf_js_widget/examples/demo/autocompletion/google_autocompletion.e b/draft/library/server/wsf_js_widget/examples/demo/autocompletion/google_autocompletion.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/autocompletion/google_autocompletion.e
rename to draft/library/server/wsf_js_widget/examples/demo/autocompletion/google_autocompletion.e
diff --git a/draft/library/wsf_js_widget/examples/demo/base_page.e b/draft/library/server/wsf_js_widget/examples/demo/base_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/base_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/base_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/codeview_page.e b/draft/library/server/wsf_js_widget/examples/demo/codeview_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/codeview_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/codeview_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/demo.ecf b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
similarity index 79%
rename from draft/library/wsf_js_widget/examples/demo/demo.ecf
rename to draft/library/server/wsf_js_widget/examples/demo/demo.ecf
index 174de836..2af9c64b 100644
--- a/draft/library/wsf_js_widget/examples/demo/demo.ecf
+++ b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
@@ -10,9 +10,9 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="http" location="..\..\..\..\..\library\network\protocol\http\http-safe.ecf"/>
+		<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" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<library name="wsf_js_widget" location="..\..\wsf_js_widget-safe.ecf" readonly="false"/>
 	</target>
 	<target name="demo_nino" extends="common">
@@ -20,8 +20,8 @@
 		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<library name="default_nino" location="..\..\..\..\..\library\server\wsf\default\nino-safe.ecf"/>
-		<library name="json" location="..\..\..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
+		<library name="default_nino" location="..\..\..\..\..\..\library\server\wsf\default\nino-safe.ecf"/>
+		<library name="json" location="..\..\..\..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<cluster name="demo" location=".\" recursive="true"/>
 	</target>
 	<target name="demo_cgi" extends="common">
@@ -29,7 +29,7 @@
 		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<library name="default_cgi" location="..\..\..\..\..\library\server\wsf\default\cgi-safe.ecf"/>
+		<library name="default_cgi" location="..\..\..\..\..\..\library\server\wsf\default\cgi-safe.ecf"/>
 		<cluster name="demo" location=".\" recursive="true"/>
 	</target>
 	<target name="demo_libfcgi" extends="common">
@@ -37,7 +37,7 @@
 		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<library name="default_libfcgi" location="..\..\..\..\..\library\server\wsf\default\libfcgi-safe.ecf"/>
+		<library name="default_libfcgi" location="..\..\..\..\..\..\library\server\wsf\default\libfcgi-safe.ecf"/>
 		<cluster name="demo" location=".\" recursive="true"/>
 	</target>
 	<target name="demo" extends="demo_nino">
diff --git a/draft/library/wsf_js_widget/examples/demo/googlenews/google_news.e b/draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/googlenews/google_news.e
rename to draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news.e
diff --git a/draft/library/wsf_js_widget/examples/demo/googlenews/google_news_datasource.e b/draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news_datasource.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/googlenews/google_news_datasource.e
rename to draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news_datasource.e
diff --git a/draft/library/wsf_js_widget/examples/demo/googlenews/google_news_repeater.e b/draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news_repeater.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/googlenews/google_news_repeater.e
rename to draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news_repeater.e
diff --git a/draft/library/wsf_js_widget/examples/demo/grid_page.e b/draft/library/server/wsf_js_widget/examples/demo/grid_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/grid_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/grid_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/own_validator.e b/draft/library/server/wsf_js_widget/examples/demo/own_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/own_validator.e
rename to draft/library/server/wsf_js_widget/examples/demo/own_validator.e
diff --git a/draft/library/wsf_js_widget/examples/demo/progress/increasing_progresssource.e b/draft/library/server/wsf_js_widget/examples/demo/progress/increasing_progresssource.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/progress/increasing_progresssource.e
rename to draft/library/server/wsf_js_widget/examples/demo/progress/increasing_progresssource.e
diff --git a/draft/library/wsf_js_widget/examples/demo/repeater_page.e b/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/repeater_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/repeater_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/sample_page.e b/draft/library/server/wsf_js_widget/examples/demo/sample_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/sample_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/sample_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/slider_page.e b/draft/library/server/wsf_js_widget/examples/demo/slider_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/slider_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/slider_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/upload_page.e b/draft/library/server/wsf_js_widget/examples/demo/upload_page.e
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/upload_page.e
rename to draft/library/server/wsf_js_widget/examples/demo/upload_page.e
diff --git a/draft/library/wsf_js_widget/examples/demo/widgetapp.rc b/draft/library/server/wsf_js_widget/examples/demo/widgetapp.rc
similarity index 100%
rename from draft/library/wsf_js_widget/examples/demo/widgetapp.rc
rename to draft/library/server/wsf_js_widget/examples/demo/widgetapp.rc
diff --git a/draft/library/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e b/draft/library/server/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e
rename to draft/library/server/wsf_js_widget/kernel/autocompletion/wsf_autocompletion.e
diff --git a/draft/library/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e b/draft/library/server/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
rename to draft/library/server/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
diff --git a/draft/library/wsf_js_widget/kernel/dropdown/wsf_dropdown_control.e b/draft/library/server/wsf_js_widget/kernel/dropdown/wsf_dropdown_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/dropdown/wsf_dropdown_control.e
rename to draft/library/server/wsf_js_widget/kernel/dropdown/wsf_dropdown_control.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_datasource.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_datasource.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_datasource.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_datasource.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_entity.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_entity.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_entity.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_entity.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_grid_column.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_column.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_grid_column.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_column.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_grid_control.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_grid_control.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_grid_image_column.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_image_column.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_grid_image_column.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_image_column.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_pagable_datasource.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_pagination_control.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_pagination_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_pagination_control.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_pagination_control.e
diff --git a/draft/library/wsf_js_widget/kernel/grid/wsf_repeater_control.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_repeater_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/grid/wsf_repeater_control.e
rename to draft/library/server/wsf_js_widget/kernel/grid/wsf_repeater_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_autocomplete_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_autocomplete_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_autocomplete_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_autocomplete_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_checkbox_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_checkbox_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_codeview_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_codeview_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_codeview_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_codeview_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_file_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_file_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_file_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_file_definition.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_file_definition.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_file_definition.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_file_definition.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_input_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_input_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_input_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_password_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_password_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_password_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_password_control.e
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_textarea_control.e b/draft/library/server/wsf_js_widget/kernel/input/wsf_textarea_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/input/wsf_textarea_control.e
rename to draft/library/server/wsf_js_widget/kernel/input/wsf_textarea_control.e
diff --git a/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e b/draft/library/server/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
rename to draft/library/server/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
diff --git a/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_control.e b/draft/library/server/wsf_js_widget/kernel/navlist/wsf_navlist_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_control.e
rename to draft/library/server/wsf_js_widget/kernel/navlist/wsf_navlist_control.e
diff --git a/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item_control.e b/draft/library/server/wsf_js_widget/kernel/navlist/wsf_navlist_item_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item_control.e
rename to draft/library/server/wsf_js_widget/kernel/navlist/wsf_navlist_item_control.e
diff --git a/draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_control.e b/draft/library/server/wsf_js_widget/kernel/progressbar/wsf_progress_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_control.e
rename to draft/library/server/wsf_js_widget/kernel/progressbar/wsf_progress_control.e
diff --git a/draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_source.e b/draft/library/server/wsf_js_widget/kernel/progressbar/wsf_progress_source.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/progressbar/wsf_progress_source.e
rename to draft/library/server/wsf_js_widget/kernel/progressbar/wsf_progress_source.e
diff --git a/draft/library/wsf_js_widget/kernel/slider/wsf_slider_control.e b/draft/library/server/wsf_js_widget/kernel/slider/wsf_slider_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/slider/wsf_slider_control.e
rename to draft/library/server/wsf_js_widget/kernel/slider/wsf_slider_control.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_agent_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_agent_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_agent_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_agent_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_decimal_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_decimal_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_decimal_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_decimal_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_email_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_email_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_email_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_email_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_max_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_max_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_max_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_max_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_min_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_min_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_min_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_min_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_regexp_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_regexp_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_validatable.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_validatable.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_validatable.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_validatable.e
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_validator.e b/draft/library/server/wsf_js_widget/kernel/validator/wsf_validator.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/validator/wsf_validator.e
rename to draft/library/server/wsf_js_widget/kernel/validator/wsf_validator.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_basic_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_button_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_button_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_button_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_button_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_dynamic_multi_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_dynamic_multi_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_dynamic_multi_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_dynamic_multi_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_form_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_form_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_html_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_html_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_json_object.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_json_object.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_json_object.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_json_object.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_page_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_multi_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_stateless_multi_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_multi_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_stateless_multi_control.e
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_value_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e
rename to draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_value_control.e
diff --git a/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e b/draft/library/server/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
similarity index 100%
rename from draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
rename to draft/library/server/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
diff --git a/draft/library/wsf_js_widget/license.lic b/draft/library/server/wsf_js_widget/license.lic
similarity index 100%
rename from draft/library/wsf_js_widget/license.lic
rename to draft/library/server/wsf_js_widget/license.lic
diff --git a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
similarity index 70%
rename from draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
rename to draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
index 325980be..1ace61a1 100644
--- a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -10,13 +10,13 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-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="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_LIBRARY\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template-safe.ecf"/>
-		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf"/>
+		<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">
 			<file_rule>
 				<exclude>/examples$</exclude>
diff --git a/draft/library/wsf_js_widget/wsf_js_widget.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
similarity index 69%
rename from draft/library/wsf_js_widget/wsf_js_widget.ecf
rename to draft/library/server/wsf_js_widget/wsf_js_widget.ecf
index f43fc79a..8b282dc4 100644
--- a/draft/library/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -10,12 +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="..\..\..\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="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_LIBRARY\unstable\library\text\regexp\pcre\pcre.ecf"/>
-		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template.ecf"/>
-		<library name="wsf" location="..\..\..\library\server\wsf\wsf.ecf"/>
+		<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">
 			<file_rule>
 				<exclude>/examples$</exclude>