diff --git a/library/server/wsf_js_widget/autocompletions/wsf_autocompletion.e b/library/server/wsf_js_widget/autocompletion/wsf_autocompletion.e
similarity index 100%
rename from library/server/wsf_js_widget/autocompletions/wsf_autocompletion.e
rename to library/server/wsf_js_widget/autocompletion/wsf_autocompletion.e
diff --git a/library/server/wsf_js_widget/autocompletions/wsf_simple_autocompletion.e b/library/server/wsf_js_widget/autocompletion/wsf_simple_autocompletion.e
similarity index 100%
rename from library/server/wsf_js_widget/autocompletions/wsf_simple_autocompletion.e
rename to library/server/wsf_js_widget/autocompletion/wsf_simple_autocompletion.e
diff --git a/library/server/wsf_js_widget/validators/wsf_decimal_validator.e b/library/server/wsf_js_widget/validator/wsf_decimal_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_decimal_validator.e
rename to library/server/wsf_js_widget/validator/wsf_decimal_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_email_validator.e b/library/server/wsf_js_widget/validator/wsf_email_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_email_validator.e
rename to library/server/wsf_js_widget/validator/wsf_email_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_max_validator.e b/library/server/wsf_js_widget/validator/wsf_max_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_max_validator.e
rename to library/server/wsf_js_widget/validator/wsf_max_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_min_validator.e b/library/server/wsf_js_widget/validator/wsf_min_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_min_validator.e
rename to library/server/wsf_js_widget/validator/wsf_min_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_phone_number_validator.e b/library/server/wsf_js_widget/validator/wsf_phone_number_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_phone_number_validator.e
rename to library/server/wsf_js_widget/validator/wsf_phone_number_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_regexp_validator.e b/library/server/wsf_js_widget/validator/wsf_regexp_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_regexp_validator.e
rename to library/server/wsf_js_widget/validator/wsf_regexp_validator.e
diff --git a/library/server/wsf_js_widget/validators/wsf_validatable.e b/library/server/wsf_js_widget/validator/wsf_validatable.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_validatable.e
rename to library/server/wsf_js_widget/validator/wsf_validatable.e
diff --git a/library/server/wsf_js_widget/validators/wsf_validator.e b/library/server/wsf_js_widget/validator/wsf_validator.e
similarity index 100%
rename from library/server/wsf_js_widget/validators/wsf_validator.e
rename to library/server/wsf_js_widget/validator/wsf_validator.e
diff --git a/library/server/wsf_js_widget/wsf_js_widget-safe.ecf b/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
index e45fa443..037a9b78 100644
--- a/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -17,10 +17,10 @@
 		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="..\wsf\wsf-safe.ecf"/>
 		<cluster name="webcontrol" location=".\webcontrol\"/>
-		<cluster name="validators" location=".\validators\"/>
+		<cluster name="validator" location=".\validator\"/>
 		<cluster name="input" location=".\input\"/>
 		<cluster name="grid" location=".\grid\"/>
-		<cluster name="autocompletions" location=".\autocompletions\"/>
+		<cluster name="autocompletion" location=".\autocompletion\"/>
 		<cluster name="navbar" location=".\navbar\"/>
 		<cluster name="progressbar" location=".\progressbar\"/>
 	</target>
diff --git a/library/server/wsf_js_widget/wsf_js_widget.ecf b/library/server/wsf_js_widget/wsf_js_widget.ecf
index eddf8a7c..6bcb5bed 100644
--- a/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -17,10 +17,10 @@
 		<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="validators" location=".\validators\"/>
+		<cluster name="validator" location=".\validator\"/>
 		<cluster name="input" location=".\input\"/>
 		<cluster name="grid" location=".\grid\"/>
-		<cluster name="autocompletions" location=".\autocompletions\"/>
+		<cluster name="autocompletion" location=".\autocompletion\"/>
 		<cluster name="navbar" location=".\navbar\"/>
 		<cluster name="progressbar" location=".\progressbar\"/>
 	</target>