diff --git a/component-load.xml b/component-load.xml
index 45a780c93..801b343f8 100644
--- a/component-load.xml
+++ b/component-load.xml
@@ -38,6 +38,7 @@ under the License.
+
diff --git a/example/ofbiz-component.xml b/example/ofbiz-component.xml
index d295e4308..01b235717 100644
--- a/example/ofbiz-component.xml
+++ b/example/ofbiz-component.xml
@@ -59,15 +59,6 @@ under the License.
location="webapp/example"
base-permission="OFBTOOLS,EXAMPLE"
mount-point="/example"/>
-
-
-
Extended Catalog Manager Controller Configuration File
-
+
diff --git a/example/webapp/exampleext/WEB-INF/web.xml b/exampleext/webapp/exampleext/WEB-INF/web.xml
similarity index 98%
rename from example/webapp/exampleext/WEB-INF/web.xml
rename to exampleext/webapp/exampleext/WEB-INF/web.xml
index a59a00f1c..fc6128e47 100644
--- a/example/webapp/exampleext/WEB-INF/web.xml
+++ b/exampleext/webapp/exampleext/WEB-INF/web.xml
@@ -33,7 +33,7 @@ under the License.
mainDecoratorLocation
- component://example/widget/exampleext/CommonScreens.xml
+ component://exampleext/widget/example/CommonScreens.xml
The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.
diff --git a/example/widget/exampleext/CommonScreens.xml b/exampleext/widget/example/CommonScreens.xml
similarity index 98%
rename from example/widget/exampleext/CommonScreens.xml
rename to exampleext/widget/example/CommonScreens.xml
index 26e627406..0d2f2e211 100644
--- a/example/widget/exampleext/CommonScreens.xml
+++ b/exampleext/widget/example/CommonScreens.xml
@@ -50,7 +50,7 @@ under the License.
-
+
diff --git a/example/widget/exampleext/ExampleScreens.xml b/exampleext/widget/example/ExampleScreens.xml
similarity index 96%
rename from example/widget/exampleext/ExampleScreens.xml
rename to exampleext/widget/example/ExampleScreens.xml
index 3908d046e..2b130d3f3 100644
--- a/example/widget/exampleext/ExampleScreens.xml
+++ b/exampleext/widget/example/ExampleScreens.xml
@@ -33,7 +33,7 @@ under the License.
-
+