diff --git a/conf/resource-types.xml b/conf/resource-types.xml
index 4d036f8fd..de009e5b4 100644
--- a/conf/resource-types.xml
+++ b/conf/resource-types.xml
@@ -10,9 +10,10 @@
 
 <!-- NOTE: Do not use relative paths to reference resource types, because the paths are not being resolved re the location of (local.)resource-types.xml -->
 
-<resource-types xmlns="http://www.wyona.org/yanel/1.0" version="2012071600">
+<resource-types xmlns="http://www.wyona.org/yanel/1.0" version="2012072700">
 
   <changes>
+    <change version="2012072700">consolidate resources into same directory</change>
     <change version="2012071600">scheduler jobs overview added</change>
     <change version="2012011800">generic user registration added</change>
     <change version="2011081600">jelly controller adapter added in order to support CUD version 3 (see contributions/resources/creatable-modifiable-deletable-v3)</change>
@@ -46,23 +47,23 @@
   <resource-type package="org.wyona.yanel.impl.resources.jellyadapterofcmdv3"/> <!-- INFO: This resource is loaded as dependency via src/build/dependencies.xml -->
   <resource-type src="@YANEL_SRC_DIR@/src/resources/scheduler/" compile="true"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/registration/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/personalized-content/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/personalized-content/" compile="true"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/workflow-dashboard/" compile="true"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/comment/" compile="true"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/pageMetaDataManager/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/security-api/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/search/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/nutch/" compile="true" copy-dir-name="yanel-nutch"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/lookup/" compile="true" copy-dir-name="yanel-lookup"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/security-api/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/search/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/nutch/" compile="true" copy-dir-name="yanel-nutch"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/lookup/" compile="true" copy-dir-name="yanel-lookup"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/tinymce/" compile="true" copy-dir-name="yanel-tinymce"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/image/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/xinha/" compile="true" copy-dir-name="yanel-xinha"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/sessionmanager/" compile="true" copy-dir-name="yanel-sessionmanager"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/404/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/generic-exception-handler/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/policymanager/" compile="true" copy-dir-name="yanel-policymanager"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/timeline/" compile="true" copy-dir-name="yanel-timeline"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/data-repo-sitetree/" compile="true" copy-dir-name="yanel-data-repo-sitetree"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/image/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/xinha/" compile="true" copy-dir-name="yanel-xinha"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/sessionmanager/" compile="true" copy-dir-name="yanel-sessionmanager"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/404/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/generic-exception-handler/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/policymanager/" compile="true" copy-dir-name="yanel-policymanager"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/timeline/" compile="true" copy-dir-name="yanel-timeline"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/data-repo-sitetree/" compile="true" copy-dir-name="yanel-data-repo-sitetree"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/navigation/" compile="true" copy-dir-name="yanel-navigation"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/translation/" compile="true" copy-dir-name="yanel-translation"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/file/" compile="true"/>
@@ -76,26 +77,26 @@
   <resource-type src="@YANEL_SRC_DIR@/src/resources/user-mgmt/" compile="true" copy-dir-name="yanel-user-mgmt"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/testing-control/" compile="true" copy-dir-name="yanel-testing-control"/>
   <resource-type src="@YANEL_SRC_DIR@/src/resources/testing-times/" compile="true" copy-dir-name="yanel-testing-times"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/atom/" compile="true" copy-dir-name="yanel-atom"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/atom-entry/" compile="true" copy-dir-name="yanel-atom-entry"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/atom/" compile="true" copy-dir-name="yanel-atom"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/atom-entry/" compile="true" copy-dir-name="yanel-atom-entry"/>
 
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/contact-form/" compile="true" copy-dir-name="yanel-contact-form"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/contact-form/" compile="true" copy-dir-name="yanel-contact-form"/>
   <!-- IMPORTANT: Please note that forgotpw depends on contact-form and hence the build order matters! -->
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/forgotpw/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/forgotpw/" compile="true"/>
 
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/wiki/" compile="true" copy-dir-name="yanel-wiki"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/zip/" compile="true" copy-dir-name="yanel-zip"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/calendar/" compile="true" copy-dir-name="yanel-calendar"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/resource-creator/" compile="true"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/davcollection/" compile="true" copy-dir-name="yanel-davcollection"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/wiki/" compile="true" copy-dir-name="yanel-wiki"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/zip/" compile="true" copy-dir-name="yanel-zip"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/calendar/" compile="true" copy-dir-name="yanel-calendar"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/resource-creator/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/davcollection/" compile="true" copy-dir-name="yanel-davcollection"/>
 
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/pdf/" compile="true" copy-dir-name="yanel-pdf"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/yanel-user/" compile="true" copy-dir-name="yanel-yanel-user"/>
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/redirect/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/pdf/" compile="true" copy-dir-name="yanel-pdf"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/yanel-user/" compile="true" copy-dir-name="yanel-yanel-user"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/redirect/" compile="true"/>
 
   <!-- Google Web Toolkit sandbox resource type -->
 <!--
-  <resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/GWT-sandbox/" compile="true"/>
+  <resource-type src="@YANEL_SRC_DIR@/src/resources/GWT-sandbox/" compile="true"/>
 -->
 
 <!-- INFO: Third party resource types (TODO: Add to Hudson)
diff --git a/src/build/resource-types/resource-type.build.xml b/src/build/resource-types/resource-type.build.xml
index 1ec9a3b7d..43b8c1205 100644
--- a/src/build/resource-types/resource-type.build.xml
+++ b/src/build/resource-types/resource-type.build.xml
@@ -8,7 +8,7 @@
 
 <!-- 
      The default task config attribute (for example default="compile") seems not to be imported at least with Ant 1.6.5 or Ant 1.7.1
-     which means it needs to be set within each resource build.xml (see for example src/contributions/resources/forgotpw/build.xml)
+     which means it needs to be set within each resource build.xml (see for example src/resources/forgotpw/build.xml)
 -->
 
   <dirname property="resource.home.dir" file="${ant.file}"/>
diff --git a/src/build/targets/build-binary-snapshot.xml b/src/build/targets/build-binary-snapshot.xml
index d2d453fed..9f69d9f49 100644
--- a/src/build/targets/build-binary-snapshot.xml
+++ b/src/build/targets/build-binary-snapshot.xml
@@ -138,7 +138,7 @@
       <replacetoken>../src/resources</replacetoken>
     </replace>
     <replace file="${tmp.dir}/WEB-INF/classes/yanel.properties" value="../../resources">
-      <replacetoken>../src/contributions/resources</replacetoken>
+      <replacetoken>../src/resources</replacetoken>
     </replace>
     <replace file="${tmp.dir}/WEB-INF/classes/yanel.properties" value="../../resources">
       <replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
diff --git a/src/build/targets/build-update-war.xml b/src/build/targets/build-update-war.xml
index 0fcef77e1..fb15e100b 100644
--- a/src/build/targets/build-update-war.xml
+++ b/src/build/targets/build-update-war.xml
@@ -30,7 +30,7 @@
       <fileset dir="${yanel.source.home}/src/resources"/>
     </copy>
     <copy todir="${update.dir}/${servlet.context.prefix}/resources">
-      <fileset dir="${yanel.source.home}/src/contributions/resources"/>
+      <fileset dir="${yanel.source.home}/src/resources"/>
     </copy>
     <copy todir="${update.dir}/${servlet.context.prefix}/resources">
       <fileset dir="${yanel.source.home}/src/realms/welcome-admin/yanel/resources"/>
@@ -42,7 +42,7 @@
       <replacetoken>../src/resources</replacetoken>
     </replace>
     <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
-      <replacetoken>../src/contributions/resources</replacetoken>
+      <replacetoken>../src/resources</replacetoken>
     </replace>
     <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
       <replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
diff --git a/src/build/targets/create-new-resource-type.xml b/src/build/targets/create-new-resource-type.xml
index 8db01dd2a..544f4c12e 100644
--- a/src/build/targets/create-new-resource-type.xml
+++ b/src/build/targets/create-new-resource-type.xml
@@ -4,7 +4,7 @@
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
   <description>Create new resource-type</description>
 
