44 files changed, 53 insertions, 53 deletions
diff --git a/src/com/itmill/toolkit/demo/features/Feature.java b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
index 8a38e6854f..02bbff2e1f 100644
--- a/src/com/itmill/toolkit/demo/features/Feature.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.Resource;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
index 9b8efc08dc..e7c1014a57 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.Iterator;
 import java.util.StringTokenizer;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java
index da345e5a5a..a2e2ed8429 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -93,7 +93,7 @@ public class FeatureBuffering extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureButton.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java
index 15e2865d04..b572870be1 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureButton.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
@@ -63,7 +63,7 @@ public class FeatureButton extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "In IT Mill Toolkit, boolean input values are represented by buttons. "
diff --git a/src/com/itmill/toolkit/demo/features/FeatureContainers.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java
index 5b3f5fe134..4f02c5313b 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureContainers.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java
index b491f406d7..979a8f0fdf 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureDateField.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java
index 915b3088a7..2b6317304b 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureDateField.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.Locale;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
index eff7f51953..008e25531d 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.Sizeable;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureForm.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java
index 52bdc589da..e84dfa22dd 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureForm.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.Date;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureFrameWindow.java
index c68235c36e..62bd3bd9a0 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureFrameWindow.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
index 3ef95bd711..0165f617d2 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.Date;
 
@@ -74,7 +74,7 @@ public class FeatureGridLayout extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "This feature provides a container that lays out components "
diff --git a/src/com/itmill/toolkit/demo/features/FeatureItems.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java
index c3d604f48d..45406d5584 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureItems.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -89,7 +89,7 @@ public class FeatureItems extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureLabel.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
index 742e90e45c..7afb65604b 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureLabel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
@@ -68,7 +68,7 @@ public class FeatureLabel extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "Labels components are for captions and plain text. "
diff --git a/src/com/itmill/toolkit/demo/features/FeatureLink.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java
index 350ec604a6..798df0b15e 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureLink.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.ui.*;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java
index c36e459261..5d18cd8870 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
@@ -71,7 +71,7 @@ public class FeatureOrderedLayout extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "This feature provides a container for laying out components either "
diff --git a/src/com/itmill/toolkit/demo/features/FeaturePanel.java b/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java
index 1213a04e41..efadad36c4 100644
--- a/src/com/itmill/toolkit/demo/features/FeaturePanel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureParameters.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java
index b00621f5c4..18a2a9bef6 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureParameters.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.net.URL;
 import java.util.Iterator;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureProperties.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java
index 4d6b013378..b3c8a55c67 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureProperties.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureSelect.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java
index c27265f4c7..0e8fd5400d 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureSelect.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
@@ -79,7 +79,7 @@ public class FeatureSelect extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "The select component combines two different modes of item selection.  "
diff --git a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java
index 0e23d820bc..2059f37845 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureTable.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTable.java
index b24419c003..c042614a79 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureTable.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTable.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.ui.Button;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureTextField.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java
index 512a4e87d9..cc6ac13794 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureTextField.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
@@ -63,7 +63,7 @@ public class FeatureTextField extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "TextField combines the logic of both the single line text-entry field and the multi-line "
diff --git a/src/com/itmill/toolkit/demo/features/FeatureTree.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java
index b1efe61234..160fdfe6a4 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureTree.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.util.Iterator;
 
diff --git a/src/com/itmill/toolkit/demo/features/FeatureUpload.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java
index a01296a4fd..b4178d55eb 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureUpload.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureUtil.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUtil.java
index 91dbfbd1cf..14743c14d1 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureUtil.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUtil.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureValidators.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java
index f04bd4b998..caa1c9b865 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureValidators.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -89,7 +89,7 @@ public class FeatureValidators extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/FeatureWindow.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
index 811d5d6d80..b3a6fa65c8 100644
--- a/src/com/itmill/toolkit/demo/features/FeatureWindow.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 import com.itmill.toolkit.ui.Window.CloseEvent;
diff --git a/src/com/itmill/toolkit/demo/features/FeaturesApplication.java b/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java
index 17461faa43..335d583a6d 100644
--- a/src/com/itmill/toolkit/demo/features/FeaturesApplication.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.*;
 
