diff --git a/src/main/java/ch/goodsolutions/demoextension/DemoSite.java b/src/main/java/ch/goodsolutions/demoextension/DemoSite.java
deleted file mode 100644
index 5becc476fc80ec1298051c5621b42c84574e2987..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/DemoSite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/
-
-package ch.goodsolutions.demoextension;
-
-import java.util.Locale;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.layout.MainLayoutController;
-import org.olat.core.gui.control.navigation.DefaultNavElement;
-import org.olat.core.gui.control.navigation.NavElement;
-import org.olat.core.gui.control.navigation.SiteInstance;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.util.Util;
-
-import ch.goodsolutions.demoextension.controller.DemoMainLayoutController;
-/**
- * Description:<br>
- * TODO: Felix Jost Class Description for HomeSite
- * 
- * <P>
- * Initial Date:  19.07.2005 <br>
- *
- * @author Felix Jost
- */
-public class DemoSite implements SiteInstance {
-	
-	private NavElement origNavElem;
-	private NavElement curNavElem;
-	
-	
-	/**
-	 * @param loc
-	 */
-	public DemoSite(Locale loc) {
-		Translator trans = Util.createPackageTranslator(this.getClass(), loc);
-		origNavElem = new DefaultNavElement(trans.translate("site.title"), trans.translate("site.title.alt"), "site_demo_icon");			
-		curNavElem = new DefaultNavElement(origNavElem);
-	}
-
-	/**
-	 * @see org.olat.navigation.SiteInstance#getNavElement()
-	 */
-	public NavElement getNavElement() {
-		return curNavElem;
-	}
-
-	/**
-	 * @see org.olat.navigation.SiteInstance#createController(org.olat.core.gui.UserRequest, org.olat.core.gui.control.WindowControl)
-	 */
-	public MainLayoutController createController(UserRequest userRequest, final WindowControl wControl) {
-		return new DemoMainLayoutController(userRequest, wControl);
-	}
-
-	/**
-	 * @see org.olat.navigation.SiteInstance#isKeepState()
-	 */
-	public boolean isKeepState() {
-		return true;
-	}
-	
-	/**
-	 * @see org.olat.navigation.SiteInstance#reset()
-	 */
-	public void reset() {
-		curNavElem = new DefaultNavElement(origNavElem);
-	}
-
-}
-
diff --git a/src/main/java/ch/goodsolutions/demoextension/DemoSiteDef.java b/src/main/java/ch/goodsolutions/demoextension/DemoSiteDef.java
deleted file mode 100644
index a4b444177f64b394e261b4b12eb3ad5e147d594d..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/DemoSiteDef.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/
-
-package ch.goodsolutions.demoextension;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.navigation.AbstractSiteDefinition;
-import org.olat.core.gui.control.navigation.SiteDefinition;
-import org.olat.core.gui.control.navigation.SiteInstance;
-
-/**
- * 
- * Description:<br>
- * Simple Site Def that calls our DemoSite
- * 
- * <P>
- * Initial Date:  12.07.2005 <br>
- *
- * @author Felix Jost
- */
-public class DemoSiteDef extends AbstractSiteDefinition implements SiteDefinition {
-
-	/**
-	 * 
-	 */
-	public DemoSiteDef() {
-		//
-	}
-
-	/**
-	 * @see org.olat.navigation.SiteDefinition#createSite(org.olat.core.gui.UserRequest, org.olat.core.gui.control.WindowControl)
-	 */
-	public SiteInstance createSite(UserRequest ureq, WindowControl wControl) {
-		// create the site for all users except for guests
-		if (ureq.getUserSession().getRoles().isGuestOnly()) return null;
-		return new DemoSite(ureq.getLocale());
-	}
-
-}
-
diff --git a/src/main/java/ch/goodsolutions/demoextension/RamPreferences.java b/src/main/java/ch/goodsolutions/demoextension/RamPreferences.java
deleted file mode 100644
index 2b95c010ea31e1e4f3c5a35da396b12dd82ced4c..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/RamPreferences.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * OLAT - Online Learning and Training<br>
- * http://www.olat.org
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS,
- * <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
- * University of Zurich, Switzerland.
- * <p>
- */
-package ch.goodsolutions.demoextension;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.olat.core.util.prefs.Preferences;
-
-/**
- * Description:<br>
- * TODO: Felix Class Description for RamPreferences
- * 
- * <P>
- * Initial Date:  13.10.2006 <br>
- * @author Felix
- */
-public class RamPreferences implements Preferences {
-	private Map store = new HashMap();
-	
-	
-	/**
-	 * @see org.olat.core.util.prefs.Preferences#get(java.lang.Class, java.lang.String)
-	 */
-	public Object get(Class attributedClass, String key) {
-		return store.get(getCompoundKey(attributedClass, key));
-	}
-	
-	/**
-	 * @see org.olat.core.util.prefs.Preferences#get(java.lang.Class, java.lang.String, java.lang.Object)
-	 */
-	public Object get(Class attributedClass, String key, Object defaultValue) {
-		Object value = get(attributedClass, key);
-		if (value == null) return defaultValue;
-		return value;
-	}
-
-	/**
-	 * @see org.olat.core.util.prefs.Preferences#put(java.lang.Class, java.lang.String, java.lang.Object)
-	 */
-	public void put(Class attributedClass, String key, Object value) {
-		store.put(getCompoundKey(attributedClass, key), value);
-	}
-
-	/**
-	 * @see org.olat.core.util.prefs.Preferences#putAndSave(java.lang.Class, java.lang.String, java.lang.Object)
-	 */
-	public void putAndSave(Class attributedClass, String key, Object value) {
-		put(attributedClass, key, value);
-		save();
-
-	}
-
-	/**
-	 * @see org.olat.core.util.prefs.Preferences#save()
-	 */
-	public void save() {
-		// nothing to do for ram
-
-	}
-	
-	private String getCompoundKey(Class attributedClass, String key) {
-		return attributedClass.getName()+":"+key;
-	}
-	
-	/**
-	 * 
-	 * @see org.olat.core.util.prefs.Preferences#findPrefByKey(java.lang.String)
-	 */
-	public Object findPrefByKey(String partOfKey) {
-		for (Iterator iterator = store.keySet().iterator(); iterator.hasNext();) {
-			String key = (String) iterator.next();
-			if (key.endsWith(partOfKey)) return store.get(key);
-		}
-		return null;
-	}
-
-}
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ar.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ar.properties
deleted file mode 100644
index dce12c64a2307668519d8c3792eb3121aab91822..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ar.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Feb 24 10:19:17 CET 2010
-homemaincontroller.actiontext=\u062A\u0648\u0636\u064A\u062D \u0627\u0645\u062A\u062F\u0627\u062F \u0627\u0644\u0642\u0627\u0626\u0645\u0629
-homemaincontroller.description=\u0648\u0635\u0641 \u0627\u0644\u0631\u0627\u0628\u0637...
-site.title=\u062A\u0648\u0636\u064A\u062D \u0627\u0644\u0645\u0648\u0642\u0639
-site.title.alt=\u0647\u0630\u0627 \u0645\u0648\u0642\u0639 \u062A\u062C\u0631\u064A\u0628\u064A \u062D\u0633\u0628 \u0627\u0644\u0627\u0645\u062A\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_bg.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_bg.properties
deleted file mode 100644
index 34d43e112cbd375fa6abcd9ba15510ddb9a68538..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_bg.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue May 26 18:42:11 CEST 2009
-homemaincontroller.actiontext=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0430\u0446\u0438\u044F \u043D\u0430 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u0435\u0442\u043E \u043D\u0430 \u043C\u0435\u043D\u044E
-homemaincontroller.description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u043D\u0430 \u0432\u0440\u044A\u0437\u043A\u0430\u0442\u0430...
-site.title=\u0421\u0430\u0439\u0442 \u0437\u0430 \u0434\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0430\u0446\u0438\u044F
-site.title.alt=\u0422\u043E\u0432\u0430 \u0435 \u0441\u0430\u0439\u0442 \u0437\u0430 \u0434\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0430\u0446\u0438\u044F \u043E\u0442\u043D\u043E\u0441\u043D\u043E \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u0438 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_cs.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_cs.properties
deleted file mode 100644
index a487e689384ef4a897af81de879764523017b7cb..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_cs.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:13 CET 2009
-homemaincontroller.actiontext=Uk\u00E1zka menu roz\u0161\u00ED\u0159en\u00ED
-homemaincontroller.description=Popis odkazu...
-site.title=P\u0159edv\u00E1d\u011Bc\u00ED str\u00E1nka
-site.title.alt=Tato je p\u0159edv\u00E1d\u011Bc\u00ED str\u00E1nka t\u00FDkaj\u00EDc\u00ED se dal\u0161\u00EDch roz\u0161\u00ED\u0159en\u00ED
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_da.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_da.properties
deleted file mode 100644
index be8323fabe9ccf5806137b735fb6b16f778dcae7..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_da.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:08 CET 2009
-homemaincontroller.actiontext=Demonstration af menuudvidelsen
-homemaincontroller.description=Beskrivelse af link...
-site.title=Demonstrationssiden
-site.title.alt=Dette er en demonstrationsside for mulige udvidelser
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_de.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_de.properties
deleted file mode 100644
index 29ef4836e8f882eee28b45303aa7ca4cac1ad845..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 02 09:54:03 CET 2009
-site.title=Demonstrations-Site
-site.title.alt=Dies ist eine Demosite f\u00FCr die Extensions
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_el.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_el.properties
deleted file mode 100644
index c9b57c66d07341d071e2ab858b1f0180bdd79bb9..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_el.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:14 CET 2009
-homemaincontroller.actiontext=\u0395\u03C0\u03AF\u03B4\u03B5\u03B9\u03BE\u03B7 \u03C4\u03B7\u03C2 \u03B5\u03C0\u03AD\u03BA\u03C4\u03B1\u03C3\u03B7\u03C2 \u03BC\u03B5\u03BD\u03BF\u03CD
-homemaincontroller.description=\u0395\u03C0\u03AF\u03B4\u03B5\u03B9\u03BE\u03B7 \u03C4\u03BF\u03C5 \u03C3\u03C5\u03BD\u03B4\u03AD\u03C3\u03BC\u03BF\u03C5...
-site.title=\u0399\u03C3\u03C4\u03BF\u03C7\u03CE\u03C1\u03BF\u03C2 \u03B5\u03C0\u03AF\u03B4\u03B5\u03B9\u03BE\u03B7\u03C2
-site.title.alt=\u0399\u03C3\u03C4\u03BF\u03C7\u03CE\u03C1\u03BF\u03C2 \u03B5\u03C0\u03AF\u03B4\u03B5\u03B9\u03BE\u03B7\u03C2 \u03C3\u03C7\u03B5\u03C4\u03B9\u03BA\u03AC \u03BC\u03B5 \u03C4\u03B9\u03C2 \u03B5\u03C0\u03B5\u03BA\u03C4\u03AC\u03C3\u03B5\u03B9\u03C2 
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_en.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_en.properties
deleted file mode 100644
index f389e35ee67692f5ff3739a01da5bf9aafb139d9..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 02 09:54:17 CET 2009
-site.title=Demonstration site
-site.title.alt=This is a demonstration site regarding possible extensions 
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_es.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_es.properties
deleted file mode 100644
index f5ed7f517df4f75caf70868f9c88788fe2d80dc5..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_es.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:20 CET 2009
-homemaincontroller.actiontext=Demostraci\u00F3n de los extensiones del menu
-homemaincontroller.description=Descripci\u00F3n del enlace...
-site.title=Semostraci\u00F3n
-site.title.alt=Est\u00E1 es una demostraci\u00F3n de los extensiones.
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fa.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fa.properties
deleted file mode 100644
index be8f19f585953e2c74297ac97559a6876e0feef2..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fa.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:12 CET 2009
-homemaincontroller.actiontext=Demo menu extension
-homemaincontroller.description=Description of the demo extension link
-site.title=\u0646\u0645\u0648\u0646\u0647 \u0633\u0627\u06CC\u062A
-site.title.alt=\u0627\u06CC\u0646 \u06CC\u06A9 \u0646\u0645\u0648\u0646\u0647 \u0633\u0627\u06CC\u062A \u0628\u0631\u0627\u06CC \u0646\u0631\u0645 \u0627\u0641\u0632\u0627\u0631 \u0633\u06CC\u0633\u062A\u0645 \u0645\u062F\u06CC\u0631\u06CC\u062A \u0622\u0645\u0648\u0632\u0634\u06CC \u0627\u0633\u062A
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fr.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fr.properties
deleted file mode 100644
index 46abd99757dfad64fc815cf2a73c537c2248608d..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_fr.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:07 CET 2009
-homemaincontroller.actiontext=D\u00E9mo Menu Extension
-homemaincontroller.description=Description du lien...
-site.title=Page de d\u00E9monstration
-site.title.alt=Ceci est une page de d\u00E9monstration pour les extensions
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_it.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_it.properties
deleted file mode 100644
index da3d26b5cd79381a19e9c8d7899bf5c07017d26b..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_it.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:09 CET 2009
-homemaincontroller.actiontext=Dimostrazione menu estensione
-homemaincontroller.description=Descrizione del link...
-site.title=Pagina dimostrativa
-site.title.alt=Questa \u00E8 una pagina dimostrativa per le estensioni
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_jp.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_jp.properties
deleted file mode 100644
index 11d0d02dc347e83c4b76e37229eb887f447a9c00..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_jp.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 25 20:18:34 CET 2010
-homemaincontroller.actiontext=\u30E1\u30CB\u30E5\u30FC\u62E1\u5F35\u306E\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3
-homemaincontroller.description=\u30EA\u30F3\u30AF\u306E\u8AAC\u660E ...
-site.title=\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u30B5\u30A4\u30C8
-site.title.alt=\u3053\u308C\u306F\u3001\u5229\u7528\u53EF\u80FD\u306A\u62E1\u5F35\u6A5F\u80FD\u306B\u95A2\u3059\u308B\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u30B5\u30A4\u30C8\u3067\u3059\u3002
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ko.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ko.properties
deleted file mode 100644
index fc51a1eb0f7cfb540284784378cfca9e8ad97864..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ko.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Jul 31 17:06:44 CEST 2009
-homemaincontroller.actiontext=\uBA54\uB274 \uD655\uC7A5 \uB370\uBAA8
-homemaincontroller.description=\uB9C1\uD06C \uC124\uBA85...
-site.title=\uB370\uBAA8 \uC0AC\uC774\uD2B8
-site.title.alt=\uC774 \uC0AC\uC774\uD2B8\uB294 \uD655\uC7A5\uAE30\uB2A5\uC744 \uC704\uD55C \uB370\uBAA8\uC0AC\uC774\uD2B8\uC785\uB2C8\uB2E4.
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_lt.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_lt.properties
deleted file mode 100644
index f3d0928eba92da99fdf69ed2b9869bad227b05dd..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_lt.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:01 CET 2009
-homemaincontroller.actiontext=Meniu pl\u0117tini\u0173 demonstravimas
-homemaincontroller.description=Nuorodos apra\u0161ymas...
-site.title=Demonstracinis tinklalapis
-site.title.alt=\u0160is tinklalapis demonstruoja pl\u0117tinius
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_nl_NL.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_nl_NL.properties
deleted file mode 100644
index 21399df9d7ba7042d21ee63d30490cb6d8a5113b..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_nl_NL.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Sep 08 16:42:42 CEST 2011
-site.title=Demonstratie site
-site.title.alt=Dit is een demonstratie site betreffende mogelijke extensies
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pl.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index 070f091372c7d5deffd9ef2e910b710fc1dee2b7..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:16 CET 2009
-homemaincontroller.actiontext=Demonstracja rozszerze\u0144 menu
-homemaincontroller.description=Opis linku...
-site.title=Strona demo
-site.title.alt=To jest strona demo o mo\u017Cliwych rozszerzeniach
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_BR.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_BR.properties
deleted file mode 100644
index d5bfb7fd540048927342e2a3c3fb1dc2cb4c0468..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_BR.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:53:59 CET 2009
-homemaincontroller.actiontext=Demonstra\u00E7\u00E3o do menu extens\u00E3o
-homemaincontroller.description=Descri\u00E7\u00E3o do link de demonstra\u00E7\u00E3o de extens\u00E3o
-site.title=Site de Demonstra\u00E7\u00E3o
-site.title.alt=Este \u00E9 um site de demonstra\u00E7\u00E3o para extension framework
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_PT.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_PT.properties
deleted file mode 100644
index aabbe88af625803224d623343faeff195799083c..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_pt_PT.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:04 CET 2009
-homemaincontroller.actiontext=Demonstra\u00E7\u00E3o do menu extens\u00E3o
-homemaincontroller.description=Descri\u00E7\u00E3o do link de demonstra\u00E7\u00E3o de extens\u00E3o
-site.title=Site de Demonstra\u00E7\u00E3o
-site.title.alt=Este \u00E9 um site de demonstra\u00E7\u00E3o para extension framework
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ru.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ru.properties
deleted file mode 100644
index d5aa86b0375ba55d27b2970b0ad04d2854558995..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_ru.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:18 CET 2009
-homemaincontroller.actiontext=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 \u0434\u0435\u043C\u043E-\u043C\u0435\u043D\u044E
-homemaincontroller.description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438 ...
-site.title=\u0414\u0435\u043C\u043E-\u0441\u0430\u0439\u0442
-site.title.alt=\u042D\u0442\u043E \u0434\u0435\u043C\u043E-\u0441\u0430\u0439\u0442 \u0434\u043B\u044F \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0439
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_sq.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_sq.properties
deleted file mode 100644
index 2460b0ad4eaa25bce2db4607e3288b09383b1dad..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_sq.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:11 CET 2009
-homemaincontroller.actiontext=Demostrim i shtojc\u00EBs s\u00EB menys\u00EB
-homemaincontroller.description=P\u00EBrshkrimi i vjeg\u00EBz\u00EBs
-site.title=Vend demostrimi
-site.title.alt=Kjo \u00EBsht\u00EB nj\u00EB vend demostrimi q\u00EB ka t\u00EB b\u00EBj\u00EB me zgjerimet e mundshme
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_tr.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_tr.properties
deleted file mode 100644
index dad07186e582a9141eec5439dfa4d2b8fa6622f5..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_tr.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:53:58 CET 2009
-homemaincontroller.actiontext=Men\u00FC uzant\u0131lar\u0131 g\u00F6sterisi
-homemaincontroller.description=Ba\u011F\u0131n tan\u0131m\u0131...
-site.title=G\u00F6steri sitesi
-site.title.alt=Bu, muhtemel uzant\u0131lar\u0131 dikkate alan bir g\u00F6steri sitesidir
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_vi.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_vi.properties
deleted file mode 100644
index 292c8cd8dca4bcb21c7212b6b8aba6414ae3c615..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_vi.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:53:58 CET 2009
-homemaincontroller.actiontext=S\u1EF1 m\u00F4 t\u1EA3 c\u1EE7a vi\u1EC7c m\u1EDF r\u1ED9ng th\u1EF1c \u0111\u01A1n
-homemaincontroller.description=S\u1EF1 m\u00F4 t\u1EA3 c\u1EE7a \u0111\u01B0\u1EDDng li\u00EAn k\u1EBFt...
-site.title=Trang m\u00F4 t\u1EA3
-site.title.alt=\u0110\u00E2y l\u00E0 m\u1ED9t trang m\u00F4 t\u1EA3 c\u00F3 li\u00EAn quan \u0111\u1EBFn c\u00E1c m\u1EDF r\u1ED9ng c\u00F3 th\u1EC3
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_CN.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_CN.properties
deleted file mode 100644
index 0ed2062d40d398f00121bc13c034779721b031c2..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_CN.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:02 CET 2009
-homemaincontroller.actiontext=\u83DC\u5355\u6269\u5C55\u6F14\u793A
-homemaincontroller.description=\u6269\u5C55\u94FE\u63A5\u6F14\u793A
-site.title=\u6F14\u793A\u7AD9\u70B9
-site.title.alt=\u672C\u7AD9\u4E3A\u6269\u5C55\u6846\u67B6\u7684\u6F14\u793A\u7AD9\u70B9
diff --git a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_TW.properties b/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_TW.properties
deleted file mode 100644
index 83d727fafe22e5a14cae0200933da22127860af5..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_i18n/LocalStrings_zh_TW.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 02 09:54:05 CET 2009
-homemaincontroller.actiontext=\u529F\u80FD\u8868\u64F4\u5C55\u793A\u7BC4
-homemaincontroller.description=\u9023\u7D50\u7684\u8AAA\u660E...
-site.title=\u793A\u7BC4\u7AD9\u53F0
-site.title.alt=\u9019\u662F\u4E00\u500B\u95DC\u65BC\u53EF\u80FD\u7684\u64F4\u5C55\u7684\u793A\u7BC4\u7AD9\u53F0
diff --git a/src/main/java/ch/goodsolutions/demoextension/_spring/demoContext.xml b/src/main/java/ch/goodsolutions/demoextension/_spring/demoContext.xml
deleted file mode 100644
index ca850825dc07b2362789b2bfd6f077554d56c0fd..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/_spring/demoContext.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context" 
-	xsi:schemaLocation="
-  http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd 
-  http://www.springframework.org/schema/context 
-  http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-  
-<!-- 
-	OLAT extensions are searched on the whole classpath by spring startup and are enabled by default. 
-	Spring searches for alles files with name "xyzContext.xml" (Context with capital C).
-	To keep your extensions outside the war file place them in tomcat/lib directory which is part of the java classpath.
--->
-
-<!-- Locations that implement action extensions are: SystemAdminMainController, HomeMainController, ArchiverMaincontroller -->
-
-<!-- this extension will show up in the menu tree of the home screen after login -->
-<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
-	<property name="actionController">	
-		<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
-			<property name="className" value="ch.goodsolutions.demoextension.controller.DemoController"/>
-		</bean>
-	</property>
-	<property name="i18nActionKey" value="democontroller.actiontext"/>
-	<property name="i18nDescriptionKey" value="democontroller.description"/>
-	<property name="extensionPoints">
-		<list>	
-			<value>org.olat.home.HomeMainController</value>
-			<value>ch.goodsolutions.demoextension.controller.DemoMainLayoutController</value>
-		</list>
-	</property>
-	<property name="order" value="101" />
-	<property name="enabled" value="false" />
-</bean>
-
-
-<!-- 
-	A site def will result in a tab on the OLAT top navigation. 
-	The order value can be used to position your tab where you want it.
--->  
-<bean id="olatsites_demo" class="ch.goodsolutions.demoextension.DemoSiteDef" scope="prototype" >
-   <property name="order" value="300" />
-   <property name="enabled" value="false"/>
-</bean>
-
-</beans>
\ No newline at end of file
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/DemoController.java b/src/main/java/ch/goodsolutions/demoextension/controller/DemoController.java
deleted file mode 100644
index c67734695bde1a26908f040314fff0f4d4b984ad..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/DemoController.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/
-
-package ch.goodsolutions.demoextension.controller;
-
-import org.olat.admin.user.UserSearchController;
-import org.olat.basesecurity.events.SingleIdentityChosenEvent;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.htmlheader.jscss.JSAndCSSComponent;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
-import org.olat.core.gui.control.generic.modal.DialogBoxController;
-import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
-import org.olat.core.id.Identity;
-import org.olat.core.id.User;
-import org.olat.core.id.UserConstants;
-import org.olat.user.HomePageConfig;
-import org.olat.user.HomePageConfigManagerImpl;
-import org.olat.user.HomePageDisplayController;
-
-/**
- * Description:<br>
- * Demo for a simple extension using some of the provided functionality of OLAT
- * and the component framework. The demo extension shows how to generate a simple form, user
- * can fill in. It also shows how to listen to events (e.g. user request
- * generated by clicking in the browser on a link or a button). Further is shows
- * how to use and react onto events generated by other controller used in this
- * example.
- * 
- * @author Felix Jost, Initial Date: Jul 13, 2005
- */
-public class DemoController extends BasicController {
-	
-	private VelocityContainer myContent;
-	private DialogBoxController dialogC;
-	private UserSearchController searchC;
-	private HomePageDisplayController homepageC;
-	private Panel homepagePanel;
-	private Link modalButton;
-	private Link searchButton;
-	private Link iconButton;
-	private SampleFlexiForm sampleFlexiForm;
-	private CloseableModalController cmc;
-	
-	/**
-	 * @param ureq
-	 * @param wControl
-	 * @param navElem
-	 */
-	public DemoController(UserRequest ureq, WindowControl wControl) {
-		//it is mandatory to set the WindowControl to the superclass
-		super(ureq, wControl);
-		
-		// set up the main layout
-		myContent = createVelocityContainer("index");
-		
-		modalButton = LinkFactory.createButton("command.modal", myContent, this);
-		searchButton = LinkFactory.createButton("command.search", myContent, this);
-		
-		iconButton = LinkFactory.createCustomLink("sonne", "cmd.sonne", "", Link.NONTRANSLATED, myContent, this);
-		iconButton.setCustomEnabledLinkCSS("demoext_bild");
-		iconButton.setCustomDisabledLinkCSS("demoext_bild");
-		
-		// let the scripts (.js files) and css files be included when this controller's main component is rendered
-		JSAndCSSComponent jscss = new JSAndCSSComponent("jsAndCssForDemo", this.getClass(), new String[] {"script.js"}, "style.css", false);
-		myContent.put("jsAndCssForDemo", jscss); // we include it in the render tree, so that the custom js and css are included
-		
-		// prepare an empty panel for displaying the selected user's home-page
-		homepagePanel = new Panel("hpPanel");
-		myContent.put("homepagepanel", homepagePanel);
-		
-
-		sampleFlexiForm = new SampleFlexiForm(ureq, getWindowControl());
-		listenTo(sampleFlexiForm);
-		// listenTo is the convenience method and ensures that the dispose chain
-		// is guaranteed -> see doPreDispose of BasicController
-		myContent.put("sampleform", sampleFlexiForm.getInitialComponent());
-		
-		// lookup the current user info to display a personalized welcome message
-		Identity curIdentity = ureq.getIdentity();
-		User curUser = curIdentity.getUser();
-		String userinfo = (curUser==null? "n/a" :getTranslator().translate("show.entered.data", new String[] { curUser.getProperty(UserConstants.LASTNAME, ureq.getLocale()), curUser.getProperty(UserConstants.FIRSTNAME, ureq.getLocale())}));
-		// simple variable that can be referred in the velocity context by
-		// "$userinfo"
-		myContent.contextPut("userinfo", userinfo);
-
-		putInitialPanel(myContent);
-	}
-
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
-	 */
-	public void event(UserRequest ureq, Component source, Event event) {
-		
-		if (source == myContent) {
-			if (event.getCommand().equals("doThis")) {
-				//do something here 
-				if(getLogger().isDebug()){
-					logDebug("link clicked, log something to the olat.log file", null);
-				}
-			}
-			
-		} else if (source == modalButton || source == iconButton){
-			// The button "Click here for a modal dialog" was clicked
-			// create a Ok/Cancel confirmation dialog and let the user answer the
-			// question
-			dialogC = activateOkCancelDialog(ureq, null, translate("question"), dialogC);
-			
-		} else if (source == searchButton){
-			// the user clicked the search button.
-			// Create a UserSearchController and display it in a modal dialogue box
-			searchC = new UserSearchController(ureq, getWindowControl(), true);
-			listenTo(searchC);
-			
-			//show it in the deprecated manner for now: TODO
-			cmc = new CloseableModalController(
-					getWindowControl(),
-					translate("close"),
-					searchC.getInitialComponent()
-			);
-			// listen to changes from cmc, e.g. "CLOSE_MODAL_EVENT"
-			listenTo(cmc);
-			
-			//needs activate() to "open" and deactivate() to "close"
-			cmc.activate();
-		}
-	}
-
-	protected void event(UserRequest ureq, Controller source, Event event) {
-		if (source == dialogC) {
-			// there is an answer concerning the dialog
-			if (DialogBoxUIFactory.isOkEvent(event)) {
-				showError("clicked.ok");
-			} else if (DialogBoxUIFactory.isClosedEvent(event)) {
-				showInfo("clicked.close");
-			} else {
-				showInfo("clicked.cancel"); // nothing else left
-			}
-			
-		} else if (source == searchC) {
-			// it is the UserSearchController talking to us
-			if (event instanceof SingleIdentityChosenEvent) {
-				// some user was chosen
-				// (UserSearchController's javadoc shows when which event is fired)
-				SingleIdentityChosenEvent uce = (SingleIdentityChosenEvent) event;
-
-				// prepare the homepage configuration for this user
-				Identity identity = uce.getChosenIdentity();
-				HomePageConfig homePageConfig = HomePageConfigManagerImpl.getInstance().loadConfigFor(
-						identity.getName()
-				);
-
-				// create the controller with this configuration
-				homepageC = new HomePageDisplayController(ureq, getWindowControl(), homePageConfig);
-				listenTo(homepageC);
-				// insert the homepage in the area below the button (for layout, see the
-				// index.html file in the "content" subfolder
-				homepagePanel.setContent(homepageC.getInitialComponent());
-			} // else ignore other events (e.g. Event.CANCELLED_EVENT)
-	
-			//to "close" the modal dialogue
-			cmc.deactivate();
-			
-			//cmc was added using listenTo(), so it can be removed like this:
-			removeAsListenerAndDispose(cmc);
-			cmc = null;
-			//but it would have been disposed automatically anyway
-			
-		} else if (source == cmc && event.getCommand().equals("CLOSE_MODAL_EVENT")) {
-			
-			showInfo("clicked.close");
-			
-		} else if (source == sampleFlexiForm) {
-			
-			if (event == Event.DONE_EVENT) {
-				String last = sampleFlexiForm.getLastName();
-				String first = sampleFlexiForm.getFirstName();
-				//the special key "placeholder" can be used for strings which
-				//do not need translation or for strings which are already translated.
-				showInfo("placeholder", translate("show.entered.data", new String[]{last,first}));
-			}
-		}
-	}
-	
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
-	 */
-	protected void doDispose() {	
-		//no need to dispose any controller because each one was
-		//registered for cleanup in listenTo(controller)
-		
-		//no other stuff to clean up
-	}
-}
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/DemoMainLayoutController.java b/src/main/java/ch/goodsolutions/demoextension/controller/DemoMainLayoutController.java
deleted file mode 100644
index 3c71464b12ff2e2f30a37df3b5f78c91752a5f9c..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/DemoMainLayoutController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/
-
-package ch.goodsolutions.demoextension.controller;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.layout.GenericMainController;
-
-/**
- * 
- * Description:<br>
- * TODO: guido Class Description for DemoMainLayoutContorller
- * 
- * <P>
- * Initial Date:  20.12.2010 <br>
- * @author guido
- */
-public class DemoMainLayoutController extends GenericMainController {
-
-	public DemoMainLayoutController(UserRequest ureq, WindowControl wControl) {
-		super(ureq, wControl);
-		
-		init(ureq);
-	}
-
-	@Override
-	protected Controller handleOwnMenuTreeEvent(Object uobject, UserRequest ureq) {
-		return null;
-	}
-
-}
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/SampleFlexiForm.java b/src/main/java/ch/goodsolutions/demoextension/controller/SampleFlexiForm.java
deleted file mode 100644
index a8372f21099597ea8f9c59427d994d3e231ae427..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/SampleFlexiForm.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/
-package ch.goodsolutions.demoextension.controller;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.TextElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-
-/**
- * Description:<br>
- * TODO: matthai Class Description for SampleFlexiForm
- * 
- * <P>
- * Initial Date:  Nov 24, 2009 <br>
- * @author matthai
- */
-class SampleFlexiForm extends FormBasicController {
-
-	private TextElement lastName;
-	private TextElement firstName;
-
-	public SampleFlexiForm(UserRequest ureq, WindowControl wControl) {
-		super(ureq, wControl);
-		//do data preparation stuff here, which is then used for the elements in the init method.
-		
-		initForm(ureq); //as the last thing always call this init method
-	}
-
-	/**
-	 * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#formOK(org.olat.core.gui.UserRequest)
-	 */
-	@Override
-	protected void formOK(UserRequest ureq) {
-		fireEvent(ureq, Event.DONE_EVENT);
-	}
-	
-	@Override
-	protected boolean validateFormLogic (UserRequest ureq) {
-		//only text fields, not much to validate
-		return true;
-	}
-
-	/**
-	 * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#initForm(org.olat.core.gui.components.form.flexible.FormItemContainer, org.olat.core.gui.control.Controller, org.olat.core.gui.UserRequest)
-	 */
-	@Override
-	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-
-		//Formular title and description i18nified.
-		setFormTitle("form.title");
-		setFormDescription("form.descr");
-		
-		// add a few TextElement fields to the form layout
-		lastName = uifactory.addTextElement("lastname", "search.form.last", 256, "", formLayout);
-		lastName.setNotEmptyCheck("error.lastname.mandatory");
-		lastName.setMandatory(true);
-		
-		firstName = uifactory.addTextElement("firstname", "search.form.first", 256, "", formLayout);
-		firstName.setNotEmptyCheck("error.firstname.mandatory");
-		firstName.setMandatory(true);
-		
-		//create a new layout to group the buttons of the form
-		FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttonGroupLayout", getTranslator());
-		formLayout.add(buttonGroupLayout);
-		
-		//now add the buttons into their new  group layout
-		uifactory.addFormSubmitButton("submit", buttonGroupLayout);
-		uifactory.addFormCancelButton("cancel", buttonGroupLayout, ureq, getWindowControl());
-	}
-
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#doDispose()
-	 */
-	@Override
-	protected void doDispose() {
-		// nothing to do
-	}
-	
-	protected String getLastName(){
-		return lastName.getValue();
-	}
-	
-	protected String getFirstName(){
-		return firstName.getValue();
-	}	
-}
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_content/index.html b/src/main/java/ch/goodsolutions/demoextension/controller/_content/index.html
deleted file mode 100644
index 1106307ad364b8e6d678232816f971277b92f762..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_content/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-## this line is a velocity comment
-## see http://jakarta.apache.org/velocity/docs/vtl-reference-guide.html for a complete guide to the velocity template language
-##
-##
-<h4>$r.translate("title")</h4>
-$userinfo
-<br>
-<br>
-## offer a button here
-$r.render("command.modal")
-<br>
-<br>
-## offer an image as a link
-$r.render("sonne")
-<br>
-<br>
-<br>
-$r.translate("js.demo.desc")<br>
-<a href="javascript:ch_goodsolutions_demoextension_controller.afunction('$r.translateInAttribute("js.demo.msg")')">
-$r.translate("click.for.jsdemo")
-</a>
-<br>
-<br>
-## another button here
-$r.render("command.search") &nbsp;&nbsp; $r.translate("infomsg")
-<br><br><br>
-## below is the panel for the homepage of the chosen user (emtpy in the beginning)
-$r.render("homepagepanel")
-<br><br>
-## render a sample form here
-## $r 
-$r.render("sampleform")
-
-
-
-
-
-
-
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ar.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ar.properties
deleted file mode 100644
index 8a3cd7af323596fa5a47aef848a85b840b3dcb93..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ar.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#Wed Feb 24 10:19:36 CET 2010
-click.for.jsdemo=\u0631\u0627\u0628\u0637 \u062C\u0627\u0641\u0627 \u0633\u0643\u0631\u064A\u0628\u062A
-clicked.cancel=\u062A\u0645 \u0625\u0644\u063A\u0627\u0626\u0647\u0627
-clicked.close=\u062A\u0645 \u0625\u063A\u0644\u0627\u0642\u0647\u0627
-clicked.ok=\u0644\u0627 \u064A\u0648\u062C\u062F \u062E\u0637\u0623\u060C \u0648\u0644\u064A\u0633\u062A \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u062A\u0645 \u062D\u0630\u0641\u0647\u0627 \u0628\u0627\u0644\u0643\u0627\u0645\u0644.
-command.modal=\u0646\u0645\u0648\u0630\u062C \u062D\u0648\u0627\u0631
-command.search=\u0628\u062D\u062B \u0639\u0646 \u0645\u0633\u062A\u062E\u062F\u0645 - \u0641\u0642\u0637 \u0641\u0649 \u0627\u0644\u0648\u0636\u0639 \u0627\u0644\u0643\u0627\u0645\u0644
-error.firstname.mandatory=\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0644 \u0636\u0631\u0648\u0631\u0649
-error.lastname.mandatory=\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u062E\u064A\u0631 \u0636\u0631\u0648\u0631\u0649
-form.descr=\:\u064A\u0631\u062C\u0649 \u0643\u062A\u0627\u0628\u0629 \u0628\u064A\u0627\u0646\u0627\u062A\u0643
-form.title=\u0627\u0644\u0646\u0645\u0648\u0630\u062C
-infomsg="test" \u0623\u0648 "administrator" \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\: \u0627\u0643\u062A\u0628
-js.demo.desc=\u0631\u0627\u0628\u0637 \u0644\u0648\u0638\u064A\u0641\u0629 \u062C\u0627\u0641\u0627 \u0633\u0643\u0631\u064A\u0628\u062A
-js.demo.msg=\!\u0623\u0647\u0644\u0627 \u0623\u0647\u0644\u0627
-question=\u0623\u0646\u062A \u0644\u0627 \u062A\u0631\u064A\u062F \u0641\u0639\u0644\u0627\u064B \u062D\u0630\u0641 \u0643\u0644 \u0627\u0644\u0645\u0644\u0641\u0627\u062A\u061F \u061B)
-search.form.first=\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u0648\u0644
-search.form.last=\u0627\u0644\u0627\u0633\u0645 \u0627\u0644\u0623\u062E\u064A\u0631
-searchusertitle=\u0627\u0644\u0628\u062D\u062B \u0639\u0646 \u0645\u0633\u062A\u062E\u062F\u0645 \u0644\u0639\u0631\u0636 \u0635\u0641\u062D\u062A\u0647 \u0627\u0644\u0634\u062E\u0635\u064A\u0629.
-show.entered.data={1} \u0627\u0633\u0645\u0643 \u0627\u0644\u0623\u062E\u064A\u0631 \u0647\u0648 {0} \u0648\u0627\u0644\u0623\u0648\u0644
-title=\u0645\u0631\u062D\u0628\u0627\u064B \u0628\u0643 \u0641\u064A \u0635\u0641\u062D\u0629 \u0627\u0644\u062A\u0648\u0636\u064A\u062D\u0627\u062A
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_bg.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_bg.properties
deleted file mode 100644
index 2ba6ec2acb95481ae5e845189fb47a15d49e42be..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_bg.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue May 26 18:43:44 CEST 2009
-command.modal=\u041C\u043E\u0434\u0430\u043B\u0435\u043D \u0434\u0438\u0430\u043B\u043E\u0433
-command.search=\u0422\u044A\u0440\u0441\u0435\u043D\u0435 \u043D\u0430 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B
-error.firstname.mandatory=\u0418\u043C\u0435\u0442\u043E \u0435 \u0437\u0430\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E
-error.lastname.mandatory=\u0424\u0430\u043C\u0438\u043B\u0438\u044F\u0442\u0430 \u0435 \u0437\u0430\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u0430
-infomsg=\u0412\u043B\u0438\u0437\u0430\u043D\u0435 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430\: \u043D\u0430\u043F\u0438\u0448\u0435\u0442\u0435 "\u0442\u0435\u0441\u0442" \u0438\u043B\u0438 "\u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440"
-question=\u0412\u0438\u0435 \u043D\u0435 \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u0438\u0437\u0442\u0440\u0438\u0435\u0442\u0435 \u0432\u0441\u0438\u0447\u043A\u0438 \u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u043D\u0430\u0438\u0441\u0442\u0438\u043D\u0430? ;)
-search.form.first=\u0418\u043C\u0435
-search.form.last=\u0424\u0430\u043C\u0438\u043B\u0438\u044F
-searchusertitle=\u0422\u044A\u0440\u0441\u0435\u0442\u0435 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B, \u043A\u043E\u0439\u0442\u043E \u0434\u0430 \u043F\u043E\u043A\u0430\u0436\u0435 \u043D\u0435\u0433\u043E\u0432\u0430\u0442\u0430/\u043D\u0435\u0439\u043D\u0430\u0442\u0430 \u0443\u0435\u0431 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
-show.entered.data=\u0412\u0430\u0448\u0430\u0442\u0430 \u0444\u0430\u043C\u0438\u043B\u0438\u044F \u0435 {0} \u0438 \u0432\u0430\u0448\u0435\u0442\u043E \u0438\u043C\u0435 \u0435 {1}
-title=\u0414\u043E\u0431\u0440\u0435 \u0434\u043E\u0448\u043B\u0438 \u0432 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u0442\u0430 \u0437\u0430 \u0434\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0430\u0446\u0438\u044F \u043D\u0430 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F\u0442\u0430
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_cs.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_cs.properties
deleted file mode 100644
index 7f84e554a667627c30b04b749436d84610ea20c8..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_cs.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:13 CET 2009
-command.modal=Mod\u00E1ln\u00ED dialog 
-command.search=Vyhled\u00E1n\u00ED u\u017Eivatele
-error.firstname.mandatory=Mus\u00EDte zadat jm\u00E9no
-error.lastname.mandatory=P\u0159\u00EDjmen\u00ED je povinn\u00E9
-infomsg=P\u0159ihl\u00E1\u0161en\u00ED\: napi\u0161te "test" nebo "administrator"
-question=Opravdu chcete smazat v\u0161echny soubory?
-search.form.first=Jm\u00E9no
-search.form.last=P\u0159\u00EDjmen\u00ED
-searchusertitle=Vyhledejte u\u017Eivatele pro zobrazen\u00ED jeho osobn\u00ED str\u00E1nky
-show.entered.data=Va\u0161e p\u0159\u00EDjmen\u00ED je {0} a jm\u00E9no je {1}
-title=V\u00EDtejte na str\u00E1nce pro p\u0159edveden\u00ED roz\u0161\u00ED\u0159en\u00ED 
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_da.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_da.properties
deleted file mode 100644
index 750f59d519404989d2b8ff9f392dabb520c8270c..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_da.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:08 CET 2009
-command.modal=Modal dialog
-command.search=Brugers\u00F8ning
-error.firstname.mandatory=Fornavn er kr\u00E6vet
-error.lastname.mandatory=Efternavn er kr\u00E6vet
-infomsg=Login\: skriv "test" eller "administrator"
-question=Vil du virkelig slette alle filer? ;-)
-search.form.first=Fornavn
-search.form.last=Efternavn
-searchusertitle=S\u00F8g efter en bruger for at vise hende eller hans personlige hjemmeside 
-show.entered.data=Dit efternavn er {0} og dit fornavn er {1}
-title=Velkommen til demonstrationen af udvidelser
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_de.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_de.properties
deleted file mode 100644
index d82fd1b990560fca8316fe321f876f9701c3b30d..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Mon Mar 02 09:54:03 CET 2009
-homemaincontroller.actiontext=Demo Menu
-homemaincontroller.description=Link alt Text...
-democontroller.actiontext=Demo Erweiterung
-democontroller.description=Beschreibung des Links...
-main.menu.title=Root Knoten
-main.menu.title.alt=Beschreibung des Links...
-command.modal=Modaler Dialog
-command.search=Benutzersuche
-error.firstname.mandatory=Vorname ist obligatorisch
-error.lastname.mandatory=Nachname ist obligatorisch
-infomsg=Geben Sie "test", oder "administrator" als Loginnamen ein.
-question=Alle Dateien nicht l\u00F6schen? ;)
-search.form.first=Vorname
-search.form.last=Nachname
-searchusertitle=Suchen Sie einen Benutzer, um dessen Homepage anzuzeigen.
-show.entered.data=Ihr Nachname ist {0} und Ihr Vorname ist {1}
-title=Willkommen zur Erweiterungs-Demonstrationsseite
-form.title = Das Formular
-form.descr = Geben Sie Ihre Daten ein:
-click.for.jsdemo = JavaScript Link
-js.demo.desc = Ein Link zu einer JavaScript Funktion
-js.demo.msg = Hallo Hallo!
-clicked.ok = Es ist kein Fehler aufgetreten, nicht alle Datein wurden vollst\u00E4ndig gel\u00F6scht.
-clicked.close = Geschlossen.
-clicked.cancel = Abgebrochen
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_el.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_el.properties
deleted file mode 100644
index 93914d3785dc3d8fe358d6d54c48341039df2ad3..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_el.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#Sat Mar 13 14:38:47 CET 2010
-click.for.jsdemo=\u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03BC\u03BF\u03C2 \u03B3\u03B9\u03B1 JavaScript
-clicked.cancel=\u0391\u03BA\u03C5\u03C1\u03C9\u03BC\u03AD\u03BD\u03BF
-clicked.close=\u039A\u03BB\u03B5\u03B9\u03C3\u03C4\u03CC
-clicked.ok=\u0394\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03C3\u03C6\u03AC\u03BB\u03BC\u03B1. \u0394\u03B5\u03BD \u03AD\u03C7\u03BF\u03C5\u03BD \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03B5\u03AF \u03C0\u03BB\u03AE\u03C1\u03C9\u03C2 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1.
-command.modal=\u0394\u03B9\u03AC\u03BB\u03BF\u03B3\u03BF\u03C2 modal
-command.search=\u0391\u03BD\u03B1\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 (\u03BC\u03CC\u03BD\u03BF \u03C3\u03B5 "\u03A0\u03BB\u03AE\u03C1\u03B7" \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1)
-error.firstname.mandatory=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03BA\u03B1\u03B8\u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03AD\u03BD\u03B1 \u03CC\u03BD\u03BF\u03BC\u03B1
-error.lastname.mandatory=\u03A4\u03BF \u03B5\u03C0\u03CE\u03BD\u03C5\u03BC\u03BF \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C5\u03C0\u03BF\u03C7\u03C1\u03B5\u03C9\u03C4\u03B9\u03BA\u03CC
-form.descr=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE, \u03B5\u03B9\u03C3\u03AC\u03B3\u03B5\u03C4\u03B5 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03C3\u03B1\u03C2\:
-form.title=\u03A4\u03BF \u03AD\u03BD\u03C4\u03C5\u03C0\u03BF
-infomsg=Login\: \u03C0\u03BB\u03B7\u03BA\u03C4\u03C1\u03BF\u03BB\u03BF\u03B3\u03AE\u03C3\u03C4\u03B5 "test" \u03AE "administrator"
-js.demo.desc=\u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03BC\u03BF\u03C2 \u03B3\u03B9\u03B1 \u03C4\u03B7 \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 JavaScript
-js.demo.msg=\u0393\u03B5\u03B9\u03B1 \u03C3\u03B1\u03C2, \u03B3\u03B5\u03B9\u03B1 \u03C3\u03B1\u03C2\!
-question=\u0394\u03B5\u03BD \u03B8\u03AD\u03BB\u03B5\u03C4\u03B5 \u03BD\u03B1 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03C8\u03B5\u03C4\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1? ;)
-search.form.first=\u038C\u03BD\u03BF\u03BC\u03B1
-search.form.last=\u0395\u03C0\u03CE\u03BD\u03C5\u03BC\u03BF
-searchusertitle=\u0391\u03BD\u03B1\u03B6\u03B7\u03C4\u03AE\u03C3\u03C4\u03B5 \u03BA\u03AC\u03C0\u03BF\u03B9\u03BF\u03BD \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B4\u03B5\u03AF\u03C4\u03B5 \u03C4\u03B7\u03BD \u03C0\u03C1\u03BF\u03C3\u03C9\u03C0\u03B9\u03BA\u03AE \u03C4\u03BF\u03C5 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1
-show.entered.data=\u03A4\u03BF \u03B5\u03C0\u03CE\u03BD\u03C5\u03BC\u03CC \u03C3\u03B1\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 {0} \u03BA\u03B1\u03B9 \u03C4\u03BF \u03CC\u03BD\u03BF\u03BC\u03AC \u03C3\u03B1\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 {1}
-title=\u039A\u03B1\u03BB\u03C9\u03C3\u03AE\u03C1\u03B8\u03B1\u03C4\u03B5 \u03C3\u03C4\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03B5\u03C0\u03B9\u03B4\u03B5\u03B9\u03BE\u03B7\u03C2 \u03B5\u03C0\u03B5\u03BA\u03C4\u03AC\u03C3\u03B5\u03C9\u03BD
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_en.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_en.properties
deleted file mode 100644
index 9e6386f443b1f4b891da9162ac38fd8815fc611f..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Wed Jan 05 17:41:22 CET 2011
-click.for.jsdemo=JavaScript link
-clicked.cancel=Cancelled
-clicked.close=Closed
-clicked.ok=No error; not all files have been deleted entirely.
-command.modal=Modal dialog
-command.search=User search
-democontroller.actiontext=Demo add-on
-democontroller.description=Description of link...
-error.firstname.mandatory=The first name is mandatory
-error.lastname.mandatory=The last name is mandatory
-form.descr=Please fill in your data\:
-form.title=The form
-homemaincontroller.actiontext=Demonstration of menu extension
-homemaincontroller.description=Description of the link...
-infomsg=Login name\: type "test" or "administrator"
-js.demo.desc=Link to JavaScript function
-js.demo.msg=Hello, hello\!
-main.menu.title=Root node
-main.menu.title.alt=Description of link...
-question=You do not really want to delete all files? ;)
-search.form.first=First name
-search.form.last=Last name
-searchusertitle=Search for a user to display his or her personal homepage.
-show.entered.data=Your last name is {0} and your first name is {1}
-title=Welcome to the extension demonstration page 
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_es.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_es.properties
deleted file mode 100644
index ca23f2072d1f11bf4f9f7e0d43436b5c8478bc9f..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_es.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue Apr 28 17:56:32 CEST 2009
-command.modal=Di\u00E1logo modal
-command.search=B\u00FAsqueda de usuario
-error.firstname.mandatory=Tienes que indicar un nombre
-error.lastname.mandatory=El apellido es obligatorio 
-infomsg=Login\: Usar "test" o "administrator"
-question=\u00BFRealmente deseas suprimir todos los archivos? ;)
-search.form.first=Nombre
-search.form.last=Apellido
-searchusertitle=Buscar usuario para exhibir la p\u00E1gina personal 
-show.entered.data=Tu apellido es {0} y tu nombre es {1}
-title=Bienvenido a la p\u00E1gina de la demostraci\u00F3n 
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fa.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fa.properties
deleted file mode 100644
index f1faa0a0be190f497970a990a8906ab836c55359..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fa.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:12 CET 2009
-command.modal=Click here for a modal dialog
-command.search=\u062C\u0633\u062A\u062C\u0648\u06CC \u06CC\u06A9 \u06A9\u0627\u0631\u0628\u0631
-error.firstname.mandatory=\u0634\u0645\u0627 \u0628\u0627\u06CC\u062F \u0646\u0627\u0645 \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F
-error.lastname.mandatory=\u0647\u0645\u0686\u0646\u06CC\u0646 \u0648\u0627\u0631\u062F \u06A9\u0631\u062F\u0646 \u0646\u0627\u0645 \u062E\u0627\u0646\u0648\u0627\u062F\u06AF\u06CC \u0627\u0644\u0632\u0627\u0645\u06CC \u0627\u0633\u062A
-infomsg="test"\u06CC\u0627 " administrator" \u0631\u0627 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u06A9\u0644\u0645\u0647 \u0648\u0631\u0648\u062F \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F.
-question=Do you not want to delete not all files? ;)
-search.form.first=\u0646\u0627\u0645
-search.form.last=\u0646\u0627\u0645 \u062E\u0627\u0646\u0648\u0627\u062F\u06AF\u06CC
-searchusertitle=\u062C\u06CC\u062A\u062C\u0648\u06CC \u06CC\u06A9 \u06A9\u0627\u0631\u0628\u0631 \u0628\u0631\u0627\u06CC \u0646\u0645\u0627\u06CC\u0634 \u0635\u0641\u062D\u0647 \u062E\u0627\u0646\u06AF\u06CC \u0634\u062E\u0635\u06CC
-show.entered.data={0}{1}\u0646\u0627\u0645 \u0648 \u0646\u0627\u0645 \u062E\u0627\u0646\u0648\u0627\u062F\u06AF\u06CC \u0634\u0645\u0627
-title=\u0628\u0647 \u0635\u0641\u062D\u0647 \u0646\u0645\u0627\u06CC\u0634\u06CC \u0627\u06A9\u0633\u062A\u0646\u0634\u0646 \u0647\u0627 \u062E\u0648\u0634 \u0622\u0645\u062F\u06CC\u062F
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fr.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fr.properties
deleted file mode 100644
index 239d03888a42f43cd582a70ed83549b15643bd6d..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_fr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Sat Jan 08 13:12:51 CET 2011
-click.for.jsdemo=JavaScript Link
-clicked.cancel=Interrompu
-clicked.close=Ferm\u00E9
-clicked.ok=Pas d'erreur, pas tous les fichiers ont \u00E9t\u00E9 effac\u00E9 enti\u00E8rement.
-command.modal=Dialogue modal
-command.search=Recherche d'utilisateur (seulement en mode "full")
-democontroller.actiontext=Extension demo
-democontroller.description=Description du lien...
-error.firstname.mandatory=Pr\u00E9nom obligatoire
-error.lastname.mandatory=Nom obligatoire
-form.descr=Veuillez indiquer vos donn\u00E9es\:
-form.title=Le formulaire
-homemaincontroller.actiontext=D\u00E9monstration menu
-homemaincontroller.description=Description du lien...
-infomsg=Introduisez "test", ou "administrator" comme nom de login.
-js.demo.desc=Un lien vers une fonction JavaScript
-js.demo.msg=Salut, salut\!
-main.menu.title=Root noeuds
-main.menu.title.alt=Description du lien...
-question=Ne pas effacer toutes les donn\u00E9es? ;) 
-search.form.first=Pr\u00E9nom
-search.form.last=Nom
-searchusertitle=Recherchez un utilisateur pour afficher son site web.
-show.entered.data=Votre nom est {0} et votre pr\u00E9nom est {1}
-title=Bienvenue \u00E0 la page de d\u00E9monstration des extensions
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_it.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_it.properties
deleted file mode 100644
index e5ff84aa74abb4f94d886ab0b306199a7b5b2e81..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_it.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Sat Jan 08 13:08:07 CET 2011
-click.for.jsdemo=Link JavaScript
-clicked.cancel=Interrotto
-clicked.close=Chiuso
-clicked.ok=Errore; non tutti i file sono stati eliminati interamente.
-command.modal=Dialogo modale
-command.search=Ricerca utente (funziona solo nella modalit\u00E0 "full")
-democontroller.actiontext=Estensione demo
-democontroller.description=Descrizione del link...
-error.firstname.mandatory=Il nome \u00E8 obbligatorio
-error.lastname.mandatory=Il cognome \u00E8 obbligatorio
-form.descr=Inserisca i Suoi dati\:
-form.title=Il formulario
-homemaincontroller.actiontext=Dimostrazione menu
-homemaincontroller.description=Descrizione del link...
-infomsg=Immetta "test" oppure "administrator" come nome di login.
-js.demo.desc=Link verso la funzione JavaScript
-js.demo.msg=Hello, hello\!
-main.menu.title=Nodi root
-main.menu.title.alt=Descrizione del link...
-question=Non cancellare tutti i dati? ;)
-search.form.first=Nome
-search.form.last=Cognome
-searchusertitle=Cerchi un utente per visualizzare la sua pagina iniziale.
-show.entered.data=Il Suo cognome \u00E8 {0} e il Suo nome \u00E8 {1}
-title=Benvenuti nella pagina dimostrativa dell'estensione
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_jp.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_jp.properties
deleted file mode 100644
index 7d3ce0ec4bc7ed708571b302b3d946a60edd681b..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_jp.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#Thu Sep 08 16:42:38 CEST 2011
-click.for.jsdemo=Java\u30B9\u30AF\u30EA\u30D7\u30C8\u30EA\u30F3\u30AF
-clicked.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-clicked.close=\u30AF\u30ED\u30FC\u30BA
-clicked.ok=\u30A8\u30E9\u30FC\u306A\u3057\u3002\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u305F\u308F\u3051\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-command.modal=\u30E2\u30FC\u30C0\u30EB\u30C0\u30A4\u30A2\u30ED\u30B0
-command.search=\u30E6\u30FC\u30B6\u691C\u7D22
-democontroller.description=\u30EA\u30F3\u30AF\u8AAC\u660E ...
-error.firstname.mandatory=\u540D\u306F\u5FC5\u9808\u5165\u529B\u9805\u76EE\u3067\u3059\u3002
-error.lastname.mandatory=\u59D3\u306F\u5FC5\u9808\u5165\u529B\u9805\u76EE\u3067\u3059\u3002
-form.descr=\u3042\u306A\u305F\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\:
-form.title=\u30D5\u30A9\u30FC\u30E0
-infomsg=\u30ED\u30B0\u30A4\u30F3\: \u300Ctest\u300D\u307E\u305F\u306F\u300Cadministrator\u300D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-js.demo.desc=Java\u30B9\u30AF\u30EA\u30D7\u30C8\u95A2\u6570\u3078\u306E\u30EA\u30F3\u30AF
-js.demo.msg=Hello, hello\!
-main.menu.title=\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9
-main.menu.title.alt=\u30EA\u30F3\u30AF\u8AAC\u660E ...
-question=\u672C\u5F53\u306B\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u307E\u305B\u3093\u304B? ;)
-search.form.first=\u540D
-search.form.last=\u59D3
-searchusertitle=\u30D1\u30FC\u30BD\u30CA\u30EB\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\u305F\u3081\u3001\u30E6\u30FC\u30B6\u3092\u691C\u7D22\u3059\u308B
-show.entered.data=\u3042\u306A\u305F\u306E\u59D3\u306F {0} \u3001\u540D\u306F {1} \u3067\u3059\u3002
-title=\u3088\u3046\u3053\u305D\u62E1\u5F35\u6A5F\u80FD\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u30DA\u30FC\u30B8\u3078
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ko.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ko.properties
deleted file mode 100644
index 297900eaac974b63cc699c3d367466f62fe081e4..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ko.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Aug 12 22:51:17 CEST 2009
-command.search=\uC0AC\uC6A9\uC790 \uAC80\uC0C9
-error.firstname.mandatory=\uC774\uB984 \uD544\uC218\uD56D\uBAA9\uC785\uB2C8\uB2E4
-error.lastname.mandatory=\uC131\uC740 \uD544\uC218\uC0AC\uD56D\uC785\uB2C8\uB2E4
-search.form.first=\uC774\uB984
-search.form.last=\uC131
-show.entered.data=\uADC0\uD558\uC758 \uC774\uB984\uC740 {0}\uC774\uBA70 \uADC0\uD558\uC758 \uC131\uC740{1} \uC785\uB2C8\uB2E4
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_lt.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_lt.properties
deleted file mode 100644
index 73979cd95a090ed262deaf57bc0a9520d4a8da98..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_lt.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:01 CET 2009
-command.modal=Modalinis dialogas
-command.search=Naudotoj\u0173 paie\u0161ka
-error.firstname.mandatory=Pra\u0161ome nurodykite vard\u0105
-error.lastname.mandatory=Pra\u0161ome nurodykite pavard\u0119
-infomsg=Prisijungti\: \u012Fveskite "test" arba "administrator"
-question=Ar tikrai norite pa\u0161alinti visus failus? ;)
-search.form.first=Vardas
-search.form.last=Pavard\u0117
-searchusertitle=Naudotojo titulinio puslapio paie\u0161ka
-show.entered.data=J\u016Bs\u0173 pavard\u0117 {0} o vardas {1}
-title=Sveiki atvyk\u0119 \u012F pl\u0117tini\u0173 demonstravimo puslap\u012F
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_nl_NL.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_nl_NL.properties
deleted file mode 100644
index 55bd4abbd471e88529a761a7c40c4bb526a72cf3..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_nl_NL.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Thu Sep 08 16:42:42 CEST 2011
-click.for.jsdemo=JavaScript link
-clicked.cancel=Geannuleerd
-clicked.close=Gesloten
-clicked.ok=Geen fout; Niet alle bestanden zijn volledig verwijderd.
-command.modal=Modale dialoog
-command.search=Gebruikerszoeking
-democontroller.actiontext=Demo add-on
-democontroller.description=Beschrijving van link...
-error.firstname.mandatory=De voornaam is verplicht
-error.lastname.mandatory=De achternaam is verplicht
-form.descr=Gelieve uw datum in te vullen\:
-form.title=Het formulier
-homemaincontroller.actiontext=Demonstratie van menu-extensie
-homemaincontroller.description=Beschrijving van de link...
-infomsg=Loginnaam\: type "test" of "administrator"
-js.demo.desc=Link naar JavaScript functie
-js.demo.msg=Hallo Hallo\!
-main.menu.title=Root node
-main.menu.title.alt=Beschrijving van link...
-question=U wilt niet echt alle bestanden verwijderen? ;)
-search.form.first=Voornaam
-search.form.last=Achternaam
-searchusertitle=Zoek naar een gebruiker om zijn of haar persoonlijke homepagina te weergeven.
-show.entered.data=Uw achternaam is {0} en uw voornaam is {1}
-title=Welkom op de extensie demonstratiepagina
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pl.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index ca1dab9ec41267b90c9b0bff4a1c655ac434d633..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#Mon Sep 20 14:13:16 CEST 2010
-click.for.jsdemo=Link JavaScript
-clicked.cancel=Anulowany
-clicked.close=Zamkni\u0119ty
-clicked.ok=To nie jest b\u0142\u0105d, jednak nie wszystkie pliki zosta\u0142y usuni\u0119te ca\u0142kowicie.
-command.modal=Modal dialog
-command.search=Wyszukiwanie u\u017Cytkownik\u00F3w
-error.firstname.mandatory=Musisz wskaza\u0107 imi\u0119
-error.lastname.mandatory=Nazwisko jest obowi\u0105zkowe
-form.descr=Uzupe\u0142nij dane\:
-form.title=Formularz
-infomsg=Login\: wpisz "test" lub "administrator"
-js.demo.desc=Link do funkcji JavaScript
-js.demo.msg=Cze\u015B\u0107, cze\u015B\u0107\!
-question=Chyba nie chcesz usun\u0105\u0107 wszystkich plik\u00F3w? ;)
-search.form.first=Imi\u0119
-search.form.last=Nazwisko
-searchusertitle=Wyszukaj u\u017Cytkownika by wy\u015Bwietli\u0107 jego osobista stron\u0119 www
-show.entered.data=Twoje nazwisko to {0} a imi\u0119 to {1}
-title=Witaj na stronie demo rozszerze\u0144
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_BR.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_BR.properties
deleted file mode 100644
index 7ccede2eac6cff1af6445362c5ae8d67fa178e31..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_BR.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Thu Sep 08 16:42:37 CEST 2011
-click.for.jsdemo=JavaScript link
-clicked.cancel=Cancelado
-clicked.close=Fechado
-clicked.ok=Nenhum erro, nem todos os arquivos foram completamente exclu\u00EDdos.
-command.modal=Clicar aqui para um di\u00E1logo modal
-command.search=Buscar por um usu\u00E1rio
-democontroller.actiontext=Demo add-on
-democontroller.description=Descri\u00E7\u00E3o do link ...
-error.firstname.mandatory=Voc\u00EA deve preencher o primeiro nome
-error.lastname.mandatory=O \u00FAltimo nome tamb\u00E9m \u00E9 obrigat\u00F3rio
-form.descr=Por favor, preencha os seus dados\:
-form.title=O formul\u00E1rio
-homemaincontroller.actiontext=Demonstra\u00E7\u00E3o de extens\u00E3o menu
-homemaincontroller.description=Descri\u00E7\u00E3o do link ...
-infomsg=Digitar "Teste", ou "Administrador" como loginname
-js.demo.desc=Link para a fun\u00E7\u00E3o JavaScript
-js.demo.msg=Ol\u00E1, ol\u00E1\!
-main.menu.title=Root node
-main.menu.title.alt=Descri\u00E7\u00E3o do link ...
-question=Voc\u00EA n\u00E3o quer apagar todos os arquivos? ;)
-search.form.first=Primeiro nome
-search.form.last=\u00DAltimo nome
-searchusertitle=Buscar por um usu\u00E1rio para indicar a homepage pessoal
-show.entered.data=Seu \u00FAltimo nome \u00E9 {0} e seu primeiro nome \u00E9 {1}
-title=Bem-Vindo \u00E0 p\u00E1gina de demonstra\u00E7\u00E3o para extens\u00F5es
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_PT.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_PT.properties
deleted file mode 100644
index cfded166b6780817e0781317a095bd1a3b418725..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_pt_PT.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:04 CET 2009
-command.modal=Clicar aqui para um di\u00E1logo modal
-command.search=Buscar por um usu\u00E1rio
-error.firstname.mandatory=Voc\u00EA deve preencher o primeiro nome
-error.lastname.mandatory=O \u00FAltimo nome tamb\u00E9m \u00E9 obrigat\u00F3rio
-infomsg=Digitar "Teste", ou "Administrador" como loginname
-question=Voc\u00EA n\u00E3o quer apagar todos os arquivos? ;)
-search.form.first=Primeiro nome
-search.form.last=\u00DAltimo nome
-searchusertitle=Buscar por um usu\u00E1rio para indicar a homepage pessoal
-show.entered.data=Seu \u00FAltimo nome \u00E9 {0} e seu primeiro nome \u00E9 {1}
-title=Bem-Vindo \u00E0 p\u00E1gina de demonstra\u00E7\u00E3o para extens\u00F5es
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ru.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ru.properties
deleted file mode 100644
index abf70db711dbc8332bf9d61280a85da8ee6e21be..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_ru.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:18 CET 2009
-command.modal=\u041C\u043E\u0434\u0430\u043B\u044C\u043D\u044B\u0439 \u0434\u0438\u0430\u043B\u043E\u0433
-command.search=\u041F\u043E\u0438\u0441\u043A \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F (\u0432\u043E\u0437\u043C\u043E\u0436\u0435\u043D \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u043C\u043E\u0434\u0443\u0441\u0435 "full")
-error.firstname.mandatory=\u0418\u043C\u044F \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E
-error.lastname.mandatory=\u0424\u0430\u043C\u0438\u043B\u0438\u044F \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E
-infomsg=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 "test" \u0438\u043B\u0438 "administrator" \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0438\u043C\u0435\u043D\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F. 
-question=\u041D\u0435 \u0443\u0434\u0430\u043B\u044F\u0442\u044C \u0432\u0441\u0435 \u0444\u0430\u0439\u043B\u044B? ;)
-search.form.first=\u0418\u043C\u044F
-search.form.last=\u0424\u0430\u043C\u0438\u043B\u0438\u044F
-searchusertitle=\u041D\u0430\u0439\u0434\u0438\u0442\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F, \u0447\u0442\u043E\u0431\u044B \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0435\u0433\u043E home page. 
-show.entered.data=\u0412\u0430\u0448\u0430 \u0444\u0430\u043C\u0438\u043B\u0438\u044F {0}, \u0412\u0430\u0448\u0435 \u0438\u043C\u044F {1}
-title=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u043D\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u0443\u044E \u0434\u0435\u043C\u043E-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443  
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_sq.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_sq.properties
deleted file mode 100644
index 9041f490fba6ad580e1561c45f7107772586e88c..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_sq.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:11 CET 2009
-command.modal=Dialogu modal
-command.search=K\u00EBrkimi i shfryt\u00EBzuesit
-error.firstname.mandatory=Fusha e emrit \u00EBsht\u00EB e obligueshme
-error.lastname.mandatory=Fusha e mbiemri \u00EBsht\u00EB e obligueshme
-infomsg=Kyqja\: shkruani "test" ose "administrator"
-question=Ju nuk doni me t\u00EB v\u00EBrtet\u00EB t'i fshini t\u00EB gjith\u00EB skedar\u00EBt? ;)
-search.form.first=Emri
-search.form.last=Mbiemri
-searchusertitle=K\u00EBrkimi p\u00EBr nj\u00EB shfryt\u00EBzues p\u00EBr t\u00EB paraqitur faqen personale t\u00EB tij ose saj
-show.entered.data=Mbiemri juaj \u00EBsht\u00EB {0} dhe emri juaj \u00EBsht\u00EB {1}
-title=Mir\u00EB se vini n\u00EB faqen e demostrimit t\u00EB shtojcave
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_tr.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_tr.properties
deleted file mode 100644
index fdb493f88555b2fc4d3ce1f6414f78b1cd45f9a4..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_tr.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:53:58 CET 2009
-command.modal=Model ileti\u015Fim
-command.search=Kullan\u0131c\u0131 arama
-error.firstname.mandatory=Bir ad belirtmelisiniz
-error.lastname.mandatory=Soyad\u0131 zorunludur
-infomsg=Oturum a\u00E7\: "test" veya "y\u00F6netici" yaz
-question=Ger\u00E7ekten t\u00FCm dosyalar\u0131 silmek istemiyor musunuz? ;)
-search.form.first=Ad\u0131
-search.form.last=Soyad\u0131
-searchusertitle=Ki\u015Fisel ana sayfas\u0131n\u0131 g\u00F6stermek i\u00E7in bir kullan\u0131c\u0131 ara
-show.entered.data=Soyad\u0131n\u0131z {0} ve ad\u0131n\u0131z {1}
-title=Uzant\u0131 g\u00F6steri sayfas\u0131na ho\u015Fgeldiniz
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_vi.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_vi.properties
deleted file mode 100644
index bb28f2139c04940acafbabc42408fb55951a6a3b..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_vi.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:53:58 CET 2009
-command.modal=\u0110o\u1EA1n h\u1ED9i tho\u1EA1i c\u00F3 ph\u01B0\u01A1ng th\u1EE9c
-command.search=T\u00ECm ki\u1EBFm ng\u01B0\u1EDDi s\u1EED d\u1EE5ng
-error.firstname.mandatory=H\u1ECD l\u00E0 th\u00F4ng tin b\u1EAFt bu\u1ED9c
-error.lastname.mandatory=T\u00EAn l\u00E0 th\u00F4ng tin b\u1EAFt bu\u1ED9c
-infomsg=Truy c\u1EADp\: ki\u1EC3u "ki\u1EC3m tra" hay "nh\u00E0 qu\u1EA3n tr\u1ECB"
-question=Th\u1EF1c s\u1EF1 quy v\u1ECB kh\u00F4ng mu\u1ED1n x\u00F3a t\u1EA5t c\u1EA3 c\u00E1c t\u1EC7p tin? ;)
-search.form.first=H\u1ECD
-search.form.last=T\u00EAn
-searchusertitle=T\u00ECm ki\u1EBFm m\u1ED9t ng\u01B0\u1EDDi s\u1EED d\u1EE5ng \u0111\u1EC3 hi\u1EC3n th\u1ECB trang th\u00F4ng tin c\u1EE7a anh \u1EA5y ho\u1EB7c c\u00F4 \u1EA5y
-show.entered.data=T\u00EAn c\u1EE7a qu\u00FD v\u1ECB l\u00E0 {0} v\u00E0 h\u1ECD c\u1EE7a qu\u00FD v\u1ECB l\u00E0 {1}
-title=Ch\u00E0o m\u1EEBng qu\u00FD v\u1ECB \u0111\u1EBFn v\u1EDBi trang m\u00F4 t\u1EA3 m\u1EDF r\u1ED9ng
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_CN.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_CN.properties
deleted file mode 100644
index 6adecc622e1f6238555e816108c05cd49d5f3106..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_CN.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#Sat Feb 20 13:16:36 CET 2010
-click.for.jsdemo=JavaScript\u94FE\u63A5
-clicked.cancel=\u5DF2\u53D6\u6D88
-clicked.close=\u5DF2\u5173\u95ED
-clicked.ok=\u6CA1\u6709\u9519\u8BEF\uFF1B\u4F46\u5E76\u975E\u5DF2\u5220\u9664\u6240\u6709\u6587\u4EF6\u3002
-command.modal=\u70B9\u51FB\u6B64\u5904\u5F97\u5230\u4E00\u4E2A\u6A21\u578B\u5BF9\u8BDD\u6846
-command.search=\u641C\u7D22\u7528\u6237
-error.firstname.mandatory=\u60A8\u5FC5\u987B\u586B\u5199\u540D
-error.lastname.mandatory=\u60A8\u4E5F\u5FC5\u987B\u586B\u5199\u59D3
-form.descr=\u8BF7\u586B\u5165\u60A8\u7684\u6570\u636E\uFF1A
-form.title=\u8868\u5355
-infomsg=\u4EE5\u201Ctest\u201D\u6216\u201Cadminstrator\u201D\u4F5C\u4E3A\u767B\u5F55\u540D
-js.demo.desc=\u4E0EJavaScript\u529F\u80FD\u94FE\u63A5
-js.demo.msg=\u60A8\u597D\uFF0C\u60A8\u597D\uFF01matthew wu\u5411\u60A8\u95EE\u597D\u3002
-question=\u60A8\u4E0D\u60F3\u5220\u9664\u6240\u6709\u6587\u4EF6?
-search.form.first=\u540D
-search.form.last=\u59D3
-searchusertitle=\u641C\u7D22\u4E00\u4E2A\u7528\u6237\u4EE5\u663E\u793A\u5176\u4E2A\u4EBA\u9996\u9875
-show.entered.data=\u4F60\u7684\u59D3\u662F{0}\u4F60\u7684\u540D\u662F{1}
-title=\u6B22\u8FCE\u6765\u5230\u6269\u5C55\u6F14\u793A\u9875\u9762
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_TW.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_TW.properties
deleted file mode 100644
index 8d3d89ae1039fb991361a4dc4815da2c250ae580..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/LocalStrings_zh_TW.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Mar 02 09:54:05 CET 2009
-command.modal=Modal \u5C0D\u8A71\u6846
-command.search=\u4F7F\u7528\u8005\u641C\u5C0B
-error.firstname.mandatory=\u540D\u5B57\u662F\u5FC5\u586B\u7684
-error.lastname.mandatory=\u59D3\u5F0F\u662F\u5FC5\u586B\u7684
-infomsg=\u767B\u5165\uFF1A\u8F38\u5165 "test" \u6216 "administrator"
-question=\u60A8\u4E0D\u662F\u771F\u7684\u60F3\u522A\u9664\u6240\u6709\u7684\u6A94\u6848\u5427\uFF1F ;)
-search.form.first=\u540D\u5B57
-search.form.last=\u59D3\u6C0F
-searchusertitle=\u641C\u5C0B\u4E00\u500B\u4F7F\u7528\u8005\u4EE5\u986F\u793A\u5176\u500B\u4EBA\u9996\u9801
-show.entered.data=\u60A8\u7684\u59D3\u6C0F\u662F {0} \u4E26\u4E14\u60A8\u7684\u540D\u5B57\u662F {1}
-title=\u6B61\u8FCE\u4F86\u5230\u64F4\u5C55\u793A\u7BC4\u9801\u9762
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/i18nBundleMetadata.properties b/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/i18nBundleMetadata.properties
deleted file mode 100644
index 880f4f1f332ee36771c84524ac2b6410a247bda1..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_i18n/i18nBundleMetadata.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Sat Jan 08 13:07:40 CET 2011
-homemaincontroller.description.annotation=Link alt Text... \= Description of the link...
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/img/sonne.gif b/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/img/sonne.gif
deleted file mode 100644
index 033baeceedbfdb44fc8f77ac46ac81f9aeaf3ac3..0000000000000000000000000000000000000000
Binary files a/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/img/sonne.gif and /dev/null differ
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/style.css b/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/style.css
deleted file mode 100644
index bc21eb73fc063fe730b77b86b1a1af02866c0698..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_static/css/style.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.demoext_bild {
-	background-image: url(img/sonne.gif);
-	background-repeat: no-repeat;
-	padding-left: 45px;
-	padding-bottom: 30px;
-	
-}
-	
-.site_demo_icon {
-	background-image: url(img/site_demo.gif);
-	background-repeat: no-repeat;
-	padding-left: 20px;
-	margin-left: 10px;
-}
-	
\ No newline at end of file
diff --git a/src/main/java/ch/goodsolutions/demoextension/controller/_static/js/script.js b/src/main/java/ch/goodsolutions/demoextension/controller/_static/js/script.js
deleted file mode 100644
index 24c17be0767ae8bdf0ad6639bb277482303457f6..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/controller/_static/js/script.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var ch_goodsolutions_demoextension_controller = new function () {
-	this.afield = 0;
-	
-	this.afunction = function (demoarg) {
-		alert("demo:"+demoarg);
-	}	
-	
-}
\ No newline at end of file
diff --git a/src/main/java/ch/goodsolutions/demoextension/raw/img/site_demo.gif b/src/main/java/ch/goodsolutions/demoextension/raw/img/site_demo.gif
deleted file mode 100644
index 8d02a6ce3e93662b82ff6a19418fc4fb25fefd84..0000000000000000000000000000000000000000
Binary files a/src/main/java/ch/goodsolutions/demoextension/raw/img/site_demo.gif and /dev/null differ
diff --git a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.gif b/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.gif
deleted file mode 100644
index 033baeceedbfdb44fc8f77ac46ac81f9aeaf3ac3..0000000000000000000000000000000000000000
Binary files a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.gif and /dev/null differ
diff --git a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.png b/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.png
deleted file mode 100644
index 27c3c340907b7a09236709649f5618fa8eea50d8..0000000000000000000000000000000000000000
Binary files a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonne.png and /dev/null differ
diff --git a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonnewolken.gif b/src/main/java/ch/goodsolutions/demoextension/raw/img/sonnewolken.gif
deleted file mode 100644
index a3f399f8d1481a655dea1622eb476e56950b2c1f..0000000000000000000000000000000000000000
Binary files a/src/main/java/ch/goodsolutions/demoextension/raw/img/sonnewolken.gif and /dev/null differ
diff --git a/src/main/java/ch/goodsolutions/demoextension/raw/style.css b/src/main/java/ch/goodsolutions/demoextension/raw/style.css
deleted file mode 100644
index 4ffcf4fc638455690eaa5db63b584c0dae80f6a1..0000000000000000000000000000000000000000
--- a/src/main/java/ch/goodsolutions/demoextension/raw/style.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.demoext_bild {
-	background-image: url(img/sonne.png);
-	background-repeat: no-repeat;
-	padding-left: 45px;
-	padding-bottom: 30px;
-	
-}
-	
-.site_demo_icon {
-	background-image: url(img/site_demo.gif);
-	background-repeat: no-repeat;
-	padding-left: 20px;
-	margin-left: 10px;
-}
-	
\ No newline at end of file