diff --git a/etemplate/js/et2_DOMWidget.js b/etemplate/js/et2_core_DOMWidget.js
similarity index 99%
rename from etemplate/js/et2_DOMWidget.js
rename to etemplate/js/et2_core_DOMWidget.js
index 6e1e5ff273..07a21448bc 100644
--- a/etemplate/js/et2_DOMWidget.js
+++ b/etemplate/js/et2_core_DOMWidget.js
@@ -13,7 +13,7 @@
 "use strict";
 
 /*egw:uses
-	et2_widget;
+	et2_core_widget;
 */
 
 /**
diff --git a/etemplate/js/et2_arrayMgr.js b/etemplate/js/et2_core_arrayMgr.js
similarity index 99%
rename from etemplate/js/et2_arrayMgr.js
rename to etemplate/js/et2_core_arrayMgr.js
index 0b678241da..cd3e46462f 100644
--- a/etemplate/js/et2_arrayMgr.js
+++ b/etemplate/js/et2_core_arrayMgr.js
@@ -10,12 +10,12 @@
  * @version $Id$
  */
 
-/*egw:uses
-	et2_inheritance;
-*/
-
 "use strict";
 
+/*egw:uses
+	et2_core_inheritance;
+*/
+
 var et2_arrayMgr = Class.extend({
 
 	splitIds: true,
diff --git a/etemplate/js/et2_baseWidget.js b/etemplate/js/et2_core_baseWidget.js
similarity index 99%
rename from etemplate/js/et2_baseWidget.js
rename to etemplate/js/et2_core_baseWidget.js
index fef2c554b3..20bda704df 100644
--- a/etemplate/js/et2_baseWidget.js
+++ b/etemplate/js/et2_core_baseWidget.js
@@ -15,7 +15,7 @@
 /*egw:uses
 	jquery.jquery;
 	lib/tooltip;
-	et2_DOMWidget;
+	et2_core_DOMWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_common.js b/etemplate/js/et2_core_common.js
similarity index 99%
rename from etemplate/js/et2_common.js
rename to etemplate/js/et2_core_common.js
index 023993a6c5..fb320d1efa 100644
--- a/etemplate/js/et2_common.js
+++ b/etemplate/js/et2_core_common.js
@@ -10,6 +10,8 @@
  * @version $Id$
  */
 
+"use strict";
+
 /**
  * IE Fix for array.indexOf
  */
diff --git a/etemplate/js/et2_inheritance.js b/etemplate/js/et2_core_inheritance.js
similarity index 99%
rename from etemplate/js/et2_inheritance.js
rename to etemplate/js/et2_core_inheritance.js
index 330c94ea0a..7b50cdc5d7 100644
--- a/etemplate/js/et2_inheritance.js
+++ b/etemplate/js/et2_core_inheritance.js
@@ -13,7 +13,7 @@
 "use strict";
 
 /*egw:uses
-	et2_common;
+	et2_core_common;
 */
 
 /**
diff --git a/etemplate/js/et2_inputWidget.js b/etemplate/js/et2_core_inputWidget.js
similarity index 99%
rename from etemplate/js/et2_inputWidget.js
rename to etemplate/js/et2_core_inputWidget.js
index 79d6c28a39..6473f42f6c 100644
--- a/etemplate/js/et2_inputWidget.js
+++ b/etemplate/js/et2_core_inputWidget.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_valueWidget;
+	et2_core_valueWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_valueWidget.js b/etemplate/js/et2_core_valueWidget.js
similarity index 98%
rename from etemplate/js/et2_valueWidget.js
rename to etemplate/js/et2_core_valueWidget.js
index 193b020325..e89bd1f4a8 100644
--- a/etemplate/js/et2_valueWidget.js
+++ b/etemplate/js/et2_core_valueWidget.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_widget.js b/etemplate/js/et2_core_widget.js
similarity index 99%
rename from etemplate/js/et2_widget.js
rename to etemplate/js/et2_core_widget.js
index 6e9d01331a..4234dbf043 100644
--- a/etemplate/js/et2_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -14,10 +14,10 @@
 
 /*egw:uses
 	jsapi.egw;
-	et2_xml;
-	et2_common;
-	et2_inheritance;
-	et2_arrayMgr;
+	et2_core_xml;
+	et2_core_common;
+	et2_core_inheritance;
+	et2_core_arrayMgr;
 */
 
 /**
diff --git a/etemplate/js/et2_xml.js b/etemplate/js/et2_core_xml.js
similarity index 100%
rename from etemplate/js/et2_xml.js
rename to etemplate/js/et2_core_xml.js
diff --git a/etemplate/js/et2_box.js b/etemplate/js/et2_widget_box.js
similarity index 97%
rename from etemplate/js/et2_box.js
rename to etemplate/js/et2_widget_box.js
index 4ccf97d0dc..095208d34e 100644
--- a/etemplate/js/et2_box.js
+++ b/etemplate/js/et2_widget_box.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_button.js b/etemplate/js/et2_widget_button.js
similarity index 97%
rename from etemplate/js/et2_button.js
rename to etemplate/js/et2_widget_button.js
index c7be43be98..699c757376 100644
--- a/etemplate/js/et2_button.js
+++ b/etemplate/js/et2_widget_button.js
@@ -14,8 +14,8 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_inputWidget;
-	et2_baseWidget;
+	et2_core_inputWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_checkbox.js b/etemplate/js/et2_widget_checkbox.js
similarity index 98%
rename from etemplate/js/et2_checkbox.js
rename to etemplate/js/et2_widget_checkbox.js
index 9e1d96454f..39fa247612 100644
--- a/etemplate/js/et2_checkbox.js
+++ b/etemplate/js/et2_widget_checkbox.js
@@ -14,8 +14,8 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_inputWidget;
-	et2_valueWidget;
+	et2_core_inputWidget;
+	et2_core_valueWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_date.js b/etemplate/js/et2_widget_date.js
similarity index 98%
rename from etemplate/js/et2_date.js
rename to etemplate/js/et2_widget_date.js
index 124fed879a..7b0fca13ed 100644
--- a/etemplate/js/et2_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -14,8 +14,8 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_inputWidget;
-	et2_valueWidget;
+	et2_core_inputWidget;
+	et2_core_valueWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_description.js b/etemplate/js/et2_widget_description.js
similarity index 99%
rename from etemplate/js/et2_description.js
rename to etemplate/js/et2_widget_description.js
index 6acbfc16f9..cafd5d3129 100644
--- a/etemplate/js/et2_description.js
+++ b/etemplate/js/et2_widget_description.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_grid.js b/etemplate/js/et2_widget_grid.js
similarity index 99%
rename from etemplate/js/et2_grid.js
rename to etemplate/js/et2_widget_grid.js
index 6bd9ccc9a6..3c3a6712c4 100644
--- a/etemplate/js/et2_grid.js
+++ b/etemplate/js/et2_widget_grid.js
@@ -14,8 +14,8 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_DOMWidget;
-	et2_xml;
+	et2_core_DOMWidget;
+	et2_core_xml;
 */
 
 /**
diff --git a/etemplate/js/et2_hbox.js b/etemplate/js/et2_widget_hbox.js
similarity index 99%
rename from etemplate/js/et2_hbox.js
rename to etemplate/js/et2_widget_hbox.js
index e208fdc26c..d581b20a3c 100644
--- a/etemplate/js/et2_hbox.js
+++ b/etemplate/js/et2_widget_hbox.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_hrule.js b/etemplate/js/et2_widget_hrule.js
similarity index 96%
rename from etemplate/js/et2_hrule.js
rename to etemplate/js/et2_widget_hrule.js
index cd666af8d3..3b4f019570 100644
--- a/etemplate/js/et2_hrule.js
+++ b/etemplate/js/et2_widget_hrule.js
@@ -13,7 +13,7 @@
 "use strict";
 
 /*egw:uses
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_html.js b/etemplate/js/et2_widget_html.js
similarity index 98%
rename from etemplate/js/et2_html.js
rename to etemplate/js/et2_widget_html.js
index 58cdb904a9..ef202d816b 100644
--- a/etemplate/js/et2_html.js
+++ b/etemplate/js/et2_widget_html.js
@@ -15,7 +15,7 @@
 /*egw:uses
 	jsapi.jsapi; // Needed for egw_seperateJavaScript
 	jquery.jquery;
-	et2_baseWidget;
+	et2_core_baseWidget;
 */
 
 var et2_html = et2_baseWidget.extend({
diff --git a/etemplate/js/et2_number.js b/etemplate/js/et2_widget_number.js
similarity index 98%
rename from etemplate/js/et2_number.js
rename to etemplate/js/et2_widget_number.js
index 8d0816caae..ce6d452d1f 100644
--- a/etemplate/js/et2_number.js
+++ b/etemplate/js/et2_widget_number.js
@@ -13,7 +13,7 @@
 "use strict";
 
 /*egw:uses
-	et2_textbox;
+	et2_widget_textbox;
 */
 
 /**
diff --git a/etemplate/js/et2_radiobox.js b/etemplate/js/et2_widget_radiobox.js
similarity index 98%
rename from etemplate/js/et2_radiobox.js
rename to etemplate/js/et2_widget_radiobox.js
index b7590d3af0..2d5ac01d23 100644
--- a/etemplate/js/et2_radiobox.js
+++ b/etemplate/js/et2_widget_radiobox.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_inputWidget;
+	et2_core_inputWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_selectbox.js b/etemplate/js/et2_widget_selectbox.js
similarity index 99%
rename from etemplate/js/et2_selectbox.js
rename to etemplate/js/et2_widget_selectbox.js
index 164275f41a..2bef960ab4 100644
--- a/etemplate/js/et2_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -16,9 +16,9 @@
 /*egw:uses
 	lib/tooltip;
 	jquery.jquery;
-	et2_xml;
-	et2_DOMWidget;
-	et2_inputWidget;
+	et2_core_xml;
+	et2_core_DOMWidget;
+	et2_widget_inputWidget;
 */
 
 var et2_selectbox = et2_inputWidget.extend({
diff --git a/etemplate/js/et2_styles.js b/etemplate/js/et2_widget_styles.js
similarity index 98%
rename from etemplate/js/et2_styles.js
rename to etemplate/js/et2_widget_styles.js
index 344fd153c6..6a2b68b2de 100644
--- a/etemplate/js/et2_styles.js
+++ b/etemplate/js/et2_widget_styles.js
@@ -13,7 +13,7 @@
 "use strict";
 
 /*egw:uses
-	et2_widget;
+	et2_core_widget;
 */
 
 /**
diff --git a/etemplate/js/et2_tabs.js b/etemplate/js/et2_widget_tabs.js
similarity index 99%
rename from etemplate/js/et2_tabs.js
rename to etemplate/js/et2_widget_tabs.js
index 962c60a1ee..39f16458c3 100644
--- a/etemplate/js/et2_tabs.js
+++ b/etemplate/js/et2_widget_tabs.js
@@ -15,7 +15,7 @@
 /*egw:uses
 	jsapi.egw;
 	jquery.jquery;
-	et2_widget;
+	et2_core_widget;
 */
 
 /**
diff --git a/etemplate/js/et2_template.js b/etemplate/js/et2_widget_template.js
similarity index 98%
rename from etemplate/js/et2_template.js
rename to etemplate/js/et2_widget_template.js
index daab619ec7..fc5d38d4e8 100644
--- a/etemplate/js/et2_template.js
+++ b/etemplate/js/et2_widget_template.js
@@ -13,8 +13,8 @@
 "use strict";
 
 /*egw:uses
-	et2_xml;
-	et2_DOMWidget;
+	et2_core_xml;
+	et2_core_DOMWidget;
 */
 
 /**
diff --git a/etemplate/js/et2_textbox.js b/etemplate/js/et2_widget_textbox.js
similarity index 98%
rename from etemplate/js/et2_textbox.js
rename to etemplate/js/et2_widget_textbox.js
index 4104634db9..59b7629840 100644
--- a/etemplate/js/et2_textbox.js
+++ b/etemplate/js/et2_widget_textbox.js
@@ -14,8 +14,8 @@
 
 /*egw:uses
 	jquery.jquery;
-	et2_inputWidget;
-	et2_valueWidget;
+	et2_core_inputWidget;
+	et2_core_valueWidget;
 */
 
 /**
diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index f00eb77193..344ade39dc 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -12,26 +12,26 @@
 
 /*egw:uses
 	// Include all widget classes here
-	et2_template;
-	et2_grid;
-	et2_box;
-	et2_hbox;
-	et2_button;
-	et2_description;
-	et2_textbox;
-	et2_number;
-	et2_selectbox;
-	et2_checkbox;
-	et2_radiobox;
-	et2_date;
-	et2_styles;
-	et2_html;
-	et2_tabs;
-	et2_hrule;
+	et2_widget_template;
+	et2_widget_grid;
+	et2_widget_box;
+	et2_widget_hbox;
+	et2_widget_button;
+	et2_widget_description;
+	et2_widget_textbox;
+	et2_widget_number;
+	et2_widget_selectbox;
+	et2_widget_checkbox;
+	et2_widget_radiobox;
+	et2_widget_date;
+	et2_widget_styles;
+	et2_widget_html;
+	et2_widget_tabs;
+	et2_widget_hrule;
 
 	// Requirements for the etemplate2 object
-	et2_xml;
-	et2_arrayMgr;
+	et2_core_xml;
+	et2_core_arrayMgr;
 */
 
 /**
diff --git a/etemplate/js/test/test_xml.html b/etemplate/js/test/test_xml.html
index c0df2b195b..f148a78435 100644
--- a/etemplate/js/test/test_xml.html
+++ b/etemplate/js/test/test_xml.html
@@ -3,34 +3,34 @@
 		<title>ET2 - Test</title>
 
 		<script src="jquery.js"></script>
-		<script src="../et2_xml.js"></script>
-		<script src="../et2_inheritance.js"></script>
-		<script src="../et2_common.js"></script>
-		<script src="../et2_arrayMgr.js"></script>
-		<script src="../et2_widget.js"></script>
-		<script src="../et2_DOMWidget.js"></script>
-		<script src="../et2_baseWidget.js"></script>
-		<script src="../et2_valueWidget.js"></script>
-		<script src="../et2_inputWidget.js"></script>
-		<script src="../et2_template.js"></script>
-		<script src="../et2_description.js"></script>
-		<script src="../et2_grid.js"></script>
-		<script src="../et2_button.js"></script>
-		<script src="../et2_box.js"></script>
-		<script src="../et2_hbox.js"></script>
-		<script src="../et2_textbox.js"></script>
-		<script src="../et2_number.js"></script>
-		<script src="../et2_selectbox.js"></script>
-		<script src="../et2_checkbox.js"></script>
-		<script src="../et2_radiobox.js"></script>
-		<script src="../et2_styles.js"></script>
-		<script src="../et2_html.js"></script>
-		<script src="../et2_hrule.js"></script>
-		<script src="../et2_date.js"></script>
+		<script src="../et2_core_xml.js"></script>
+		<script src="../et2_core_inheritance.js"></script>
+		<script src="../et2_core_common.js"></script>
+		<script src="../et2_core_arrayMgr.js"></script>
+		<script src="../et2_core_widget.js"></script>
+		<script src="../et2_core_DOMWidget.js"></script>
+		<script src="../et2_core_baseWidget.js"></script>
+		<script src="../et2_core_valueWidget.js"></script>
+		<script src="../et2_core_inputWidget.js"></script>
+		<script src="../et2_widget_template.js"></script>
+		<script src="../et2_widget_description.js"></script>
+		<script src="../et2_widget_grid.js"></script>
+		<script src="../et2_widget_button.js"></script>
+		<script src="../et2_widget_box.js"></script>
+		<script src="../et2_widget_hbox.js"></script>
+		<script src="../et2_widget_textbox.js"></script>
+		<script src="../et2_widget_number.js"></script>
+		<script src="../et2_widget_selectbox.js"></script>
+		<script src="../et2_widget_checkbox.js"></script>
+		<script src="../et2_widget_radiobox.js"></script>
+		<script src="../et2_widget_styles.js"></script>
+		<script src="../et2_widget_html.js"></script>
+		<script src="../et2_widget_hrule.js"></script>
+		<script src="../et2_widget_date.js"></script>
+		<script src="../et2_widget_tabs.js"></script>
 
 		<script src="../etemplate2.js"></script>
 
-		<script src="../et2_tabs.js"></script>
 		<script src="../lib/tooltip.js"></script>
 		<script src="../../../phpgwapi/js/jsapi/jsapi.js"></script>
 		<script src="../../../phpgwapi/js/jsapi/egw.js"></script>