diff --git a/src/com/itmill/toolkit/demo/features/IntroBasic.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java
index 4ce8b8d457..fae31d029b 100644
--- a/src/com/itmill/toolkit/demo/features/IntroBasic.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -81,7 +81,7 @@ public class IntroBasic extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/IntroComponents.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java
index 2907f46b70..8f796a74fb 100644
--- a/src/com/itmill/toolkit/demo/features/IntroComponents.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.ui.Component;
@@ -85,7 +85,7 @@ public class IntroComponents extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java
index c2c954381f..b96c1c155c 100644
--- a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -79,7 +79,7 @@ public class IntroDataHandling extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "Please select <em>Embedded Objects</em> or <em>Upload</em>"
diff --git a/src/com/itmill/toolkit/demo/features/IntroDataModel.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java
index 5a0a677d73..b46501f6c8 100644
--- a/src/com/itmill/toolkit/demo/features/IntroDataModel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -82,7 +82,7 @@ public class IntroDataModel extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/IntroItemContainers.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java
index 1ee36bde35..97c17101b3 100644
--- a/src/com/itmill/toolkit/demo/features/IntroItemContainers.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -81,7 +81,7 @@ public class IntroItemContainers extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/IntroLayouts.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java
index d68aa720b4..7c4a4b21bb 100644
--- a/src/com/itmill/toolkit/demo/features/IntroLayouts.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
@@ -83,7 +83,7 @@ public class IntroLayouts extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return null;
diff --git a/src/com/itmill/toolkit/demo/features/IntroTerminal.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java
index eb7d1f1808..84ac477c9c 100644
--- a/src/com/itmill/toolkit/demo/features/IntroTerminal.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Label;
@@ -57,7 +57,7 @@ public class IntroTerminal extends Feature {
 	}
 
 	/**
-	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "";
diff --git a/src/com/itmill/toolkit/demo/features/IntroWelcome.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
index 89c0efb0cd..fb77b16231 100644
--- a/src/com/itmill/toolkit/demo/features/IntroWelcome.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.net.URL;
 import java.util.Date;
diff --git a/src/com/itmill/toolkit/demo/features/PropertyPanel.java b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
index 899c3608bf..63cc57cffa 100644
--- a/src/com/itmill/toolkit/demo/features/PropertyPanel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
@@ -26,7 +26,7 @@
 
  ********************************************************************** */
 
-package com.itmill.toolkit.demo.features;
+package com.itmill.toolkit.tests.featurebrowser;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
diff --git a/src/com/itmill/toolkit/demo/features/components.png b/src/com/itmill/toolkit/tests/featurebrowser/components.png
index e5681d4d37..e5681d4d37 100644
--- a/src/com/itmill/toolkit/demo/features/components.png
+++ b/src/com/itmill/toolkit/tests/featurebrowser/components.png
diff --git a/src/com/itmill/toolkit/demo/features/icon_demo.png b/src/com/itmill/toolkit/tests/featurebrowser/icon_demo.png
index 6a5c295d6a..6a5c295d6a 100644
--- a/src/com/itmill/toolkit/demo/features/icon_demo.png
+++ b/src/com/itmill/toolkit/tests/featurebrowser/icon_demo.png
diff --git a/src/com/itmill/toolkit/demo/features/icon_intro.png b/src/com/itmill/toolkit/tests/featurebrowser/icon_intro.png
index 032712985c..032712985c 100644
--- a/src/com/itmill/toolkit/demo/features/icon_intro.png
+++ b/src/com/itmill/toolkit/tests/featurebrowser/icon_intro.png
diff --git a/src/com/itmill/toolkit/demo/features/itmill.gif b/src/com/itmill/toolkit/tests/featurebrowser/itmill.gif
index b1c3e053f0..b1c3e053f0 100644
--- a/src/com/itmill/toolkit/demo/features/itmill.gif
+++ b/src/com/itmill/toolkit/tests/featurebrowser/itmill.gif
diff --git a/src/com/itmill/toolkit/demo/features/itmill_spin.swf b/src/com/itmill/toolkit/tests/featurebrowser/itmill_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/src/com/itmill/toolkit/demo/features/itmill_spin.swf
+++ b/src/com/itmill/toolkit/tests/featurebrowser/itmill_spin.swf
diff --git a/src/com/itmill/toolkit/demo/features/m-bullet-blue.gif b/src/com/itmill/toolkit/tests/featurebrowser/m-bullet-blue.gif
index fa6b38b4c9..fa6b38b4c9 100644
--- a/src/com/itmill/toolkit/demo/features/m-bullet-blue.gif
+++ b/src/com/itmill/toolkit/tests/featurebrowser/m-bullet-blue.gif
diff --git a/src/com/itmill/toolkit/demo/features/m.gif b/src/com/itmill/toolkit/tests/featurebrowser/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/src/com/itmill/toolkit/demo/features/m.gif
+++ b/src/com/itmill/toolkit/tests/featurebrowser/m.gif