-  <property name="new-resource-types.home" location="${yanel.source.home}/src/contributions/resources"/>
+  <property name="new-resource-types.home" location="${yanel.source.home}/src/resources"/>
 
   <target name="new-resource-type" description="Create a new resource-type" depends="init">
     <echo>Create new resource-type from scratch ${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template</echo>
diff --git a/src/contributions/resources/404/build.xml b/src/resources/404/build.xml
similarity index 100%
rename from src/contributions/resources/404/build.xml
rename to src/resources/404/build.xml
diff --git a/src/contributions/resources/404/htdocs/404.xsl b/src/resources/404/htdocs/404.xsl
similarity index 100%
rename from src/contributions/resources/404/htdocs/404.xsl
rename to src/resources/404/htdocs/404.xsl
diff --git a/src/contributions/resources/404/resource.xml b/src/resources/404/resource.xml
similarity index 100%
rename from src/contributions/resources/404/resource.xml
rename to src/resources/404/resource.xml
diff --git a/src/contributions/resources/404/src/build/build.properties b/src/resources/404/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/404/src/build/build.properties
rename to src/resources/404/src/build/build.properties
diff --git a/src/contributions/resources/404/src/build/dependencies.xml b/src/resources/404/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/404/src/build/dependencies.xml
rename to src/resources/404/src/build/dependencies.xml
diff --git a/src/contributions/resources/404/src/java/org/wyona/yanel/impl/resources/pagenotfound/PageNotFoundResource.java b/src/resources/404/src/java/org/wyona/yanel/impl/resources/pagenotfound/PageNotFoundResource.java
similarity index 100%
rename from src/contributions/resources/404/src/java/org/wyona/yanel/impl/resources/pagenotfound/PageNotFoundResource.java
rename to src/resources/404/src/java/org/wyona/yanel/impl/resources/pagenotfound/PageNotFoundResource.java
diff --git a/src/contributions/resources/404/yanel-htdocs/doc/index.html b/src/resources/404/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/404/yanel-htdocs/doc/index.html
rename to src/resources/404/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/404/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/404/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/404/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/404/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/404/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/404/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/404/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/404/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/404/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/404/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/404/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/404/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/404/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/404/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/404/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/404/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/GWT-sandbox/README.txt b/src/resources/GWT-sandbox/README.txt
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/README.txt
rename to src/resources/GWT-sandbox/README.txt
diff --git a/src/contributions/resources/GWT-sandbox/build.xml b/src/resources/GWT-sandbox/build.xml
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/build.xml
rename to src/resources/GWT-sandbox/build.xml
diff --git a/src/contributions/resources/GWT-sandbox/htdocs/trials.html b/src/resources/GWT-sandbox/htdocs/trials.html
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/htdocs/trials.html
rename to src/resources/GWT-sandbox/htdocs/trials.html
diff --git a/src/contributions/resources/GWT-sandbox/resource.xml b/src/resources/GWT-sandbox/resource.xml
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/resource.xml
rename to src/resources/GWT-sandbox/resource.xml
diff --git a/src/contributions/resources/GWT-sandbox/src-gwt/build.properties b/src/resources/GWT-sandbox/src-gwt/build.properties
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src-gwt/build.properties
rename to src/resources/GWT-sandbox/src-gwt/build.properties
diff --git a/src/contributions/resources/GWT-sandbox/src-gwt/gwt-incubator-20091216-r1739.jar b/src/resources/GWT-sandbox/src-gwt/gwt-incubator-20091216-r1739.jar
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src-gwt/gwt-incubator-20091216-r1739.jar
rename to src/resources/GWT-sandbox/src-gwt/gwt-incubator-20091216-r1739.jar
diff --git a/src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/Trials.gwt.xml b/src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/Trials.gwt.xml
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/Trials.gwt.xml
rename to src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/Trials.gwt.xml
diff --git a/src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/TrialsLocal.gwt.xml b/src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/TrialsLocal.gwt.xml
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/TrialsLocal.gwt.xml
rename to src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/TrialsLocal.gwt.xml
diff --git a/src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/client/ScrollTableTrial.java b/src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/client/ScrollTableTrial.java
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/client/ScrollTableTrial.java
rename to src/resources/GWT-sandbox/src-gwt/java/org/wyona/gwt/trials/client/ScrollTableTrial.java
diff --git a/src/contributions/resources/GWT-sandbox/src/build/GWT.build.properties b/src/resources/GWT-sandbox/src/build/GWT.build.properties
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src/build/GWT.build.properties
rename to src/resources/GWT-sandbox/src/build/GWT.build.properties
diff --git a/src/contributions/resources/GWT-sandbox/src/build/build.properties b/src/resources/GWT-sandbox/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src/build/build.properties
rename to src/resources/GWT-sandbox/src/build/build.properties
diff --git a/src/contributions/resources/GWT-sandbox/src/build/dependencies.xml b/src/resources/GWT-sandbox/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src/build/dependencies.xml
rename to src/resources/GWT-sandbox/src/build/dependencies.xml
diff --git a/src/contributions/resources/GWT-sandbox/src/java/org/wyona/gwt/trials/yanel/TrialsResource.java b/src/resources/GWT-sandbox/src/java/org/wyona/gwt/trials/yanel/TrialsResource.java
similarity index 100%
rename from src/contributions/resources/GWT-sandbox/src/java/org/wyona/gwt/trials/yanel/TrialsResource.java
rename to src/resources/GWT-sandbox/src/java/org/wyona/gwt/trials/yanel/TrialsResource.java
diff --git a/src/contributions/resources/atom-entry/build.xml b/src/resources/atom-entry/build.xml
similarity index 100%
rename from src/contributions/resources/atom-entry/build.xml
rename to src/resources/atom-entry/build.xml
diff --git a/src/contributions/resources/atom-entry/resource.xml b/src/resources/atom-entry/resource.xml
similarity index 100%
rename from src/contributions/resources/atom-entry/resource.xml
rename to src/resources/atom-entry/resource.xml
diff --git a/src/contributions/resources/atom-entry/src/build/build.properties b/src/resources/atom-entry/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/atom-entry/src/build/build.properties
rename to src/resources/atom-entry/src/build/build.properties
diff --git a/src/contributions/resources/atom-entry/src/build/dependencies.xml b/src/resources/atom-entry/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/atom-entry/src/build/dependencies.xml
rename to src/resources/atom-entry/src/build/dependencies.xml
diff --git a/src/contributions/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java b/src/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java
similarity index 100%
rename from src/contributions/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java
rename to src/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java
diff --git a/src/contributions/resources/atom-entry/yanel-htdocs/doc/index.html b/src/resources/atom-entry/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/atom-entry/yanel-htdocs/doc/index.html
rename to src/resources/atom-entry/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/atom-entry/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/atom-entry/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom-entry/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/atom-entry/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/atom-entry/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/atom-entry/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom-entry/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/atom-entry/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/atom-entry/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/atom-entry/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom-entry/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/atom-entry/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/atom-entry/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/atom-entry/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/atom-entry/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/atom-entry/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/atom/build.xml b/src/resources/atom/build.xml
similarity index 100%
rename from src/contributions/resources/atom/build.xml
rename to src/resources/atom/build.xml
diff --git a/src/contributions/resources/atom/resource.xml b/src/resources/atom/resource.xml
similarity index 100%
rename from src/contributions/resources/atom/resource.xml
rename to src/resources/atom/resource.xml
diff --git a/src/contributions/resources/atom/src/build/build.properties b/src/resources/atom/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/atom/src/build/build.properties
rename to src/resources/atom/src/build/build.properties
diff --git a/src/contributions/resources/atom/src/build/dependencies.xml b/src/resources/atom/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/atom/src/build/dependencies.xml
rename to src/resources/atom/src/build/dependencies.xml
diff --git a/src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java b/src/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java
similarity index 100%
rename from src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java
rename to src/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java
diff --git a/src/contributions/resources/atom/xslt/atomfeed2rss2.0.xsl b/src/resources/atom/xslt/atomfeed2rss2.0.xsl
similarity index 100%
rename from src/contributions/resources/atom/xslt/atomfeed2rss2.0.xsl
rename to src/resources/atom/xslt/atomfeed2rss2.0.xsl
diff --git a/src/contributions/resources/atom/xslt/atomfeed2xhtml.xsl b/src/resources/atom/xslt/atomfeed2xhtml.xsl
similarity index 100%
rename from src/contributions/resources/atom/xslt/atomfeed2xhtml.xsl
rename to src/resources/atom/xslt/atomfeed2xhtml.xsl
diff --git a/src/contributions/resources/atom/yanel-htdocs/doc/index.html b/src/resources/atom/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/atom/yanel-htdocs/doc/index.html
rename to src/resources/atom/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/atom/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/atom/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/atom/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/atom/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/atom/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/atom/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/atom/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/atom/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/atom/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/atom/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/atom/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/atom/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/atom/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/atom/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/calendar/build.xml b/src/resources/calendar/build.xml
similarity index 100%
rename from src/contributions/resources/calendar/build.xml
rename to src/resources/calendar/build.xml
diff --git a/src/contributions/resources/calendar/resource.xml b/src/resources/calendar/resource.xml
similarity index 100%
rename from src/contributions/resources/calendar/resource.xml
rename to src/resources/calendar/resource.xml
diff --git a/src/contributions/resources/calendar/src/build/build.properties b/src/resources/calendar/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/calendar/src/build/build.properties
rename to src/resources/calendar/src/build/build.properties
diff --git a/src/contributions/resources/calendar/src/build/dependencies.xml b/src/resources/calendar/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/calendar/src/build/dependencies.xml
rename to src/resources/calendar/src/build/dependencies.xml
diff --git a/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarEvent.java b/src/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarEvent.java
similarity index 100%
rename from src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarEvent.java
rename to src/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarEvent.java
diff --git a/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java b/src/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java
similarity index 100%
rename from src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java
rename to src/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java
diff --git a/src/contributions/resources/calendar/src/test/README b/src/resources/calendar/src/test/README
similarity index 100%
rename from src/contributions/resources/calendar/src/test/README
rename to src/resources/calendar/src/test/README
diff --git a/src/contributions/resources/calendar/xslt/xml2ics.xsl b/src/resources/calendar/xslt/xml2ics.xsl
similarity index 100%
rename from src/contributions/resources/calendar/xslt/xml2ics.xsl
rename to src/resources/calendar/xslt/xml2ics.xsl
diff --git a/src/contributions/resources/calendar/xslt/xml2xhtml.xsl b/src/resources/calendar/xslt/xml2xhtml.xsl
similarity index 100%
rename from src/contributions/resources/calendar/xslt/xml2xhtml.xsl
rename to src/resources/calendar/xslt/xml2xhtml.xsl
diff --git a/src/contributions/resources/calendar/yanel-htdocs/doc/index.html b/src/resources/calendar/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/calendar/yanel-htdocs/doc/index.html
rename to src/resources/calendar/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/calendar/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/calendar/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/calendar/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/calendar/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/calendar/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/calendar/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/calendar/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/calendar/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/calendar/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/calendar/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/calendar/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/calendar/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/calendar/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/calendar/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/calendar/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/calendar/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/contact-form/build.xml b/src/resources/contact-form/build.xml
similarity index 100%
rename from src/contributions/resources/contact-form/build.xml
rename to src/resources/contact-form/build.xml
diff --git a/src/contributions/resources/contact-form/conf/contact-form_de.properties b/src/resources/contact-form/conf/contact-form_de.properties
similarity index 100%
rename from src/contributions/resources/contact-form/conf/contact-form_de.properties
rename to src/resources/contact-form/conf/contact-form_de.properties
diff --git a/src/contributions/resources/contact-form/conf/contact-form_en.properties b/src/resources/contact-form/conf/contact-form_en.properties
similarity index 100%
rename from src/contributions/resources/contact-form/conf/contact-form_en.properties
rename to src/resources/contact-form/conf/contact-form_en.properties
diff --git a/src/contributions/resources/contact-form/resource.xml b/src/resources/contact-form/resource.xml
similarity index 100%
rename from src/contributions/resources/contact-form/resource.xml
rename to src/resources/contact-form/resource.xml
diff --git a/src/contributions/resources/contact-form/src/build/build.properties b/src/resources/contact-form/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/contact-form/src/build/build.properties
rename to src/resources/contact-form/src/build/build.properties
diff --git a/src/contributions/resources/contact-form/src/build/dependencies.xml b/src/resources/contact-form/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/contact-form/src/build/dependencies.xml
rename to src/resources/contact-form/src/build/dependencies.xml
diff --git a/src/contributions/resources/contact-form/src/build/pom.xml b/src/resources/contact-form/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/contact-form/src/build/pom.xml
rename to src/resources/contact-form/src/build/pom.xml
diff --git a/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactBean.java b/src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactBean.java
similarity index 100%
rename from src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactBean.java
rename to src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactBean.java
diff --git a/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java b/src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
similarity index 100%
rename from src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
rename to src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
diff --git a/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/SendMail.java b/src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/SendMail.java
similarity index 100%
rename from src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/SendMail.java
rename to src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/SendMail.java
diff --git a/src/contributions/resources/contact-form/xml/contact-form.xml b/src/resources/contact-form/xml/contact-form.xml
similarity index 100%
rename from src/contributions/resources/contact-form/xml/contact-form.xml
rename to src/resources/contact-form/xml/contact-form.xml
diff --git a/src/contributions/resources/contact-form/xslt/contact-form.xsl b/src/resources/contact-form/xslt/contact-form.xsl
similarity index 100%
rename from src/contributions/resources/contact-form/xslt/contact-form.xsl
rename to src/resources/contact-form/xslt/contact-form.xsl
diff --git a/src/contributions/resources/contact-form/yanel-htdocs/doc/index.html b/src/resources/contact-form/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/contact-form/yanel-htdocs/doc/index.html
rename to src/resources/contact-form/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/contact-form/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/contact-form/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/contact-form/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/contact-form/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/contact-form/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/contact-form/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/contact-form/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/contact-form/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/contact-form/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/contact-form/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/contact-form/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/contact-form/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/contact-form/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/contact-form/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/contact-form/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/contact-form/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/data-repo-sitetree/build.xml b/src/resources/data-repo-sitetree/build.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/build.xml
rename to src/resources/data-repo-sitetree/build.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/google-sitemap.xsl b/src/resources/data-repo-sitetree/htdocs/google-sitemap.xsl
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/google-sitemap.xsl
rename to src/resources/data-repo-sitetree/htdocs/google-sitemap.xsl
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.html b/src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.html
rename to src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.js b/src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.js
rename to src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.xml b/src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.xml
rename to src/resources/data-repo-sitetree/htdocs/js/0FC180485DC8A34A5C5CA696E2B6B4BB.cache.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.html b/src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.html
rename to src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.js b/src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.js
rename to src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.xml b/src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.xml
rename to src/resources/data-repo-sitetree/htdocs/js/36405D4C763C7C779F3772AE85F35AD2.cache.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.html b/src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.html
rename to src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.js b/src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.js
rename to src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.xml b/src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.xml
rename to src/resources/data-repo-sitetree/htdocs/js/46A9B1637C9B8F861F92D0C2836D3FFE.cache.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.html b/src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.html
rename to src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.js b/src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.js
rename to src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.xml b/src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.xml
rename to src/resources/data-repo-sitetree/htdocs/js/B1376A70D12F96DE9514A704FB8F7BA6.cache.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.html b/src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.html
rename to src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.js b/src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.js
rename to src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.xml b/src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.xml
rename to src/resources/data-repo-sitetree/htdocs/js/B4236F5D573A0F1DC5011887EE2FB5C7.cache.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/GwtExt.css b/src/resources/data-repo-sitetree/htdocs/js/GwtExt.css
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/GwtExt.css
rename to src/resources/data-repo-sitetree/htdocs/js/GwtExt.css
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/TestNavigationTree.html b/src/resources/data-repo-sitetree/htdocs/js/TestNavigationTree.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/TestNavigationTree.html
rename to src/resources/data-repo-sitetree/htdocs/js/TestNavigationTree.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/clear.cache.gif b/src/resources/data-repo-sitetree/htdocs/js/clear.cache.gif
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/clear.cache.gif
rename to src/resources/data-repo-sitetree/htdocs/js/clear.cache.gif
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/gwt.js b/src/resources/data-repo-sitetree/htdocs/js/gwt.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/gwt.js
rename to src/resources/data-repo-sitetree/htdocs/js/gwt.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/history.html b/src/resources/data-repo-sitetree/htdocs/js/history.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/history.html
rename to src/resources/data-repo-sitetree/htdocs/js/history.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/hosted.html b/src/resources/data-repo-sitetree/htdocs/js/hosted.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/hosted.html
rename to src/resources/data-repo-sitetree/htdocs/js/hosted.html
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/init.js b/src/resources/data-repo-sitetree/htdocs/js/init.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/init.js
rename to src/resources/data-repo-sitetree/htdocs/js/init.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree-xs.nocache.js b/src/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree-xs.nocache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree-xs.nocache.js
rename to src/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree-xs.nocache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree.nocache.js b/src/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree.nocache.js
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree.nocache.js
rename to src/resources/data-repo-sitetree/htdocs/js/org.wyona.yanel.navigation.gwt.navigationtree.NavigationTree.nocache.js
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/js/sample-tree.xml b/src/resources/data-repo-sitetree/htdocs/js/sample-tree.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/js/sample-tree.xml
rename to src/resources/data-repo-sitetree/htdocs/js/sample-tree.xml
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/json-node.xsl b/src/resources/data-repo-sitetree/htdocs/json-node.xsl
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/json-node.xsl
rename to src/resources/data-repo-sitetree/htdocs/json-node.xsl
diff --git a/src/contributions/resources/data-repo-sitetree/htdocs/sitetree.xsl b/src/resources/data-repo-sitetree/htdocs/sitetree.xsl
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/htdocs/sitetree.xsl
rename to src/resources/data-repo-sitetree/htdocs/sitetree.xsl
diff --git a/src/contributions/resources/data-repo-sitetree/resource.xml b/src/resources/data-repo-sitetree/resource.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/resource.xml
rename to src/resources/data-repo-sitetree/resource.xml
diff --git a/src/contributions/resources/data-repo-sitetree/src/build/build.properties b/src/resources/data-repo-sitetree/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/src/build/build.properties
rename to src/resources/data-repo-sitetree/src/build/build.properties
diff --git a/src/contributions/resources/data-repo-sitetree/src/build/dependencies.xml b/src/resources/data-repo-sitetree/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/src/build/dependencies.xml
rename to src/resources/data-repo-sitetree/src/build/dependencies.xml
diff --git a/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java b/src/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
rename to src/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
diff --git a/src/contributions/resources/data-repo-sitetree/src/test/README b/src/resources/data-repo-sitetree/src/test/README
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/src/test/README
rename to src/resources/data-repo-sitetree/src/test/README
diff --git a/src/contributions/resources/data-repo-sitetree/yanel-htdocs/doc/index.html b/src/resources/data-repo-sitetree/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/yanel-htdocs/doc/index.html
rename to src/resources/data-repo-sitetree/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/data-repo-sitetree/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/data-repo-sitetree/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/data-repo-sitetree/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/data-repo-sitetree/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/data-repo-sitetree/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/data-repo-sitetree/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/data-repo-sitetree/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/data-repo-sitetree/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/data-repo-sitetree/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/davcollection/build.xml b/src/resources/davcollection/build.xml
similarity index 100%
rename from src/contributions/resources/davcollection/build.xml
rename to src/resources/davcollection/build.xml
diff --git a/src/contributions/resources/davcollection/resource.xml b/src/resources/davcollection/resource.xml
similarity index 100%
rename from src/contributions/resources/davcollection/resource.xml
rename to src/resources/davcollection/resource.xml
diff --git a/src/contributions/resources/davcollection/src/build/build.properties b/src/resources/davcollection/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/davcollection/src/build/build.properties
rename to src/resources/davcollection/src/build/build.properties
diff --git a/src/contributions/resources/davcollection/src/build/dependencies.xml b/src/resources/davcollection/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/davcollection/src/build/dependencies.xml
rename to src/resources/davcollection/src/build/dependencies.xml
diff --git a/src/contributions/resources/davcollection/src/java/org/wyona/yanel/impl/resources/DavCollection.java b/src/resources/davcollection/src/java/org/wyona/yanel/impl/resources/DavCollection.java
similarity index 100%
rename from src/contributions/resources/davcollection/src/java/org/wyona/yanel/impl/resources/DavCollection.java
rename to src/resources/davcollection/src/java/org/wyona/yanel/impl/resources/DavCollection.java
diff --git a/src/contributions/resources/davcollection/src/java/org/wyona/yanel/impl/resources/XmlViewResource.java b/src/resources/davcollection/src/java/org/wyona/yanel/impl/resources/XmlViewResource.java
similarity index 100%
rename from src/contributions/resources/davcollection/src/java/org/wyona/yanel/impl/resources/XmlViewResource.java
rename to src/resources/davcollection/src/java/org/wyona/yanel/impl/resources/XmlViewResource.java
diff --git a/src/contributions/resources/davcollection/yanel-htdocs/doc/index.html b/src/resources/davcollection/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/davcollection/yanel-htdocs/doc/index.html
rename to src/resources/davcollection/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/davcollection/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/davcollection/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/davcollection/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/davcollection/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/davcollection/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/davcollection/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/davcollection/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/davcollection/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/davcollection/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/davcollection/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/davcollection/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/davcollection/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/davcollection/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/davcollection/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/davcollection/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/davcollection/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/forgotpw/build.xml b/src/resources/forgotpw/build.xml
similarity index 100%
rename from src/contributions/resources/forgotpw/build.xml
rename to src/resources/forgotpw/build.xml
diff --git a/src/contributions/resources/forgotpw/htdocs/forgotpw.xsl b/src/resources/forgotpw/htdocs/forgotpw.xsl
similarity index 100%
rename from src/contributions/resources/forgotpw/htdocs/forgotpw.xsl
rename to src/resources/forgotpw/htdocs/forgotpw.xsl
diff --git a/src/contributions/resources/forgotpw/resource.xml b/src/resources/forgotpw/resource.xml
similarity index 100%
rename from src/contributions/resources/forgotpw/resource.xml
rename to src/resources/forgotpw/resource.xml
diff --git a/src/contributions/resources/forgotpw/src/build/build.properties b/src/resources/forgotpw/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/forgotpw/src/build/build.properties
rename to src/resources/forgotpw/src/build/build.properties
diff --git a/src/contributions/resources/forgotpw/src/build/dependencies.xml b/src/resources/forgotpw/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/forgotpw/src/build/dependencies.xml
rename to src/resources/forgotpw/src/build/dependencies.xml
diff --git a/src/contributions/resources/forgotpw/src/build/pom.xml b/src/resources/forgotpw/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/forgotpw/src/build/pom.xml
rename to src/resources/forgotpw/src/build/pom.xml
diff --git a/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java b/src/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
similarity index 100%
rename from src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
rename to src/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
diff --git a/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java b/src/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java
similarity index 100%
rename from src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java
rename to src/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java
diff --git a/src/contributions/resources/forgotpw/yanel-htdocs/doc/index.html b/src/resources/forgotpw/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/forgotpw/yanel-htdocs/doc/index.html
rename to src/resources/forgotpw/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/forgotpw/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/forgotpw/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/forgotpw/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/forgotpw/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/forgotpw/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/forgotpw/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/forgotpw/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/forgotpw/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/forgotpw/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/forgotpw/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/forgotpw/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/forgotpw/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/forgotpw/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/forgotpw/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/forgotpw/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/forgotpw/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/generic-exception-handler/build.xml b/src/resources/generic-exception-handler/build.xml
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/build.xml
rename to src/resources/generic-exception-handler/build.xml
diff --git a/src/contributions/resources/generic-exception-handler/htdocs/exception-handler.xsl b/src/resources/generic-exception-handler/htdocs/exception-handler.xsl
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/htdocs/exception-handler.xsl
rename to src/resources/generic-exception-handler/htdocs/exception-handler.xsl
diff --git a/src/contributions/resources/generic-exception-handler/resource.xml b/src/resources/generic-exception-handler/resource.xml
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/resource.xml
rename to src/resources/generic-exception-handler/resource.xml
diff --git a/src/contributions/resources/generic-exception-handler/src/build/build.properties b/src/resources/generic-exception-handler/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/src/build/build.properties
rename to src/resources/generic-exception-handler/src/build/build.properties
diff --git a/src/contributions/resources/generic-exception-handler/src/build/dependencies.xml b/src/resources/generic-exception-handler/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/src/build/dependencies.xml
rename to src/resources/generic-exception-handler/src/build/dependencies.xml
diff --git a/src/contributions/resources/generic-exception-handler/src/java/org/wyona/yanel/impl/resources/exception/GenericExceptionHandler.java b/src/resources/generic-exception-handler/src/java/org/wyona/yanel/impl/resources/exception/GenericExceptionHandler.java
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/src/java/org/wyona/yanel/impl/resources/exception/GenericExceptionHandler.java
rename to src/resources/generic-exception-handler/src/java/org/wyona/yanel/impl/resources/exception/GenericExceptionHandler.java
diff --git a/src/contributions/resources/generic-exception-handler/yanel-htdocs/doc/index.html b/src/resources/generic-exception-handler/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/yanel-htdocs/doc/index.html
rename to src/resources/generic-exception-handler/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/generic-exception-handler/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/generic-exception-handler/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/generic-exception-handler/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/generic-exception-handler/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/image/build.xml b/src/resources/image/build.xml
similarity index 100%
rename from src/contributions/resources/image/build.xml
rename to src/resources/image/build.xml
diff --git a/src/contributions/resources/image/resource-mobile.xml b/src/resources/image/resource-mobile.xml
similarity index 100%
rename from src/contributions/resources/image/resource-mobile.xml
rename to src/resources/image/resource-mobile.xml
diff --git a/src/contributions/resources/image/resource.xml b/src/resources/image/resource.xml
similarity index 100%
rename from src/contributions/resources/image/resource.xml
rename to src/resources/image/resource.xml
diff --git a/src/contributions/resources/image/src/build/build.properties b/src/resources/image/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/image/src/build/build.properties
rename to src/resources/image/src/build/build.properties
diff --git a/src/contributions/resources/image/src/build/dependencies.xml b/src/resources/image/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/image/src/build/dependencies.xml
rename to src/resources/image/src/build/dependencies.xml
diff --git a/src/contributions/resources/image/src/java/org/wyona/yanel/impl/resources/image/ImageResource.java b/src/resources/image/src/java/org/wyona/yanel/impl/resources/image/ImageResource.java
similarity index 100%
rename from src/contributions/resources/image/src/java/org/wyona/yanel/impl/resources/image/ImageResource.java
rename to src/resources/image/src/java/org/wyona/yanel/impl/resources/image/ImageResource.java
diff --git a/src/contributions/resources/image/src/java/org/wyona/yanel/impl/resources/image/MobileImageResource.java b/src/resources/image/src/java/org/wyona/yanel/impl/resources/image/MobileImageResource.java
similarity index 100%
rename from src/contributions/resources/image/src/java/org/wyona/yanel/impl/resources/image/MobileImageResource.java
rename to src/resources/image/src/java/org/wyona/yanel/impl/resources/image/MobileImageResource.java
diff --git a/src/contributions/resources/image/src/test/htmlunit/org/wyona/yanel/impl/resources/image/ImageResourceWebTest.java b/src/resources/image/src/test/htmlunit/org/wyona/yanel/impl/resources/image/ImageResourceWebTest.java
similarity index 100%
rename from src/contributions/resources/image/src/test/htmlunit/org/wyona/yanel/impl/resources/image/ImageResourceWebTest.java
rename to src/resources/image/src/test/htmlunit/org/wyona/yanel/impl/resources/image/ImageResourceWebTest.java
diff --git a/src/contributions/resources/image/src/test/junit/org/wyona/yanel/impl/resources/image/ImageResourceTest.java b/src/resources/image/src/test/junit/org/wyona/yanel/impl/resources/image/ImageResourceTest.java
similarity index 100%
rename from src/contributions/resources/image/src/test/junit/org/wyona/yanel/impl/resources/image/ImageResourceTest.java
rename to src/resources/image/src/test/junit/org/wyona/yanel/impl/resources/image/ImageResourceTest.java
diff --git a/src/contributions/resources/image/yanel-htdocs/doc/index.html b/src/resources/image/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/image/yanel-htdocs/doc/index.html
rename to src/resources/image/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/image/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/image/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/image/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/image/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/image/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/image/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/image/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/image/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/image/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/image/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/image/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/image/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/image/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/image/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/image/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/image/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/lookup/build.xml b/src/resources/lookup/build.xml
similarity index 100%
rename from src/contributions/resources/lookup/build.xml
rename to src/resources/lookup/build.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.html b/src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.html
rename to src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.html
diff --git a/src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.js b/src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.js
rename to src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.xml b/src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.xml
rename to src/resources/lookup/htdocs/js/60093025021DC9943BCB5518A7A39762.cache.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.html b/src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.html
rename to src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.html
diff --git a/src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.js b/src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.js
rename to src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.xml b/src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.xml
rename to src/resources/lookup/htdocs/js/6B554B95B7469F086DD0938405452CD5.cache.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.html b/src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.html
rename to src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.html
diff --git a/src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.js b/src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.js
rename to src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.xml b/src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.xml
rename to src/resources/lookup/htdocs/js/6E1C0E01CB1C1E58E17525AB9FDC9092.cache.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.html b/src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.html
rename to src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.html
diff --git a/src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.js b/src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.js
rename to src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.xml b/src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.xml
rename to src/resources/lookup/htdocs/js/731CAC4DC964505EDBAD08230BE1F6EE.cache.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.html b/src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.html
rename to src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.html
diff --git a/src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.js b/src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.js
rename to src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.xml b/src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.xml
rename to src/resources/lookup/htdocs/js/99A4A183C52217B1F571E5D5249C6C74.cache.xml
diff --git a/src/contributions/resources/lookup/htdocs/js/GwtExt.css b/src/resources/lookup/htdocs/js/GwtExt.css
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/GwtExt.css
rename to src/resources/lookup/htdocs/js/GwtExt.css
diff --git a/src/contributions/resources/lookup/htdocs/js/TestLookupTree.html b/src/resources/lookup/htdocs/js/TestLookupTree.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/TestLookupTree.html
rename to src/resources/lookup/htdocs/js/TestLookupTree.html
diff --git a/src/contributions/resources/lookup/htdocs/js/clear.cache.gif b/src/resources/lookup/htdocs/js/clear.cache.gif
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/clear.cache.gif
rename to src/resources/lookup/htdocs/js/clear.cache.gif
diff --git a/src/contributions/resources/lookup/htdocs/js/gwt.js b/src/resources/lookup/htdocs/js/gwt.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/gwt.js
rename to src/resources/lookup/htdocs/js/gwt.js
diff --git a/src/contributions/resources/lookup/htdocs/js/history.html b/src/resources/lookup/htdocs/js/history.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/history.html
rename to src/resources/lookup/htdocs/js/history.html
diff --git a/src/contributions/resources/lookup/htdocs/js/hosted.html b/src/resources/lookup/htdocs/js/hosted.html
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/hosted.html
rename to src/resources/lookup/htdocs/js/hosted.html
diff --git a/src/contributions/resources/lookup/htdocs/js/init.js b/src/resources/lookup/htdocs/js/init.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/init.js
rename to src/resources/lookup/htdocs/js/init.js
diff --git a/src/contributions/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree-xs.nocache.js b/src/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree-xs.nocache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree-xs.nocache.js
rename to src/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree-xs.nocache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree.nocache.js b/src/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree.nocache.js
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree.nocache.js
rename to src/resources/lookup/htdocs/js/org.wyona.yanel.navigation.gwt.lookuptree.LookupTree.nocache.js
diff --git a/src/contributions/resources/lookup/htdocs/js/sample-tree.xml b/src/resources/lookup/htdocs/js/sample-tree.xml
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/js/sample-tree.xml
rename to src/resources/lookup/htdocs/js/sample-tree.xml
diff --git a/src/contributions/resources/lookup/htdocs/json-node-grid.xsl b/src/resources/lookup/htdocs/json-node-grid.xsl
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/json-node-grid.xsl
rename to src/resources/lookup/htdocs/json-node-grid.xsl
diff --git a/src/contributions/resources/lookup/htdocs/json-node.jelly b/src/resources/lookup/htdocs/json-node.jelly
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/json-node.jelly
rename to src/resources/lookup/htdocs/json-node.jelly
diff --git a/src/contributions/resources/lookup/htdocs/json-node.xsl b/src/resources/lookup/htdocs/json-node.xsl
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/json-node.xsl
rename to src/resources/lookup/htdocs/json-node.xsl
diff --git a/src/contributions/resources/lookup/htdocs/tinymce-lookup.jelly b/src/resources/lookup/htdocs/tinymce-lookup.jelly
similarity index 100%
rename from src/contributions/resources/lookup/htdocs/tinymce-lookup.jelly
rename to src/resources/lookup/htdocs/tinymce-lookup.jelly
diff --git a/src/contributions/resources/lookup/resource.xml b/src/resources/lookup/resource.xml
similarity index 100%
rename from src/contributions/resources/lookup/resource.xml
rename to src/resources/lookup/resource.xml
diff --git a/src/contributions/resources/lookup/src/build/build.properties b/src/resources/lookup/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/lookup/src/build/build.properties
rename to src/resources/lookup/src/build/build.properties
diff --git a/src/contributions/resources/lookup/src/build/dependencies.xml b/src/resources/lookup/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/lookup/src/build/dependencies.xml
rename to src/resources/lookup/src/build/dependencies.xml
diff --git a/src/contributions/resources/lookup/src/java/org/wyona/yanel/impl/resources/navigation/lookup/LookupResource.java b/src/resources/lookup/src/java/org/wyona/yanel/impl/resources/navigation/lookup/LookupResource.java
similarity index 100%
rename from src/contributions/resources/lookup/src/java/org/wyona/yanel/impl/resources/navigation/lookup/LookupResource.java
rename to src/resources/lookup/src/java/org/wyona/yanel/impl/resources/navigation/lookup/LookupResource.java
diff --git a/src/contributions/resources/lookup/src/test/README b/src/resources/lookup/src/test/README
similarity index 100%
rename from src/contributions/resources/lookup/src/test/README
rename to src/resources/lookup/src/test/README
diff --git a/src/contributions/resources/lookup/yanel-htdocs/doc/index.html b/src/resources/lookup/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/lookup/yanel-htdocs/doc/index.html
rename to src/resources/lookup/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/lookup/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/lookup/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/lookup/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/lookup/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/lookup/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/lookup/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/lookup/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/lookup/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/lookup/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/lookup/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/lookup/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/lookup/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/lookup/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/lookup/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/lookup/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/lookup/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/morelikethis/build.xml b/src/resources/morelikethis/build.xml
similarity index 100%
rename from src/contributions/resources/morelikethis/build.xml
rename to src/resources/morelikethis/build.xml
diff --git a/src/contributions/resources/morelikethis/resource.xml b/src/resources/morelikethis/resource.xml
similarity index 100%
rename from src/contributions/resources/morelikethis/resource.xml
rename to src/resources/morelikethis/resource.xml
diff --git a/src/contributions/resources/morelikethis/src/build/build.properties b/src/resources/morelikethis/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/morelikethis/src/build/build.properties
rename to src/resources/morelikethis/src/build/build.properties
diff --git a/src/contributions/resources/morelikethis/src/build/dependencies.xml b/src/resources/morelikethis/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/morelikethis/src/build/dependencies.xml
rename to src/resources/morelikethis/src/build/dependencies.xml
diff --git a/src/contributions/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java b/src/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java
similarity index 100%
rename from src/contributions/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java
rename to src/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java
diff --git a/src/contributions/resources/morelikethis/yanel-htdocs/doc/index.html b/src/resources/morelikethis/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/morelikethis/yanel-htdocs/doc/index.html
rename to src/resources/morelikethis/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/morelikethis/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/morelikethis/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/morelikethis/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/morelikethis/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/morelikethis/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/morelikethis/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/morelikethis/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/morelikethis/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/morelikethis/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/morelikethis/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/morelikethis/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/morelikethis/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/morelikethis/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/morelikethis/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/morelikethis/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/morelikethis/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/nutch/build.xml b/src/resources/nutch/build.xml
similarity index 100%
rename from src/contributions/resources/nutch/build.xml
rename to src/resources/nutch/build.xml
diff --git a/src/contributions/resources/nutch/conf/common-terms.utf8 b/src/resources/nutch/conf/common-terms.utf8
similarity index 100%
rename from src/contributions/resources/nutch/conf/common-terms.utf8
rename to src/resources/nutch/conf/common-terms.utf8
diff --git a/src/contributions/resources/nutch/conf/nutch-default.xml b/src/resources/nutch/conf/nutch-default.xml
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch-default.xml
rename to src/resources/nutch/conf/nutch-default.xml
diff --git a/src/contributions/resources/nutch/conf/nutch-local.xml.template b/src/resources/nutch/conf/nutch-local.xml.template
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch-local.xml.template
rename to src/resources/nutch/conf/nutch-local.xml.template
diff --git a/src/contributions/resources/nutch/conf/nutch_de.properties b/src/resources/nutch/conf/nutch_de.properties
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch_de.properties
rename to src/resources/nutch/conf/nutch_de.properties
diff --git a/src/contributions/resources/nutch/conf/nutch_en.properties b/src/resources/nutch/conf/nutch_en.properties
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch_en.properties
rename to src/resources/nutch/conf/nutch_en.properties
diff --git a/src/contributions/resources/nutch/conf/nutch_fr.properties b/src/resources/nutch/conf/nutch_fr.properties
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch_fr.properties
rename to src/resources/nutch/conf/nutch_fr.properties
diff --git a/src/contributions/resources/nutch/conf/nutch_it.properties b/src/resources/nutch/conf/nutch_it.properties
similarity index 100%
rename from src/contributions/resources/nutch/conf/nutch_it.properties
rename to src/resources/nutch/conf/nutch_it.properties
diff --git a/src/contributions/resources/nutch/conf/synonymously.owl b/src/resources/nutch/conf/synonymously.owl
similarity index 100%
rename from src/contributions/resources/nutch/conf/synonymously.owl
rename to src/resources/nutch/conf/synonymously.owl
diff --git a/src/contributions/resources/nutch/lib/plugins/index-basic/index-basic.jar b/src/resources/nutch/lib/plugins/index-basic/index-basic.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/index-basic/index-basic.jar
rename to src/resources/nutch/lib/plugins/index-basic/index-basic.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/index-basic/plugin.xml b/src/resources/nutch/lib/plugins/index-basic/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/index-basic/plugin.xml
rename to src/resources/nutch/lib/plugins/index-basic/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/nutch-extensionpoints/nutch-extensionpoints.jar b/src/resources/nutch/lib/plugins/nutch-extensionpoints/nutch-extensionpoints.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/nutch-extensionpoints/nutch-extensionpoints.jar
rename to src/resources/nutch/lib/plugins/nutch-extensionpoints/nutch-extensionpoints.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/nutch-extensionpoints/plugin.xml b/src/resources/nutch/lib/plugins/nutch-extensionpoints/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/nutch-extensionpoints/plugin.xml
rename to src/resources/nutch/lib/plugins/nutch-extensionpoints/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-html/parse-html.jar b/src/resources/nutch/lib/plugins/parse-html/parse-html.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-html/parse-html.jar
rename to src/resources/nutch/lib/plugins/parse-html/parse-html.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-html/plugin.xml b/src/resources/nutch/lib/plugins/parse-html/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-html/plugin.xml
rename to src/resources/nutch/lib/plugins/parse-html/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-html/tagsoup-1.0rc3.jar b/src/resources/nutch/lib/plugins/parse-html/tagsoup-1.0rc3.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-html/tagsoup-1.0rc3.jar
rename to src/resources/nutch/lib/plugins/parse-html/tagsoup-1.0rc3.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-js/parse-js.jar b/src/resources/nutch/lib/plugins/parse-js/parse-js.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-js/parse-js.jar
rename to src/resources/nutch/lib/plugins/parse-js/parse-js.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-js/plugin.xml b/src/resources/nutch/lib/plugins/parse-js/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-js/plugin.xml
rename to src/resources/nutch/lib/plugins/parse-js/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-text/parse-text.jar b/src/resources/nutch/lib/plugins/parse-text/parse-text.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-text/parse-text.jar
rename to src/resources/nutch/lib/plugins/parse-text/parse-text.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/parse-text/plugin.xml b/src/resources/nutch/lib/plugins/parse-text/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/parse-text/plugin.xml
rename to src/resources/nutch/lib/plugins/parse-text/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/protocol-file/plugin.xml b/src/resources/nutch/lib/plugins/protocol-file/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/protocol-file/plugin.xml
rename to src/resources/nutch/lib/plugins/protocol-file/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/protocol-file/protocol-file.jar b/src/resources/nutch/lib/plugins/protocol-file/protocol-file.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/protocol-file/protocol-file.jar
rename to src/resources/nutch/lib/plugins/protocol-file/protocol-file.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/protocol-http/plugin.xml b/src/resources/nutch/lib/plugins/protocol-http/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/protocol-http/plugin.xml
rename to src/resources/nutch/lib/plugins/protocol-http/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/protocol-http/protocol-http.jar b/src/resources/nutch/lib/plugins/protocol-http/protocol-http.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/protocol-http/protocol-http.jar
rename to src/resources/nutch/lib/plugins/protocol-http/protocol-http.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/query-basic/plugin.xml b/src/resources/nutch/lib/plugins/query-basic/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-basic/plugin.xml
rename to src/resources/nutch/lib/plugins/query-basic/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/query-basic/query-basic.jar b/src/resources/nutch/lib/plugins/query-basic/query-basic.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-basic/query-basic.jar
rename to src/resources/nutch/lib/plugins/query-basic/query-basic.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/query-site/plugin.xml b/src/resources/nutch/lib/plugins/query-site/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-site/plugin.xml
rename to src/resources/nutch/lib/plugins/query-site/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/query-site/query-site.jar b/src/resources/nutch/lib/plugins/query-site/query-site.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-site/query-site.jar
rename to src/resources/nutch/lib/plugins/query-site/query-site.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/query-url/plugin.xml b/src/resources/nutch/lib/plugins/query-url/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-url/plugin.xml
rename to src/resources/nutch/lib/plugins/query-url/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/query-url/query-url.jar b/src/resources/nutch/lib/plugins/query-url/query-url.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/query-url/query-url.jar
rename to src/resources/nutch/lib/plugins/query-url/query-url.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/scoring-opic/plugin.xml b/src/resources/nutch/lib/plugins/scoring-opic/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/scoring-opic/plugin.xml
rename to src/resources/nutch/lib/plugins/scoring-opic/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/scoring-opic/scoring-opic.jar b/src/resources/nutch/lib/plugins/scoring-opic/scoring-opic.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/scoring-opic/scoring-opic.jar
rename to src/resources/nutch/lib/plugins/scoring-opic/scoring-opic.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/summary-basic/plugin.xml b/src/resources/nutch/lib/plugins/summary-basic/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/summary-basic/plugin.xml
rename to src/resources/nutch/lib/plugins/summary-basic/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/summary-basic/summary-basic.jar b/src/resources/nutch/lib/plugins/summary-basic/summary-basic.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/summary-basic/summary-basic.jar
rename to src/resources/nutch/lib/plugins/summary-basic/summary-basic.jar
diff --git a/src/contributions/resources/nutch/lib/plugins/urlfilter-regex/plugin.xml b/src/resources/nutch/lib/plugins/urlfilter-regex/plugin.xml
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/urlfilter-regex/plugin.xml
rename to src/resources/nutch/lib/plugins/urlfilter-regex/plugin.xml
diff --git a/src/contributions/resources/nutch/lib/plugins/urlfilter-regex/urlfilter-regex.jar b/src/resources/nutch/lib/plugins/urlfilter-regex/urlfilter-regex.jar
similarity index 100%
rename from src/contributions/resources/nutch/lib/plugins/urlfilter-regex/urlfilter-regex.jar
rename to src/resources/nutch/lib/plugins/urlfilter-regex/urlfilter-regex.jar
diff --git a/src/contributions/resources/nutch/resource.xml b/src/resources/nutch/resource.xml
similarity index 100%
rename from src/contributions/resources/nutch/resource.xml
rename to src/resources/nutch/resource.xml
diff --git a/src/contributions/resources/nutch/src/build/build.properties b/src/resources/nutch/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/nutch/src/build/build.properties
rename to src/resources/nutch/src/build/build.properties
diff --git a/src/contributions/resources/nutch/src/build/dependencies.xml b/src/resources/nutch/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/nutch/src/build/dependencies.xml
rename to src/resources/nutch/src/build/dependencies.xml
diff --git a/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java b/src/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
similarity index 100%
rename from src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
rename to src/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
diff --git a/src/contributions/resources/nutch/src/test/htmlunit/org/wyona/yanel/impl/resources/NutchResourceWebTest.java b/src/resources/nutch/src/test/htmlunit/org/wyona/yanel/impl/resources/NutchResourceWebTest.java
similarity index 100%
rename from src/contributions/resources/nutch/src/test/htmlunit/org/wyona/yanel/impl/resources/NutchResourceWebTest.java
rename to src/resources/nutch/src/test/htmlunit/org/wyona/yanel/impl/resources/NutchResourceWebTest.java
diff --git a/src/contributions/resources/nutch/src/test/junit/org/wyona/yanel/impl/resources/NutchResourceTest.java b/src/resources/nutch/src/test/junit/org/wyona/yanel/impl/resources/NutchResourceTest.java
similarity index 100%
rename from src/contributions/resources/nutch/src/test/junit/org/wyona/yanel/impl/resources/NutchResourceTest.java
rename to src/resources/nutch/src/test/junit/org/wyona/yanel/impl/resources/NutchResourceTest.java
diff --git a/src/contributions/resources/nutch/xslt/result2xhtml.xsl b/src/resources/nutch/xslt/result2xhtml.xsl
similarity index 100%
rename from src/contributions/resources/nutch/xslt/result2xhtml.xsl
rename to src/resources/nutch/xslt/result2xhtml.xsl
diff --git a/src/contributions/resources/nutch/yanel-htdocs/doc/index.html b/src/resources/nutch/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/nutch/yanel-htdocs/doc/index.html
rename to src/resources/nutch/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/nutch/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/nutch/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/nutch/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/nutch/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/nutch/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/nutch/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/nutch/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/nutch/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/nutch/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/nutch/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/nutch/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/nutch/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/nutch/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/nutch/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/nutch/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/nutch/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/pdf/build.xml b/src/resources/pdf/build.xml
similarity index 100%
rename from src/contributions/resources/pdf/build.xml
rename to src/resources/pdf/build.xml
diff --git a/src/contributions/resources/pdf/resource.xml b/src/resources/pdf/resource.xml
similarity index 100%
rename from src/contributions/resources/pdf/resource.xml
rename to src/resources/pdf/resource.xml
diff --git a/src/contributions/resources/pdf/src/build/build.properties b/src/resources/pdf/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/pdf/src/build/build.properties
rename to src/resources/pdf/src/build/build.properties
diff --git a/src/contributions/resources/pdf/src/build/dependencies.xml b/src/resources/pdf/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/pdf/src/build/dependencies.xml
rename to src/resources/pdf/src/build/dependencies.xml
diff --git a/src/contributions/resources/pdf/src/build/pom.xml b/src/resources/pdf/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/pdf/src/build/pom.xml
rename to src/resources/pdf/src/build/pom.xml
diff --git a/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java b/src/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
similarity index 100%
rename from src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
rename to src/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
diff --git a/src/contributions/resources/pdf/xslt/xml2fo.xsl b/src/resources/pdf/xslt/xml2fo.xsl
similarity index 100%
rename from src/contributions/resources/pdf/xslt/xml2fo.xsl
rename to src/resources/pdf/xslt/xml2fo.xsl
diff --git a/src/contributions/resources/pdf/yanel-htdocs/doc/index.html b/src/resources/pdf/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/doc/index.html
rename to src/resources/pdf/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/pdf/yanel-htdocs/icons/128x128/rt-icon.png b/src/resources/pdf/yanel-htdocs/icons/128x128/rt-icon.png
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/icons/128x128/rt-icon.png
rename to src/resources/pdf/yanel-htdocs/icons/128x128/rt-icon.png
diff --git a/src/contributions/resources/pdf/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/pdf/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/pdf/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/pdf/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/pdf/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/pdf/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/pdf/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/pdf/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/pdf/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/pdf/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/pdf/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/pdf/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/pdf/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/personalized-content/build.xml b/src/resources/personalized-content/build.xml
similarity index 100%
rename from src/contributions/resources/personalized-content/build.xml
rename to src/resources/personalized-content/build.xml
diff --git a/src/contributions/resources/personalized-content/resource.xml b/src/resources/personalized-content/resource.xml
similarity index 100%
rename from src/contributions/resources/personalized-content/resource.xml
rename to src/resources/personalized-content/resource.xml
diff --git a/src/contributions/resources/personalized-content/src/build/build.properties b/src/resources/personalized-content/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/personalized-content/src/build/build.properties
rename to src/resources/personalized-content/src/build/build.properties
diff --git a/src/contributions/resources/personalized-content/src/build/dependencies.xml b/src/resources/personalized-content/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/personalized-content/src/build/dependencies.xml
rename to src/resources/personalized-content/src/build/dependencies.xml
diff --git a/src/contributions/resources/personalized-content/src/java/org/wyona/yanel/impl/resources/boost/PersonalizedContentResource.java b/src/resources/personalized-content/src/java/org/wyona/yanel/impl/resources/boost/PersonalizedContentResource.java
similarity index 100%
rename from src/contributions/resources/personalized-content/src/java/org/wyona/yanel/impl/resources/boost/PersonalizedContentResource.java
rename to src/resources/personalized-content/src/java/org/wyona/yanel/impl/resources/boost/PersonalizedContentResource.java
diff --git a/src/contributions/resources/personalized-content/yanel-htdocs/doc/index.html b/src/resources/personalized-content/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/personalized-content/yanel-htdocs/doc/index.html
rename to src/resources/personalized-content/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/personalized-content/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/personalized-content/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/personalized-content/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/personalized-content/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/personalized-content/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/personalized-content/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/personalized-content/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/personalized-content/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/personalized-content/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/personalized-content/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/personalized-content/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/personalized-content/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/personalized-content/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/personalized-content/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/personalized-content/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/personalized-content/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/policymanager/build.xml b/src/resources/policymanager/build.xml
similarity index 100%
rename from src/contributions/resources/policymanager/build.xml
rename to src/resources/policymanager/build.xml
diff --git a/src/contributions/resources/policymanager/htdocs/.gitignore b/src/resources/policymanager/htdocs/.gitignore
similarity index 100%
rename from src/contributions/resources/policymanager/htdocs/.gitignore
rename to src/resources/policymanager/htdocs/.gitignore
diff --git a/src/contributions/resources/policymanager/htdocs/README.txt b/src/resources/policymanager/htdocs/README.txt
similarity index 100%
rename from src/contributions/resources/policymanager/htdocs/README.txt
rename to src/resources/policymanager/htdocs/README.txt
diff --git a/src/contributions/resources/policymanager/resource.xml b/src/resources/policymanager/resource.xml
similarity index 100%
rename from src/contributions/resources/policymanager/resource.xml
rename to src/resources/policymanager/resource.xml
diff --git a/src/contributions/resources/policymanager/src-gwt/README.txt b/src/resources/policymanager/src-gwt/README.txt
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/README.txt
rename to src/resources/policymanager/src-gwt/README.txt
diff --git a/src/contributions/resources/policymanager/src-gwt/build.properties b/src/resources/policymanager/src-gwt/build.properties
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/build.properties
rename to src/resources/policymanager/src-gwt/build.properties
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/AccessPolicyEditor.gwt.xml b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/AccessPolicyEditor.gwt.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/AccessPolicyEditor.gwt.xml
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/AccessPolicyEditor.gwt.xml
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AddRemoveIdentitiesWidget.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AddRemoveIdentitiesWidget.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AddRemoveIdentitiesWidget.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AddRemoveIdentitiesWidget.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AlphabeticalFilterButton.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AlphabeticalFilterButton.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AlphabeticalFilterButton.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AlphabeticalFilterButton.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousIdentitiesAndRightsGetter.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousIdentitiesAndRightsGetter.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousIdentitiesAndRightsGetter.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousIdentitiesAndRightsGetter.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/CutPasteListOrderWidget.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/CutPasteListOrderWidget.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/CutPasteListOrderWidget.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/CutPasteListOrderWidget.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Group.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Group.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Group.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Group.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Item.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Item.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Item.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Item.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Right.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Right.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Right.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/Right.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/TestAccessPolicyEditor.html b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/TestAccessPolicyEditor.html
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/TestAccessPolicyEditor.html
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/TestAccessPolicyEditor.html
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/i18n.xml b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/i18n.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/i18n.xml
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/i18n.xml
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-identities-and-usecases.xml b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-identities-and-usecases.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-identities-and-usecases.xml
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-identities-and-usecases.xml
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-policy.xml b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-policy.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-policy.xml
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/sample-policy.xml
diff --git a/src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/style.css b/src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/style.css
similarity index 100%
rename from src/contributions/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/style.css
rename to src/resources/policymanager/src-gwt/java/org/wyona/security/gwt/accesspolicyeditor/public/style.css
diff --git a/src/contributions/resources/policymanager/src/build/GWT.build.properties b/src/resources/policymanager/src/build/GWT.build.properties
similarity index 100%
rename from src/contributions/resources/policymanager/src/build/GWT.build.properties
rename to src/resources/policymanager/src/build/GWT.build.properties
diff --git a/src/contributions/resources/policymanager/src/build/build.properties b/src/resources/policymanager/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/policymanager/src/build/build.properties
rename to src/resources/policymanager/src/build/build.properties
diff --git a/src/contributions/resources/policymanager/src/build/dependencies.xml b/src/resources/policymanager/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src/build/dependencies.xml
rename to src/resources/policymanager/src/build/dependencies.xml
diff --git a/src/contributions/resources/policymanager/src/build/pom.xml b/src/resources/policymanager/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/policymanager/src/build/pom.xml
rename to src/resources/policymanager/src/build/pom.xml
diff --git a/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java b/src/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
similarity index 100%
rename from src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
rename to src/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
diff --git a/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java b/src/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
similarity index 100%
rename from src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
rename to src/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
diff --git a/src/contributions/resources/policymanager/yanel-htdocs/doc/index.html b/src/resources/policymanager/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/policymanager/yanel-htdocs/doc/index.html
rename to src/resources/policymanager/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/policymanager/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/policymanager/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/policymanager/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/policymanager/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/policymanager/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/policymanager/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/policymanager/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/policymanager/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/policymanager/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/policymanager/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/policymanager/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/policymanager/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/policymanager/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/policymanager/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/policymanager/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/policymanager/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/redirect/build.xml b/src/resources/redirect/build.xml
similarity index 100%
rename from src/contributions/resources/redirect/build.xml
rename to src/resources/redirect/build.xml
diff --git a/src/contributions/resources/redirect/resource-v1.0.1.xml b/src/resources/redirect/resource-v1.0.1.xml
similarity index 100%
rename from src/contributions/resources/redirect/resource-v1.0.1.xml
rename to src/resources/redirect/resource-v1.0.1.xml
diff --git a/src/contributions/resources/redirect/resource.xml b/src/resources/redirect/resource.xml
similarity index 72%
rename from src/contributions/resources/redirect/resource.xml
rename to src/resources/redirect/resource.xml
index 4371c0f55..d831d16a1 100644
--- a/src/contributions/resources/redirect/resource.xml
+++ b/src/resources/redirect/resource.xml
@@ -17,7 +17,12 @@ Redirect resource, whereas redirects can also be configured user specific within
   <yanel:custom-config xmlns:rd="http://www.wyona.org/yanel/resource/redirect-resource/1.0">
     <rd:user name="bob" href="bob/index.html"/>
     <rd:user name="alice" href="alice/index.html"/>
+
+    <rd:language code="de" device="web.xml:mobile-devices" href="de/index_m.html"/>
+    <rd:language code="de" if-logged-in="true" href="de/willkommen.html"/>
     <rd:language code="de" href="de/index.html"/>
+
+    <rd:language code="*" if-logged-in="true" href="en/welcome.html"/>
   </yanel:custom-config>
 -->
 </rtd>
diff --git a/src/contributions/resources/redirect/src/build/build.properties b/src/resources/redirect/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/redirect/src/build/build.properties
rename to src/resources/redirect/src/build/build.properties
diff --git a/src/contributions/resources/redirect/src/build/dependencies.xml b/src/resources/redirect/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/redirect/src/build/dependencies.xml
rename to src/resources/redirect/src/build/dependencies.xml
diff --git a/src/contributions/resources/redirect/src/build/pom.xml b/src/resources/redirect/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/redirect/src/build/pom.xml
rename to src/resources/redirect/src/build/pom.xml
diff --git a/src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java b/src/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java
similarity index 100%
rename from src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java
rename to src/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java
diff --git a/src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResourceV101.java b/src/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResourceV101.java
similarity index 100%
rename from src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResourceV101.java
rename to src/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResourceV101.java
diff --git a/src/contributions/resources/redirect/yanel-htdocs/doc/index.html b/src/resources/redirect/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/redirect/yanel-htdocs/doc/index.html
rename to src/resources/redirect/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/redirect/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/redirect/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/redirect/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/redirect/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/redirect/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/redirect/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/redirect/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/redirect/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/redirect/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/redirect/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/redirect/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/redirect/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/redirect/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/redirect/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/redirect/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/redirect/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/resource-creator/build.xml b/src/resources/resource-creator/build.xml
similarity index 100%
rename from src/contributions/resources/resource-creator/build.xml
rename to src/resources/resource-creator/build.xml
diff --git a/src/contributions/resources/resource-creator/htdocs/css/resource-creator.css b/src/resources/resource-creator/htdocs/css/resource-creator.css
similarity index 100%
rename from src/contributions/resources/resource-creator/htdocs/css/resource-creator.css
rename to src/resources/resource-creator/htdocs/css/resource-creator.css
diff --git a/src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js b/src/resources/resource-creator/htdocs/js/ajaxlookup.js
similarity index 100%
rename from src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js
rename to src/resources/resource-creator/htdocs/js/ajaxlookup.js
diff --git a/src/contributions/resources/resource-creator/resource.xml b/src/resources/resource-creator/resource.xml
similarity index 100%
rename from src/contributions/resources/resource-creator/resource.xml
rename to src/resources/resource-creator/resource.xml
diff --git a/src/contributions/resources/resource-creator/src/build/build.properties b/src/resources/resource-creator/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/resource-creator/src/build/build.properties
rename to src/resources/resource-creator/src/build/build.properties
diff --git a/src/contributions/resources/resource-creator/src/build/dependencies.xml b/src/resources/resource-creator/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/resource-creator/src/build/dependencies.xml
rename to src/resources/resource-creator/src/build/dependencies.xml
diff --git a/src/contributions/resources/resource-creator/src/build/pom.xml b/src/resources/resource-creator/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/resource-creator/src/build/pom.xml
rename to src/resources/resource-creator/src/build/pom.xml
diff --git a/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/rescreator/ResourceCreatorResource.java b/src/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/rescreator/ResourceCreatorResource.java
similarity index 100%
rename from src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/rescreator/ResourceCreatorResource.java
rename to src/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/rescreator/ResourceCreatorResource.java
diff --git a/src/contributions/resources/resource-creator/src/test/README b/src/resources/resource-creator/src/test/README
similarity index 100%
rename from src/contributions/resources/resource-creator/src/test/README
rename to src/resources/resource-creator/src/test/README
diff --git a/src/contributions/resources/resource-creator/yanel-htdocs/doc/index.html b/src/resources/resource-creator/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/resource-creator/yanel-htdocs/doc/index.html
rename to src/resources/resource-creator/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/resource-creator/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/resource-creator/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/resource-creator/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/resource-creator/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/resource-creator/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/resource-creator/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/resource-creator/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/resource-creator/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/resource-creator/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/resource-creator/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/resource-creator/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/resource-creator/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/resource-creator/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/resource-creator/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/resource-creator/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/resource-creator/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/search/build.xml b/src/resources/search/build.xml
similarity index 100%
rename from src/contributions/resources/search/build.xml
rename to src/resources/search/build.xml
diff --git a/src/contributions/resources/search/htdocs/clean-index.xsl b/src/resources/search/htdocs/clean-index.xsl
similarity index 100%
rename from src/contributions/resources/search/htdocs/clean-index.xsl
rename to src/resources/search/htdocs/clean-index.xsl
diff --git a/src/contributions/resources/search/htdocs/reindexer.xsl b/src/resources/search/htdocs/reindexer.xsl
similarity index 100%
rename from src/contributions/resources/search/htdocs/reindexer.xsl
rename to src/resources/search/htdocs/reindexer.xsl
diff --git a/src/contributions/resources/search/htdocs/results2xhtml.xsl b/src/resources/search/htdocs/results2xhtml.xsl
similarity index 100%
rename from src/contributions/resources/search/htdocs/results2xhtml.xsl
rename to src/resources/search/htdocs/results2xhtml.xsl
diff --git a/src/contributions/resources/search/resource-clean-index.xml b/src/resources/search/resource-clean-index.xml
similarity index 100%
rename from src/contributions/resources/search/resource-clean-index.xml
rename to src/resources/search/resource-clean-index.xml
diff --git a/src/contributions/resources/search/resource-reindexer.xml b/src/resources/search/resource-reindexer.xml
similarity index 100%
rename from src/contributions/resources/search/resource-reindexer.xml
rename to src/resources/search/resource-reindexer.xml
diff --git a/src/contributions/resources/search/resource.xml b/src/resources/search/resource.xml
similarity index 100%
rename from src/contributions/resources/search/resource.xml
rename to src/resources/search/resource.xml
diff --git a/src/contributions/resources/search/src/build/build.properties b/src/resources/search/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/search/src/build/build.properties
rename to src/resources/search/src/build/build.properties
diff --git a/src/contributions/resources/search/src/build/dependencies.xml b/src/resources/search/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/search/src/build/dependencies.xml
rename to src/resources/search/src/build/dependencies.xml
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/CleanIndexResource.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/CleanIndexResource.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/CleanIndexResource.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/CleanIndexResource.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/DebugContentHandler.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/DebugContentHandler.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/DebugContentHandler.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/DebugContentHandler.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/ReindexResource.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/ReindexResource.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/ReindexResource.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/ReindexResource.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/Result.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/Result.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/Result.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/Result.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/TitleContentHandler.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/TitleContentHandler.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/TitleContentHandler.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/TitleContentHandler.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBean.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBean.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBean.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBean.java
diff --git a/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java b/src/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java
similarity index 100%
rename from src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java
rename to src/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java
diff --git a/src/contributions/resources/search/yanel-htdocs/doc/index.html b/src/resources/search/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/search/yanel-htdocs/doc/index.html
rename to src/resources/search/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/search/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/search/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/search/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/search/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/search/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/search/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/search/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/search/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/search/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/search/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/search/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/search/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/search/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/search/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/search/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/search/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/security-api/build.xml b/src/resources/security-api/build.xml
similarity index 100%
rename from src/contributions/resources/security-api/build.xml
rename to src/resources/security-api/build.xml
diff --git a/src/contributions/resources/security-api/htdocs/group-overview.xsl b/src/resources/security-api/htdocs/group-overview.xsl
similarity index 100%
rename from src/contributions/resources/security-api/htdocs/group-overview.xsl
rename to src/resources/security-api/htdocs/group-overview.xsl
diff --git a/src/contributions/resources/security-api/resource.xml b/src/resources/security-api/resource.xml
similarity index 100%
rename from src/contributions/resources/security-api/resource.xml
rename to src/resources/security-api/resource.xml
diff --git a/src/contributions/resources/security-api/src/build/build.properties b/src/resources/security-api/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/security-api/src/build/build.properties
rename to src/resources/security-api/src/build/build.properties
diff --git a/src/contributions/resources/security-api/src/build/dependencies.xml b/src/resources/security-api/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/security-api/src/build/dependencies.xml
rename to src/resources/security-api/src/build/dependencies.xml
diff --git a/src/contributions/resources/security-api/src/build/pom.xml b/src/resources/security-api/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/security-api/src/build/pom.xml
rename to src/resources/security-api/src/build/pom.xml
diff --git a/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java b/src/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
similarity index 100%
rename from src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
rename to src/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
diff --git a/src/contributions/resources/security-api/yanel-htdocs/doc/index.html b/src/resources/security-api/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/security-api/yanel-htdocs/doc/index.html
rename to src/resources/security-api/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/security-api/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/security-api/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/security-api/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/security-api/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/security-api/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/security-api/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/security-api/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/security-api/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/security-api/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/security-api/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/security-api/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/security-api/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/security-api/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/security-api/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/security-api/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/security-api/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/sessionmanager/build.xml b/src/resources/sessionmanager/build.xml
similarity index 100%
rename from src/contributions/resources/sessionmanager/build.xml
rename to src/resources/sessionmanager/build.xml
diff --git a/src/contributions/resources/sessionmanager/htdocs/sessionmanager.xsl b/src/resources/sessionmanager/htdocs/sessionmanager.xsl
similarity index 100%
rename from src/contributions/resources/sessionmanager/htdocs/sessionmanager.xsl
rename to src/resources/sessionmanager/htdocs/sessionmanager.xsl
diff --git a/src/contributions/resources/sessionmanager/resource.xml b/src/resources/sessionmanager/resource.xml
similarity index 100%
rename from src/contributions/resources/sessionmanager/resource.xml
rename to src/resources/sessionmanager/resource.xml
diff --git a/src/contributions/resources/sessionmanager/src/build/build.properties b/src/resources/sessionmanager/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/sessionmanager/src/build/build.properties
rename to src/resources/sessionmanager/src/build/build.properties
diff --git a/src/contributions/resources/sessionmanager/src/build/dependencies.xml b/src/resources/sessionmanager/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/sessionmanager/src/build/dependencies.xml
rename to src/resources/sessionmanager/src/build/dependencies.xml
diff --git a/src/contributions/resources/sessionmanager/src/java/org/wyona/yanel/impl/resources/sessionmanager/SessionManagerResource.java b/src/resources/sessionmanager/src/java/org/wyona/yanel/impl/resources/sessionmanager/SessionManagerResource.java
similarity index 100%
rename from src/contributions/resources/sessionmanager/src/java/org/wyona/yanel/impl/resources/sessionmanager/SessionManagerResource.java
rename to src/resources/sessionmanager/src/java/org/wyona/yanel/impl/resources/sessionmanager/SessionManagerResource.java
diff --git a/src/contributions/resources/sessionmanager/yanel-htdocs/doc/index.html b/src/resources/sessionmanager/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/sessionmanager/yanel-htdocs/doc/index.html
rename to src/resources/sessionmanager/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/sessionmanager/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/sessionmanager/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/sessionmanager/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/sessionmanager/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/sessionmanager/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/sessionmanager/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/sessionmanager/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/sessionmanager/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/sessionmanager/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/sessionmanager/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/sessionmanager/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/sessionmanager/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/sessionmanager/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/sessionmanager/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/sessionmanager/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/sessionmanager/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/timeline/build.xml b/src/resources/timeline/build.xml
similarity index 100%
rename from src/contributions/resources/timeline/build.xml
rename to src/resources/timeline/build.xml
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/CHANGES.txt b/src/resources/timeline/htdocs/timeline_2.3.0/CHANGES.txt
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/CHANGES.txt
rename to src/resources/timeline/htdocs/timeline_2.3.0/CHANGES.txt
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/LICENSE.txt b/src/resources/timeline/htdocs/timeline_2.3.0/LICENSE.txt
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/LICENSE.txt
rename to src/resources/timeline/htdocs/timeline_2.3.0/LICENSE.txt
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/README.txt b/src/resources/timeline/htdocs/timeline_2.3.0/README.txt
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/README.txt
rename to src/resources/timeline/htdocs/timeline_2.3.0/README.txt
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/content/history.html b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/content/history.html
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/content/history.html
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/content/history.html
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-down.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-down.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-down.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-down.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-up.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-up.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-up.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-arrow-point-up.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-bottom.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/bubble-top.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/close-button.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/close-button.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/close-button.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/close-button.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/copy.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/copy.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/copy.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/copy.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-bottom-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/images/message-top-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/scripts/signal.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/scripts/signal.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/scripts/signal.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/scripts/signal.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-api.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-api.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-api.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-api.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-bundle.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-bundle.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-bundle.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/simile-ajax-bundle.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics-ie6.css b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics-ie6.css
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics-ie6.css
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics-ie6.css
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics.css b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics.css
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics.css
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_ajax/styles/graphics.css
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/blue-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/blue-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/blue-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/blue-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-arrow.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-arrow.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-arrow.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-arrow.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-bottom.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left-arrow.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left-arrow.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left-arrow.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left-arrow.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right-arrow.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right-arrow.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right-arrow.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right-arrow.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-arrow.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-arrow.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-arrow.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-arrow.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/bubble-top.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/close-button.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/close-button.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/close-button.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/close-button.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright-vertical.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright-vertical.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright-vertical.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright-vertical.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/copyright.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-blue-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-blue-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-blue-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-blue-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-green-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-green-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-green-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-green-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-red-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-red-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-red-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dark-red-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-blue-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-blue-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-blue-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-blue-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-green-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-green-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-green-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-green-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-red-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-red-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-red-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/dull-red-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/gray-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/gray-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/gray-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/gray-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/green-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/green-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/green-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/green-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-bottom-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-left.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-left.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-left.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-left.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-right.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-right.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-right.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/message-top-right.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/progress-running.gif b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/progress-running.gif
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/progress-running.gif
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/progress-running.gif
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/red-circle.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/red-circle.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/red-circle.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/red-circle.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/top-bubble.png b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/top-bubble.png
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/top-bubble.png
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/images/top-bubble.png
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/cs/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/de/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/en/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/es/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/fr/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/it/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/nl/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/ru/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/se/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/tr/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/vi/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/labellers.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/labellers.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/labellers.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/labellers.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/timeline.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/timeline.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/timeline.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/scripts/l10n/zh/timeline.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-api.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-api.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-api.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-api.js
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.css b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.css
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.css
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.css
diff --git a/src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.js b/src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.js
similarity index 100%
rename from src/contributions/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.js
rename to src/resources/timeline/htdocs/timeline_2.3.0/timeline_js/timeline-bundle.js
diff --git a/src/contributions/resources/timeline/resource.xml b/src/resources/timeline/resource.xml
similarity index 100%
rename from src/contributions/resources/timeline/resource.xml
rename to src/resources/timeline/resource.xml
diff --git a/src/contributions/resources/timeline/src/build/build.properties b/src/resources/timeline/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/timeline/src/build/build.properties
rename to src/resources/timeline/src/build/build.properties
diff --git a/src/contributions/resources/timeline/src/build/dependencies.xml b/src/resources/timeline/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/timeline/src/build/dependencies.xml
rename to src/resources/timeline/src/build/dependencies.xml
diff --git a/src/contributions/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java b/src/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java
similarity index 100%
rename from src/contributions/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java
rename to src/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java
diff --git a/src/contributions/resources/timeline/src/test/README b/src/resources/timeline/src/test/README
similarity index 100%
rename from src/contributions/resources/timeline/src/test/README
rename to src/resources/timeline/src/test/README
diff --git a/src/contributions/resources/timeline/src/timeline-template.xhtml b/src/resources/timeline/src/timeline-template.xhtml
similarity index 100%
rename from src/contributions/resources/timeline/src/timeline-template.xhtml
rename to src/resources/timeline/src/timeline-template.xhtml
diff --git a/src/contributions/resources/timeline/yanel-htdocs/doc/index.html b/src/resources/timeline/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/timeline/yanel-htdocs/doc/index.html
rename to src/resources/timeline/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/timeline/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/timeline/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/timeline/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/timeline/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/timeline/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/timeline/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/timeline/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/timeline/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/timeline/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/timeline/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/timeline/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/timeline/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/timeline/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/timeline/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/timeline/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/timeline/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/wiki/README.txt b/src/resources/wiki/README.txt
similarity index 100%
rename from src/contributions/resources/wiki/README.txt
rename to src/resources/wiki/README.txt
diff --git a/src/contributions/resources/wiki/build.xml b/src/resources/wiki/build.xml
similarity index 100%
rename from src/contributions/resources/wiki/build.xml
rename to src/resources/wiki/build.xml
diff --git a/src/contributions/resources/wiki/config/wikiParser.config b/src/resources/wiki/config/wikiParser.config
similarity index 100%
rename from src/contributions/resources/wiki/config/wikiParser.config
rename to src/resources/wiki/config/wikiParser.config
diff --git a/src/contributions/resources/wiki/resource.xml b/src/resources/wiki/resource.xml
similarity index 100%
rename from src/contributions/resources/wiki/resource.xml
rename to src/resources/wiki/resource.xml
diff --git a/src/contributions/resources/wiki/src/build/build.properties b/src/resources/wiki/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/wiki/src/build/build.properties
rename to src/resources/wiki/src/build/build.properties
diff --git a/src/contributions/resources/wiki/src/build/dependencies.xml b/src/resources/wiki/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/wiki/src/build/dependencies.xml
rename to src/resources/wiki/src/build/dependencies.xml
diff --git a/src/contributions/resources/wiki/src/build/pom.xml b/src/resources/wiki/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/wiki/src/build/pom.xml
rename to src/resources/wiki/src/build/pom.xml
diff --git a/src/contributions/resources/wiki/src/build/spring-wiki-config.xml b/src/resources/wiki/src/build/spring-wiki-config.xml
similarity index 100%
rename from src/contributions/resources/wiki/src/build/spring-wiki-config.xml
rename to src/resources/wiki/src/build/spring-wiki-config.xml
diff --git a/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/DataPath.java b/src/resources/wiki/src/java/org/wyona/yanel/impl/resources/DataPath.java
similarity index 100%
rename from src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/DataPath.java
rename to src/resources/wiki/src/java/org/wyona/yanel/impl/resources/DataPath.java
diff --git a/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/DefaultDataPath.java b/src/resources/wiki/src/java/org/wyona/yanel/impl/resources/DefaultDataPath.java
similarity index 100%
rename from src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/DefaultDataPath.java
rename to src/resources/wiki/src/java/org/wyona/yanel/impl/resources/DefaultDataPath.java
diff --git a/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/LinkChecker.java b/src/resources/wiki/src/java/org/wyona/yanel/impl/resources/LinkChecker.java
similarity index 100%
rename from src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/LinkChecker.java
rename to src/resources/wiki/src/java/org/wyona/yanel/impl/resources/LinkChecker.java
diff --git a/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java b/src/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
similarity index 100%
rename from src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
rename to src/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
diff --git a/src/contributions/resources/wiki/src/test/htmlunit/org/wyona/yanel/impl/resources/WikiResourceWebTest.java b/src/resources/wiki/src/test/htmlunit/org/wyona/yanel/impl/resources/WikiResourceWebTest.java
similarity index 100%
rename from src/contributions/resources/wiki/src/test/htmlunit/org/wyona/yanel/impl/resources/WikiResourceWebTest.java
rename to src/resources/wiki/src/test/htmlunit/org/wyona/yanel/impl/resources/WikiResourceWebTest.java
diff --git a/src/contributions/resources/wiki/src/test/junit/org/wyona/yanel/impl/resources/README b/src/resources/wiki/src/test/junit/org/wyona/yanel/impl/resources/README
similarity index 100%
rename from src/contributions/resources/wiki/src/test/junit/org/wyona/yanel/impl/resources/README
rename to src/resources/wiki/src/test/junit/org/wyona/yanel/impl/resources/README
diff --git a/src/contributions/resources/wiki/xslt/wiki2xhtml.xsl b/src/resources/wiki/xslt/wiki2xhtml.xsl
similarity index 100%
rename from src/contributions/resources/wiki/xslt/wiki2xhtml.xsl
rename to src/resources/wiki/xslt/wiki2xhtml.xsl
diff --git a/src/contributions/resources/wiki/yanel-htdocs/doc/index.html b/src/resources/wiki/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/wiki/yanel-htdocs/doc/index.html
rename to src/resources/wiki/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/wiki/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/wiki/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/wiki/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/wiki/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/wiki/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/wiki/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/wiki/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/wiki/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/wiki/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/wiki/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/wiki/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/wiki/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/wiki/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/wiki/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/wiki/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/wiki/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/xinha/build.xml b/src/resources/xinha/build.xml
similarity index 100%
rename from src/contributions/resources/xinha/build.xml
rename to src/resources/xinha/build.xml
diff --git a/src/contributions/resources/xinha/htdocs/.gitignore b/src/resources/xinha/htdocs/.gitignore
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/.gitignore
rename to src/resources/xinha/htdocs/.gitignore
diff --git a/src/contributions/resources/xinha/htdocs/css/xinha-resource.css b/src/resources/xinha/htdocs/css/xinha-resource.css
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/css/xinha-resource.css
rename to src/resources/xinha/htdocs/css/xinha-resource.css
diff --git a/src/contributions/resources/xinha/htdocs/js/README b/src/resources/xinha/htdocs/js/README
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/js/README
rename to src/resources/xinha/htdocs/js/README
diff --git a/src/contributions/resources/xinha/htdocs/xinha-fix.jelly b/src/resources/xinha/htdocs/xinha-fix.jelly
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/xinha-fix.jelly
rename to src/resources/xinha/htdocs/xinha-fix.jelly
diff --git a/src/contributions/resources/xinha/htdocs/xinha-status.jelly b/src/resources/xinha/htdocs/xinha-status.jelly
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/xinha-status.jelly
rename to src/resources/xinha/htdocs/xinha-status.jelly
diff --git a/src/contributions/resources/xinha/htdocs/xinha.jelly b/src/resources/xinha/htdocs/xinha.jelly
similarity index 100%
rename from src/contributions/resources/xinha/htdocs/xinha.jelly
rename to src/resources/xinha/htdocs/xinha.jelly
diff --git a/src/contributions/resources/xinha/resource.xml b/src/resources/xinha/resource.xml
similarity index 100%
rename from src/contributions/resources/xinha/resource.xml
rename to src/resources/xinha/resource.xml
diff --git a/src/contributions/resources/xinha/src/build/build.properties b/src/resources/xinha/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/xinha/src/build/build.properties
rename to src/resources/xinha/src/build/build.properties
diff --git a/src/contributions/resources/xinha/src/build/dependencies.xml b/src/resources/xinha/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/xinha/src/build/dependencies.xml
rename to src/resources/xinha/src/build/dependencies.xml
diff --git a/src/contributions/resources/xinha/src/java/org/wyona/yanel/impl/resources/xinha/XinhaResource.java b/src/resources/xinha/src/java/org/wyona/yanel/impl/resources/xinha/XinhaResource.java
similarity index 100%
rename from src/contributions/resources/xinha/src/java/org/wyona/yanel/impl/resources/xinha/XinhaResource.java
rename to src/resources/xinha/src/java/org/wyona/yanel/impl/resources/xinha/XinhaResource.java
diff --git a/src/contributions/resources/xinha/src/test/README b/src/resources/xinha/src/test/README
similarity index 100%
rename from src/contributions/resources/xinha/src/test/README
rename to src/resources/xinha/src/test/README
diff --git a/src/contributions/resources/xinha/yanel-htdocs/doc/index.html b/src/resources/xinha/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/xinha/yanel-htdocs/doc/index.html
rename to src/resources/xinha/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/xinha/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/xinha/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/xinha/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/xinha/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/xinha/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/xinha/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/xinha/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/xinha/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/xinha/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/xinha/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/xinha/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/xinha/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/xinha/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/xinha/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/xinha/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/xinha/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/yanel-user/build.xml b/src/resources/yanel-user/build.xml
similarity index 100%
rename from src/contributions/resources/yanel-user/build.xml
rename to src/resources/yanel-user/build.xml
diff --git a/src/contributions/resources/yanel-user/htdocs/yanel-user-profile.xsl b/src/resources/yanel-user/htdocs/yanel-user-profile.xsl
similarity index 100%
rename from src/contributions/resources/yanel-user/htdocs/yanel-user-profile.xsl
rename to src/resources/yanel-user/htdocs/yanel-user-profile.xsl
diff --git a/src/contributions/resources/yanel-user/resource.xml b/src/resources/yanel-user/resource.xml
similarity index 100%
rename from src/contributions/resources/yanel-user/resource.xml
rename to src/resources/yanel-user/resource.xml
diff --git a/src/contributions/resources/yanel-user/src/build/build.properties b/src/resources/yanel-user/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/yanel-user/src/build/build.properties
rename to src/resources/yanel-user/src/build/build.properties
diff --git a/src/contributions/resources/yanel-user/src/build/dependencies.xml b/src/resources/yanel-user/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/yanel-user/src/build/dependencies.xml
rename to src/resources/yanel-user/src/build/dependencies.xml
diff --git a/src/contributions/resources/yanel-user/src/build/pom.xml b/src/resources/yanel-user/src/build/pom.xml
similarity index 100%
rename from src/contributions/resources/yanel-user/src/build/pom.xml
rename to src/resources/yanel-user/src/build/pom.xml
diff --git a/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java b/src/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
similarity index 100%
rename from src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
rename to src/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
diff --git a/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java b/src/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java
similarity index 100%
rename from src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java
rename to src/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java
diff --git a/src/contributions/resources/yanel-user/src/test/htmlunit/org/wyona/yanel/impl/resources/YanelUserResourceWebTest.java b/src/resources/yanel-user/src/test/htmlunit/org/wyona/yanel/impl/resources/YanelUserResourceWebTest.java
similarity index 100%
rename from src/contributions/resources/yanel-user/src/test/htmlunit/org/wyona/yanel/impl/resources/YanelUserResourceWebTest.java
rename to src/resources/yanel-user/src/test/htmlunit/org/wyona/yanel/impl/resources/YanelUserResourceWebTest.java
diff --git a/src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl b/src/resources/yanel-user/xslt/yanel-user-profile.xsl
similarity index 100%
rename from src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl
rename to src/resources/yanel-user/xslt/yanel-user-profile.xsl
diff --git a/src/contributions/resources/yanel-user/yanel-htdocs/doc/index.html b/src/resources/yanel-user/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/yanel-user/yanel-htdocs/doc/index.html
rename to src/resources/yanel-user/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/yanel-user/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/yanel-user/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/yanel-user/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/yanel-user/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/yanel-user/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/yanel-user/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/yanel-user/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/yanel-user/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/yanel-user/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/yanel-user/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/yanel-user/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/yanel-user/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/yanel-user/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/yanel-user/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/yanel-user/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/yanel-user/yanel-htdocs/icons/scalable/rt-icon.svg
diff --git a/src/contributions/resources/zip/build.xml b/src/resources/zip/build.xml
similarity index 100%
rename from src/contributions/resources/zip/build.xml
rename to src/resources/zip/build.xml
diff --git a/src/contributions/resources/zip/resource.xml b/src/resources/zip/resource.xml
similarity index 100%
rename from src/contributions/resources/zip/resource.xml
rename to src/resources/zip/resource.xml
diff --git a/src/contributions/resources/zip/src/build/build.properties b/src/resources/zip/src/build/build.properties
similarity index 100%
rename from src/contributions/resources/zip/src/build/build.properties
rename to src/resources/zip/src/build/build.properties
diff --git a/src/contributions/resources/zip/src/build/dependencies.xml b/src/resources/zip/src/build/dependencies.xml
similarity index 100%
rename from src/contributions/resources/zip/src/build/dependencies.xml
rename to src/resources/zip/src/build/dependencies.xml
diff --git a/src/contributions/resources/zip/src/java/org/wyona/yanel/impl/resources/ZipResource.java b/src/resources/zip/src/java/org/wyona/yanel/impl/resources/ZipResource.java
similarity index 100%
rename from src/contributions/resources/zip/src/java/org/wyona/yanel/impl/resources/ZipResource.java
rename to src/resources/zip/src/java/org/wyona/yanel/impl/resources/ZipResource.java
diff --git a/src/contributions/resources/zip/yanel-htdocs/doc/index.html b/src/resources/zip/yanel-htdocs/doc/index.html
similarity index 100%
rename from src/contributions/resources/zip/yanel-htdocs/doc/index.html
rename to src/resources/zip/yanel-htdocs/doc/index.html
diff --git a/src/contributions/resources/zip/yanel-htdocs/icons/16x16/rt-icon.png b/src/resources/zip/yanel-htdocs/icons/16x16/rt-icon.png
similarity index 100%
rename from src/contributions/resources/zip/yanel-htdocs/icons/16x16/rt-icon.png
rename to src/resources/zip/yanel-htdocs/icons/16x16/rt-icon.png
diff --git a/src/contributions/resources/zip/yanel-htdocs/icons/22x22/rt-icon.png b/src/resources/zip/yanel-htdocs/icons/22x22/rt-icon.png
similarity index 100%
rename from src/contributions/resources/zip/yanel-htdocs/icons/22x22/rt-icon.png
rename to src/resources/zip/yanel-htdocs/icons/22x22/rt-icon.png
diff --git a/src/contributions/resources/zip/yanel-htdocs/icons/32x32/rt-icon.png b/src/resources/zip/yanel-htdocs/icons/32x32/rt-icon.png
similarity index 100%
rename from src/contributions/resources/zip/yanel-htdocs/icons/32x32/rt-icon.png
rename to src/resources/zip/yanel-htdocs/icons/32x32/rt-icon.png
diff --git a/src/contributions/resources/zip/yanel-htdocs/icons/scalable/rt-icon.svg b/src/resources/zip/yanel-htdocs/icons/scalable/rt-icon.svg
similarity index 100%
rename from src/contributions/resources/zip/yanel-htdocs/icons/scalable/rt-icon.svg
rename to src/resources/zip/yanel-htdocs/icons/scalable/rt-icon.svg