diff --git a/examples/widgetapp/own_validator.e b/examples/widgetapp/own_validator.e
index 1ba0395a..10cb5fba 100644
--- a/examples/widgetapp/own_validator.e
+++ b/examples/widgetapp/own_validator.e
@@ -18,7 +18,7 @@ feature {NONE}
 
 	make_own
 		do
-			error := "Input to long"
+			error := "Input too long"
 		end
 
 feature
diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e
index d88c95a8..00716044 100644
--- a/examples/widgetapp/sample_page.e
+++ b/examples/widgetapp/sample_page.e
@@ -26,7 +26,7 @@ feature
 			create textbox1.make_input ("txtBox1", "1")
 			create textbox2.make_input ("txtBox2", "2")
 			create button1.make_button ("sample_button1", "SUM")
-			create textbox_result.make_html ("txtBox3","p", "")
+			create textbox_result.make_html ("txtBox3", "p", "")
 			button1.set_click_event (agent handle_click)
 			button1.add_class ("col-lg-offset-2")
 			create form.make_form_control ("panel")
@@ -42,12 +42,10 @@ feature
 			form.add_control (n1_container)
 			form.add_control (n2_container)
 			create cats_container.make_form_element ("Categories", cklist)
-			cats_container.add_validator (create {WSF_MIN_VALIDATOR[STRING]}.make_min_validator (1,"Choose at least one category"))
-			cats_container.add_validator (create {WSF_MAX_VALIDATOR[STRING]}.make_max_validator (1,"Choose at most one category"))
-
+			cats_container.add_validator (create {WSF_MIN_VALIDATOR [STRING]}.make_min_validator (1, "Choose at least one category"))
+			cats_container.add_validator (create {WSF_MAX_VALIDATOR [STRING]}.make_max_validator (1, "Choose at most one category"))
 			form.add_control (cats_container)
 			form.add_control (button1)
-
 			form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", textbox_result))
 			control := form
 		end
diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e b/library/server/wsf_html/webcontrol/input/wsf_checkbox_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_checkbox_control.e
rename to library/server/wsf_html/webcontrol/input/wsf_checkbox_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e b/library/server/wsf_html/webcontrol/input/wsf_checkbox_list_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e
rename to library/server/wsf_html/webcontrol/input/wsf_checkbox_list_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_input_control.e b/library/server/wsf_html/webcontrol/input/wsf_input_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_input_control.e
rename to library/server/wsf_html/webcontrol/input/wsf_input_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_password_control.e b/library/server/wsf_html/webcontrol/input/wsf_password_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_password_control.e
rename to library/server/wsf_html/webcontrol/input/wsf_password_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_textarea_control.e b/library/server/wsf_html/webcontrol/input/wsf_textarea_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_textarea_control.e
rename to library/server/wsf_html/webcontrol/input/wsf_textarea_control.e
diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf
index f3ae7f4e..a432e76f 100644
--- a/library/server/wsf_html/wsf_html-safe.ecf
+++ b/library/server/wsf_html/wsf_html-safe.ecf
@@ -21,6 +21,7 @@
 		<cluster name="form" location=".\form\" recursive="true"/>
 		<cluster name="webcontrol" location=".\webcontrol\">
 			<cluster name="validators" location=".\webcontrol\validators\"/>
+			<cluster name="input" location=".\webcontrol\input\"/>
 		</cluster>
 		<cluster name="widget" location=".\widget\" recursive="true"/>
 	</target>