Refactoring: Enably -> IT Mill Toolkit

svn changeset:92/svn branch:toolkit

192 files changed, 1308 insertions, 1308 deletions

diff --git a/src/com/enably/tk/Application.java b/src/com/itmill/toolkit/Application.java
index 321d31d065..dd12f5d65a 100644
--- a/src/com/enably/tk/Application.java
+++ b/src/com/itmill/toolkit/Application.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk;
+package com.itmill.toolkit;
 
-import com.enably.tk.service.ApplicationContext;
-import com.enably.tk.terminal.*;
-import com.enably.tk.ui.AbstractComponent;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.service.ApplicationContext;
+import com.itmill.toolkit.terminal.*;
+import com.itmill.toolkit.ui.AbstractComponent;
+import com.itmill.toolkit.ui.Window;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -50,7 +50,7 @@ import java.net.URL;
 /** <p>Abstract base class required for all MillStone applications. This
  * class provides all the basic services required by the MillStone
  * framework. These services allow external discovery and manipulation of
- * the user, {@link com.enably.tk.ui.Window windows} and
+ * the user, {@link com.itmill.toolkit.ui.Window windows} and
  *  themes, and starting and stopping the application.</p>
  *
  * <p>As mentioned, all MillStone applications must inherit this class.
@@ -66,7 +66,7 @@ import java.net.URL;
  * correspond to a URL gotten by catenating the window's name to the
  * application URL.</p>
  * 
- * <p>See the class <code>com.enably.tk.demo.HelloWorld</code> for
+ * <p>See the class <code>com.itmill.toolkit.demo.HelloWorld</code> for
  * a simple example of a fully working MillStone Application.</p>
  * 
  * <p><strong>Window access.</strong> <code>Application</code> provides
@@ -83,7 +83,7 @@ import java.net.URL;
  * for a preferred theme. If the window does not prefer a specific theme,
  * the application containing the window is queried. If neither the
  * application prefers a theme, the default theme for the
- * {@link com.enably.tk.terminal.Terminal terminal} is used. The
+ * {@link com.itmill.toolkit.terminal.Terminal terminal} is used. The
  * terminal always defines a default theme.</p>
  * 
  * @author IT Mill Ltd.
@@ -166,7 +166,7 @@ public abstract class Application
 	/** Adds a new window to the application.  
 	 * 
 	 * <p>This implicitly invokes the 
-	 * {@link com.enably.tk.ui.Window#setApplication(Application)}
+	 * {@link com.itmill.toolkit.ui.Window#setApplication(Application)}
 	 * method. </p>
 	 * 
 	 * @param window the new <code>Window</code> to add
@@ -465,7 +465,7 @@ public abstract class Application
 			return "APP/" + key + "/" + filename;
 	}
 
-	/* @see com.enably.tk.terminal.URIHandler#handleURI(URL, String)
+	/* @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
 	 */
 	public DownloadStream handleURI(
 		URL context,
@@ -730,7 +730,7 @@ public abstract class Application
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.Terminal.ErrorListener#terminalError(com.enably.tk.terminal.Terminal.ErrorEvent)
+	 * @see com.itmill.toolkit.terminal.Terminal.ErrorListener#terminalError(com.itmill.toolkit.terminal.Terminal.ErrorEvent)
 	 */
 	public void terminalError(Terminal.ErrorEvent event) {
 
diff --git a/src/com/enably/tk/data/Buffered.java b/src/com/itmill/toolkit/data/Buffered.java
index 8a6be55749..67ed8c5634 100644
--- a/src/com/enably/tk/data/Buffered.java
+++ b/src/com/itmill/toolkit/data/Buffered.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
-import com.enably.tk.terminal.ErrorMessage;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.SystemError;
+import com.itmill.toolkit.terminal.ErrorMessage;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.SystemError;
 
 /** <p>Defines the interface to commit and discard changes to an object,
  * supporting read-through and write-through modes.</p>
@@ -215,7 +215,7 @@ public interface Buffered {
 		 * <code>ERROR</code> level. Also source exception without any causes
 		 * are of level <code>ERROR</code>.
 		 * 
-		 * @see com.enably.tk.terminal.ErrorMessage#getErrorLevel()
+		 * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
 		 */
 		public int getErrorLevel() {
 
diff --git a/src/com/enably/tk/data/BufferedValidatable.java b/src/com/itmill/toolkit/data/BufferedValidatable.java
index 3c277c7546..2cd9baed88 100644
--- a/src/com/enably/tk/data/BufferedValidatable.java
+++ b/src/com/itmill/toolkit/data/BufferedValidatable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
 
 /** <p>This interface defines the combination of Validatable and Buffered interfaces.
diff --git a/src/com/enably/tk/data/Container.java b/src/com/itmill/toolkit/data/Container.java
index bc5006de0a..22e2e29974 100644
--- a/src/com/enably/tk/data/Container.java
+++ b/src/com/itmill/toolkit/data/Container.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
 import java.util.Collection;
 
@@ -512,7 +512,7 @@ public interface Container {
          * <code>false</code> is returned; the children must be first
          * explicitly removed with
          * {@link #setParent(Object itemId, Object newParentId)}or
-         * {@link com.enably.tk.data.Container#removeItem(Object itemId)}.
+         * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
          * </p>
          * 
          * <p>
diff --git a/src/com/enably/tk/data/Item.java b/src/com/itmill/toolkit/data/Item.java
index d1c68f3b90..c8ff6d7ff3 100644
--- a/src/com/enably/tk/data/Item.java
+++ b/src/com/itmill/toolkit/data/Item.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
 import java.util.Collection;
 
diff --git a/src/com/enably/tk/data/Property.java b/src/com/itmill/toolkit/data/Property.java
index 055fc57c02..888cdf3de2 100644
--- a/src/com/enably/tk/data/Property.java
+++ b/src/com/itmill/toolkit/data/Property.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
 /** Property is a simple data object that contains one typed value. This
  * interface contains methods to inspect and modify the stored value and its
diff --git a/src/com/enably/tk/data/Validatable.java b/src/com/itmill/toolkit/data/Validatable.java
index c31289d5bb..8cf0201290 100644
--- a/src/com/enably/tk/data/Validatable.java
+++ b/src/com/itmill/toolkit/data/Validatable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
 import java.util.Collection;
 
@@ -37,7 +37,7 @@ import java.util.Collection;
  * @author IT Mill Ltd.
  * @version @VERSION@
  * @since 3.0
- * @see com.enably.tk.data.Validator
+ * @see com.itmill.toolkit.data.Validator
  */ 
 public interface Validatable {
     
diff --git a/src/com/enably/tk/data/Validator.java b/src/com/itmill/toolkit/data/Validator.java
index 892215073a..c71b7283e0 100644
--- a/src/com/enably/tk/data/Validator.java
+++ b/src/com/itmill/toolkit/data/Validator.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data;
+package com.itmill.toolkit.data;
 
-import com.enably.tk.terminal.ErrorMessage;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.ErrorMessage;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** Object validator interface. Implementors of this class can be added to
- * any {@link com.enably.tk.data.Validatable} object to verify
+ * any {@link com.itmill.toolkit.data.Validatable} object to verify
  * its value. The <code>Validatable#isValid(Object)</code> iterates all
  * registered <code>Validator</code>s, calling their {@link #validate(Object)}
  * methods. <code>validate(Object)</code> should throw the 
diff --git a/src/com/enably/tk/data/doc-files/Container_full.gif b/src/com/itmill/toolkit/data/doc-files/Container_full.gif
index 28ee720e32..28ee720e32 100644
--- a/src/com/enably/tk/data/doc-files/Container_full.gif
+++ b/src/com/itmill/toolkit/data/doc-files/Container_full.gif
diff --git a/src/com/enably/tk/data/doc-files/Container_simple.gif b/src/com/itmill/toolkit/data/doc-files/Container_simple.gif
index 6db32581b8..6db32581b8 100644
--- a/src/com/enably/tk/data/doc-files/Container_simple.gif
+++ b/src/com/itmill/toolkit/data/doc-files/Container_simple.gif
diff --git a/src/com/enably/tk/data/doc-files/Item.gif b/src/com/itmill/toolkit/data/doc-files/Item.gif
index 4cd202ceba..4cd202ceba 100644
--- a/src/com/enably/tk/data/doc-files/Item.gif
+++ b/src/com/itmill/toolkit/data/doc-files/Item.gif
diff --git a/src/com/enably/tk/data/doc-files/Property.gif b/src/com/itmill/toolkit/data/doc-files/Property.gif
index 4aff19db1c..4aff19db1c 100644
--- a/src/com/enably/tk/data/doc-files/Property.gif
+++ b/src/com/itmill/toolkit/data/doc-files/Property.gif
diff --git a/src/com/enably/tk/data/doc-files/datalayer.gif b/src/com/itmill/toolkit/data/doc-files/datalayer.gif
index b3d25639e0..b3d25639e0 100644
--- a/src/com/enably/tk/data/doc-files/datalayer.gif
+++ b/src/com/itmill/toolkit/data/doc-files/datalayer.gif
diff --git a/src/com/enably/tk/data/package.html b/src/com/itmill/toolkit/data/package.html
index 6a2ed18f37..6a2ed18f37 100644
--- a/src/com/enably/tk/data/package.html
+++ b/src/com/itmill/toolkit/data/package.html
diff --git a/src/com/enably/tk/data/util/BeanItem.java b/src/com/itmill/toolkit/data/util/BeanItem.java
index 1b52578f1d..d3a7098a00 100644
--- a/src/com/enably/tk/data/util/BeanItem.java
+++ b/src/com/itmill/toolkit/data/util/BeanItem.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.beans.Introspector;
 import java.beans.BeanInfo;
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Property;
 
 /** A wrapper class for adding the Item interface to any Java Bean.
  * 
diff --git a/src/com/enably/tk/data/util/ContainerHierarchicalWrapper.java b/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java
index 292e433240..91b562d4c9 100644
--- a/src/com/enably/tk/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -35,12 +35,12 @@ import java.util.Collections;
 import java.util.Hashtable;
 import java.util.HashSet;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /** <p>A wrapper class for adding external hierarchy to containers not
- * implementing the {@link com.enably.tk.data.Container.Hierarchical}
+ * implementing the {@link com.itmill.toolkit.data.Container.Hierarchical}
  * interface.</p>
  * 
  * <p>If the wrapped container is changed directly (that is, not through
@@ -268,7 +268,7 @@ public class ContainerHierarchicalWrapper
 	 * <code>areChildrenAllowed</code> is false this method fails and
 	 * <code>false</code> is returned; the children must be first explicitly
 	 * removed with {@link #setParent(Object itemId, Object newParentId)} or
-	 * {@link com.enably.tk.data.Container#removeItem(Object itemId)}.</p>
+	 * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.</p>
 	 * 
 	 * @param itemId ID of the Item in the container whose child
 	 * capability is to be set
diff --git a/src/com/enably/tk/data/util/ContainerOrderedWrapper.java b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
index 6cf127bd60..4772876bfe 100644
--- a/src/com/enably/tk/data/util/ContainerOrderedWrapper.java
+++ b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,26 +19,26 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Hashtable;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /** <p>A wrapper class for adding external ordering to containers not
- * implementing the {@link com.enably.tk.data.Container.Ordered}
+ * implementing the {@link com.itmill.toolkit.data.Container.Ordered}
  * interface.</p>
  * 
  * <p>If the wrapped container is changed directly (that is, not through
@@ -447,7 +447,7 @@ public class ContainerOrderedWrapper
 				listener);
 	}
 	/**
-	 * @see com.enably.tk.data.Container.Ordered#addItemAfter(Object, Object)
+	 * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object, Object)
 	 */
 	public Item addItemAfter(Object previousItemId, Object newItemId)
 		throws UnsupportedOperationException {
@@ -467,7 +467,7 @@ public class ContainerOrderedWrapper
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Ordered#addItemAfter(Object)
+	 * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object)
 	 */
 	public Object addItemAfter(Object previousItemId)
 		throws UnsupportedOperationException {
diff --git a/src/com/enably/tk/data/util/FilesystemContainer.java b/src/com/itmill/toolkit/data/util/FilesystemContainer.java
index 4b4d882ef4..85e95899d2 100644
--- a/src/com/enably/tk/data/util/FilesystemContainer.java
+++ b/src/com/itmill/toolkit/data/util/FilesystemContainer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,11 +41,11 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
-import com.enably.tk.service.FileTypeResolver;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.service.FileTypeResolver;
+import com.itmill.toolkit.terminal.Resource;
 
 /** A hierarchical container wrapper for a filesystem.
  * 
@@ -618,7 +618,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 		}
 
 		/** Filesystem container does not support adding new properties.
-		 * @see com.enably.tk.data.Item#addItemProperty(Object, Property)
+		 * @see com.itmill.toolkit.data.Item#addItemProperty(Object, Property)
 		 */
 		public boolean addItemProperty(Object id, Property property)
 			throws UnsupportedOperationException {
@@ -628,7 +628,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 		}
 
 		/** Filesystem container does not support removing properties.
-		 * @see com.enably.tk.data.Item#removeItemProperty(Object)
+		 * @see com.itmill.toolkit.data.Item#removeItemProperty(Object)
 		 */
 		public boolean removeItemProperty(Object id)
 			throws UnsupportedOperationException {
@@ -701,7 +701,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#addContainerProperty(Object, Class, Object)
+	 * @see com.itmill.toolkit.data.Container#addContainerProperty(Object, Class, Object)
 	 */
 	public boolean addContainerProperty(
 		Object propertyId,
@@ -712,28 +712,28 @@ public class FilesystemContainer implements Container.Hierarchical {
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#addItem()
+	 * @see com.itmill.toolkit.data.Container#addItem()
 	 */
 	public Object addItem() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("File system container does not support this operation");
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#addItem(Object)
+	 * @see com.itmill.toolkit.data.Container#addItem(Object)
 	 */
 	public Item addItem(Object itemId) throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("File system container does not support this operation");
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#removeAllItems()
+	 * @see com.itmill.toolkit.data.Container#removeAllItems()
 	 */
 	public boolean removeAllItems() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("File system container does not support this operation");
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#removeItem(Object)
+	 * @see com.itmill.toolkit.data.Container#removeItem(Object)
 	 */
 	public boolean removeItem(Object itemId)
 		throws UnsupportedOperationException {
@@ -741,7 +741,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#removeContainerProperty(Object)
+	 * @see com.itmill.toolkit.data.Container#removeContainerProperty(Object)
 	 */
 	public boolean removeContainerProperty(Object propertyId)
 		throws UnsupportedOperationException {
diff --git a/src/com/enably/tk/data/util/HierarchicalContainer.java b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
index f705764243..479699c0b0 100644
--- a/src/com/enably/tk/data/util/HierarchicalContainer.java
+++ b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -34,8 +34,8 @@ import java.util.Collections;
 import java.util.Hashtable;
 import java.util.HashSet;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
 
 /** A specialized Container whose contents can be accessed like it was a
  * tree-like structure.
@@ -116,7 +116,7 @@ public class HierarchicalContainer
      * <code>areChildrenAllowed</code> is false this method fails and
      * <code>false</code> is returned; the children must be first explicitly
      * removed with {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.enably.tk.data.Container#removeItem(Object itemId)}.</p>
+     * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.</p>
      * 
      * @param itemId ID of the Item in the container whose child
      * capability is to be set
@@ -222,7 +222,7 @@ public class HierarchicalContainer
 		return true;
 	}
 	/**
-	 * @see com.enably.tk.data.Container#addItem()
+	 * @see com.itmill.toolkit.data.Container#addItem()
 	 */
 	public Object addItem() {
 		Object id = super.addItem();
@@ -233,7 +233,7 @@ public class HierarchicalContainer
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#addItem(Object)
+	 * @see com.itmill.toolkit.data.Container#addItem(Object)
 	 */
 	public Item addItem(Object itemId) {
 		Item item = super.addItem(itemId);
@@ -243,7 +243,7 @@ public class HierarchicalContainer
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#removeAllItems()
+	 * @see com.itmill.toolkit.data.Container#removeAllItems()
 	 */
 	public boolean removeAllItems() {
 		boolean success = super.removeAllItems();
@@ -258,7 +258,7 @@ public class HierarchicalContainer
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#removeItem(Object)
+	 * @see com.itmill.toolkit.data.Container#removeItem(Object)
 	 */
 	public boolean removeItem(Object itemId) {
 		boolean success = super.removeItem(itemId);
diff --git a/src/com/enably/tk/data/util/IndexedContainer.java b/src/com/itmill/toolkit/data/util/IndexedContainer.java
index 8831006a5a..aa06f787f0 100644
--- a/src/com/enably/tk/data/util/IndexedContainer.java
+++ b/src/com/itmill/toolkit/data/util/IndexedContainer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,32 +19,32 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.*;
 import java.lang.reflect.Constructor;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /**
  * Indexed container implementation.
  * <p>
- * A list implementation of the com.enably.tk.data.Container interface. A
+ * A list implementation of the com.itmill.toolkit.data.Container interface. A
  * list is a ordered collection wherein the user has a precise control over
  * where in the list each new Item is inserted. The user may access the Items by
  * their integer index (position in the list) or by their Item ID.
  * </p>
  * 
- * @see com.enably.tk.data.Container
+ * @see com.itmill.toolkit.data.Container
  * 
  * @author IT Mill Ltd.
  * @version
@@ -176,7 +176,7 @@ public class IndexedContainer implements Container, Container.Indexed,
      *            ID of the Property to retrieve
      * @return Property with the given ID or <code>null</code>
      * 
-     * @see com.enably.tk.data.Container#getContainerProperty(Object,
+     * @see com.itmill.toolkit.data.Container#getContainerProperty(Object,
      *      Object)
      */
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -450,7 +450,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#addItemAfter(Object,
+     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object,
      *      Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId) {
@@ -467,7 +467,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#addItemAfter(Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object)
      */
     public Object addItemAfter(Object previousItemId) {
 
@@ -507,7 +507,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Indexed#addItemAt(int, Object)
+     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int, Object)
      */
     public Item addItemAt(int index, Object newItemId) {
 
@@ -526,7 +526,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Indexed#addItemAt(int)
+     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int)
      */
     public Object addItemAt(int index) {
 
@@ -808,7 +808,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     /* Internal Item and Property implementations *************************** */
 
     /*
-     * A class implementing the com.enably.tk.data.Item interface to be
+     * A class implementing the com.itmill.toolkit.data.Item interface to be
      * contained in the list. @author IT Mill Ltd.
      * 
      * @version @VERSION@
@@ -917,7 +917,7 @@ public class IndexedContainer implements Container, Container.Indexed,
         /**
          * Indexed container does not support adding new properties.
          * 
-         * @see com.enably.tk.data.Item#addProperty(Object, Property)
+         * @see com.itmill.toolkit.data.Item#addProperty(Object, Property)
          */
         public boolean addItemProperty(Object id, Property property)
                 throws UnsupportedOperationException {
@@ -928,7 +928,7 @@ public class IndexedContainer implements Container, Container.Indexed,
         /**
          * Indexed container does not support removing properties.
          * 
-         * @see com.enably.tk.data.Item#removeProperty(Object)
+         * @see com.itmill.toolkit.data.Item#removeProperty(Object)
          */
         public boolean removeItemProperty(Object id)
                 throws UnsupportedOperationException {
@@ -939,7 +939,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     }
 
     /*
-     * A class implementing the com.enably.tk.data.Property interface to be
+     * A class implementing the com.itmill.toolkit.data.Property interface to be
      * contained in the Items contained in the list. @author IT Mill Ltd.
      * 
      * @version @VERSION@
@@ -1130,7 +1130,7 @@ public class IndexedContainer implements Container, Container.Indexed,
          * 
          * @param listener
          *            the new Listener to be registered
-         * @see com.enably.tk.data.Property.ValueChangeNotifier#addListener(ValueChangeListener)
+         * @see com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(ValueChangeListener)
          */
         public void addListener(Property.ValueChangeListener listener) {
             addSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1141,7 +1141,7 @@ public class IndexedContainer implements Container, Container.Indexed,
          * 
          * @param listener
          *            listener to be removed
-         * @see com.enably.tk.data.Property.ValueChangeNotifier#removeListener(ValueChangeListener)
+         * @see com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener(ValueChangeListener)
          */
         public void removeListener(Property.ValueChangeListener listener) {
             removeSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1156,7 +1156,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.itmill.toolkit.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      */
     public synchronized void sort(Object[] propertyId, boolean[] ascending) {
@@ -1192,7 +1192,7 @@ public class IndexedContainer implements Container, Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.data.Container.Sortable#getSortableContainerPropertyIds()
+     * @see com.itmill.toolkit.data.Container.Sortable#getSortableContainerPropertyIds()
      */
     public Collection getSortableContainerPropertyIds() {
 
diff --git a/src/com/enably/tk/data/util/MethodProperty.java b/src/com/itmill/toolkit/data/util/MethodProperty.java
index 8fe2e5b297..c6e7cc0f0f 100644
--- a/src/com/enably/tk/data/util/MethodProperty.java
+++ b/src/com/itmill/toolkit/data/util/MethodProperty.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
 import java.util.LinkedList;
 
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Property;
 
 /** <p>Proxy class for creating Properties from pairs of getter and setter
  * methods of a Bean property. An instance of this class can be thought as
diff --git a/src/com/enably/tk/data/util/ObjectProperty.java b/src/com/itmill/toolkit/data/util/ObjectProperty.java
index 27ef370298..47490011cf 100644
--- a/src/com/enably/tk/data/util/ObjectProperty.java
+++ b/src/com/itmill/toolkit/data/util/ObjectProperty.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,23 +19,23 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Property;
 
 import java.lang.reflect.Constructor;
 import java.util.LinkedList;
 
 /** A simple data object containing one typed value. This class is a
  * straightforward implementation of the the
- * {@link com.enably.tk.data.Property} interface.
+ * {@link com.itmill.toolkit.data.Property} interface.
  *
  * @author IT Mill Ltd.
  * @version @VERSION@
diff --git a/src/com/enably/tk/data/util/PropertysetItem.java b/src/com/itmill/toolkit/data/util/PropertysetItem.java
index 63abae496e..4aa82bd2a5 100644
--- a/src/com/enably/tk/data/util/PropertysetItem.java
+++ b/src/com/itmill/toolkit/data/util/PropertysetItem.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.util;
+package com.itmill.toolkit.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -35,8 +35,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /**
  * Class for handling a set of identified Properties. The elements contained in
diff --git a/src/com/enably/tk/data/util/package.html b/src/com/itmill/toolkit/data/util/package.html
index 499439a16c..499439a16c 100644
--- a/src/com/enably/tk/data/util/package.html
+++ b/src/com/itmill/toolkit/data/util/package.html
diff --git a/src/com/enably/tk/data/validator/CompositeValidator.java b/src/com/itmill/toolkit/data/validator/CompositeValidator.java
index c84809bd6f..bebec0439f 100644
--- a/src/com/enably/tk/data/validator/CompositeValidator.java
+++ b/src/com/itmill/toolkit/data/validator/CompositeValidator.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
   
-package com.enably.tk.data.validator;
+package com.itmill.toolkit.data.validator;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.enably.tk.data.*;
+import com.itmill.toolkit.data.*;
 
 /** Composite validator.
  * 
diff --git a/src/com/enably/tk/data/validator/NullValidator.java b/src/com/itmill/toolkit/data/validator/NullValidator.java
index a8b1ee586a..94ff69da4e 100644
--- a/src/com/enably/tk/data/validator/NullValidator.java
+++ b/src/com/itmill/toolkit/data/validator/NullValidator.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
   
-package com.enably.tk.data.validator;
+package com.itmill.toolkit.data.validator;
 
-import com.enably.tk.data.*;
+import com.itmill.toolkit.data.*;
 
 
 /* This validator is used for validating properties that 
diff --git a/src/com/enably/tk/data/validator/StringLengthValidator.java b/src/com/itmill/toolkit/data/validator/StringLengthValidator.java
index 7d8119fcf9..cbf62bb082 100644
--- a/src/com/enably/tk/data/validator/StringLengthValidator.java
+++ b/src/com/itmill/toolkit/data/validator/StringLengthValidator.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.data.validator;
+package com.itmill.toolkit.data.validator;
 
-import com.enably.tk.data.*;
+import com.itmill.toolkit.data.*;
 
 
 /**
diff --git a/src/com/enably/tk/data/validator/package.html b/src/com/itmill/toolkit/data/validator/package.html
index 8697eb6313..8697eb6313 100644
--- a/src/com/enably/tk/data/validator/package.html
+++ b/src/com/itmill/toolkit/data/validator/package.html
diff --git a/src/com/enably/tk/demo/Calc.java b/src/com/itmill/toolkit/demo/Calc.java
index 0ab649cc2a..9565e99d00 100644
--- a/src/com/enably/tk/demo/Calc.java
+++ b/src/com/itmill/toolkit/demo/Calc.java
@@ -1,6 +1,6 @@
-package com.enably.tk.demo;
+package com.itmill.toolkit.demo;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 /** <p>An example application implementing a simple web-based calculator.
  * using the MillStone UI library. The application opens up a window and
@@ -11,11 +11,11 @@ import com.enably.tk.ui.*;
  * button was pressed, figures what that button does, and updates the user
  * interface accordingly.</p>
  *
- * @see com.enably.tk.Application
- * @see com.enably.tk.ui.Button.ClickListener
+ * @see com.itmill.toolkit.Application
+ * @see com.itmill.toolkit.ui.Button.ClickListener
  */
 public class Calc
-	extends com.enably.tk.Application
+	extends com.itmill.toolkit.Application
 	implements Button.ClickListener {
 
 	/** The label used as the display */
@@ -45,7 +45,7 @@ public class Calc
 	public void init() {
 
 		/*
-		 * Create a new {@link com.enably.tk.ui.GridLayout GridLayout}
+		 * Create a new {@link com.itmill.toolkit.ui.GridLayout GridLayout}
 		 * to hold the UI components needed by the calculator.
 		 */
 		GridLayout layout = new GridLayout(4, 5);
diff --git a/src/com/enably/tk/demo/Chat.java b/src/com/itmill/toolkit/demo/Chat.java
index 41ad763e6f..9bafd960ef 100644
--- a/src/com/enably/tk/demo/Chat.java
+++ b/src/com/itmill/toolkit/demo/Chat.java
@@ -1,11 +1,11 @@
-package com.enably.tk.demo;
+package com.itmill.toolkit.demo;
 
 import java.io.*;
 import java.util.*;
 import java.lang.ref.WeakReference;
 
-import com.enably.tk.terminal.StreamResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.StreamResource;
+import com.itmill.toolkit.ui.*;
 
 /** Chat example application.
  * 
@@ -20,13 +20,13 @@ import com.enably.tk.ui.*;
  *  </ul>
  * </p>
  *
- * @see com.enably.tk.Application
- * @see com.enably.tk.ui.FrameWindow
- * @see com.enably.tk.terminal.StreamResource
+ * @see com.itmill.toolkit.Application
+ * @see com.itmill.toolkit.ui.FrameWindow
+ * @see com.itmill.toolkit.terminal.StreamResource
  */
 
 public class Chat
-	extends com.enably.tk.Application
+	extends com.itmill.toolkit.Application
 	implements StreamResource.StreamSource, Button.ClickListener {
 
 	/** Linked list of Chat applications who participate the discussion */
diff --git a/src/com/enably/tk/demo/HelloWorld.java b/src/com/itmill/toolkit/demo/HelloWorld.java
index f69f451a0e..ca116a54c9 100644
--- a/src/com/enably/tk/demo/HelloWorld.java
+++ b/src/com/itmill/toolkit/demo/HelloWorld.java
@@ -1,21 +1,21 @@
-package com.enably.tk.demo;
+package com.itmill.toolkit.demo;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 /** The classic "hello, world!" example for the MillStone framework. The
  * class simply implements the abstract 
- * {@link com.enably.tk.Application#init() init()} method
+ * {@link com.itmill.toolkit.Application#init() init()} method
  * in which it creates a Window and adds a Label to it.
  *
  * @author IT Mill Ltd.
- * @see com.enably.tk.Application
- * @see com.enably.tk.ui.Window
- * @see com.enably.tk.ui.Label
+ * @see com.itmill.toolkit.Application
+ * @see com.itmill.toolkit.ui.Window
+ * @see com.itmill.toolkit.ui.Label
  */
-public class HelloWorld extends com.enably.tk.Application {
+public class HelloWorld extends com.itmill.toolkit.Application {
 
 	/** The initialization method that is the only requirement for
-	 * inheriting the com.enably.tk.service.Application class. It will
+	 * inheriting the com.itmill.toolkit.service.Application class. It will
 	 * be automatically called by the framework when a user accesses the
 	 * application.
 	 */
diff --git a/src/com/enably/tk/demo/Login.java b/src/com/itmill/toolkit/demo/Login.java
index 97ca5cf8fe..d9949d356a 100644
--- a/src/com/enably/tk/demo/Login.java
+++ b/src/com/itmill/toolkit/demo/Login.java
@@ -1,16 +1,16 @@
-package com.enably.tk.demo;
+package com.itmill.toolkit.demo;
 
-import com.enably.tk.Application;
-import com.enably.tk.data.*;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.data.*;
+import com.itmill.toolkit.ui.*;
 
 /** <p>Example application demonstrating simple user login.</p>
  *
  * @author IT Mill Ltd.
- * @see com.enably.tk.service.Application
- * @see com.enably.tk.ui.Window
- * @see com.enably.tk.ui.TextField
- * @see com.enably.tk.ui.Button
+ * @see com.itmill.toolkit.service.Application
+ * @see com.itmill.toolkit.ui.Window
+ * @see com.itmill.toolkit.ui.TextField
+ * @see com.itmill.toolkit.ui.Button
  */
 public class Login
 	extends Application
diff --git a/src/com/enably/tk/demo/features/Feature.java b/src/com/itmill/toolkit/demo/features/Feature.java
index 8e73eb082b..003f884ac1 100644
--- a/src/com/enably/tk/demo/features/Feature.java
+++ b/src/com/itmill/toolkit/demo/features/Feature.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.terminal.ClassResource;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.ClassResource;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.ui.*;
 
 public class Feature extends CustomComponent {
 
diff --git a/src/com/enably/tk/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
index 7656e4ffba..42420041f5 100644
--- a/src/com/enably/tk/demo/features/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import com.enably.tk.data.*;
-import com.enably.tk.terminal.ClassResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.data.*;
+import com.itmill.toolkit.terminal.ClassResource;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureBrowser
 	extends CustomComponent
diff --git a/src/com/enably/tk/demo/features/FeatureBuffering.java b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
index ed591a51e1..a02215cd36 100644
--- a/src/com/enably/tk/demo/features/FeatureBuffering.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class FeatureBuffering extends Feature {
 	protected String getExampleSrc() {
@@ -37,7 +37,7 @@ public class FeatureBuffering extends Feature {
 		return "Buffering";
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "<p>Millstone data model provides interface for implementing "
@@ -59,7 +59,7 @@ public class FeatureBuffering extends Feature {
 	}
 
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getImage()
+	 * @see com.itmill.toolkit.demo.features.Feature#getImage()
 	 */
 	protected String getImage() {
 		return "buffering.jpg";
diff --git a/src/com/enably/tk/demo/features/FeatureButton.java b/src/com/itmill/toolkit/demo/features/FeatureButton.java
index 18ed7ccf05..584b7c41d1 100644
--- a/src/com/enably/tk/demo/features/FeatureButton.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureButton.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureButton extends Feature {
 
@@ -66,7 +66,7 @@ public class FeatureButton extends Feature {
 	}
 
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "In Millstone, boolean input values are represented by buttons. "
diff --git a/src/com/enably/tk/demo/features/FeatureContainers.java b/src/com/itmill/toolkit/demo/features/FeatureContainers.java
index a71708a63e..5cc6a32dfe 100644
--- a/src/com/enably/tk/demo/features/FeatureContainers.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureContainers.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class FeatureContainers extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureCustomLayout.java b/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
index 18e5446a1c..c87d6318b7 100644
--- a/src/com/enably/tk/demo/features/FeatureCustomLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureCustomLayout extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureDateField.java b/src/com/itmill/toolkit/demo/features/FeatureDateField.java
index 3c1aa302d8..74547ce238 100644
--- a/src/com/enably/tk/demo/features/FeatureDateField.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureDateField.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.Locale;
 
-import com.enably.tk.data.util.IndexedContainer;
-import com.enably.tk.data.util.MethodProperty;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.data.util.IndexedContainer;
+import com.itmill.toolkit.data.util.MethodProperty;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureDateField extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureEmbedded.java b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
index 484612107a..e9c447d385 100644
--- a/src/com/enably/tk/demo/features/FeatureEmbedded.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.terminal.ClassResource;
-import com.enably.tk.terminal.Sizeable;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.ClassResource;
+import com.itmill.toolkit.terminal.Sizeable;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureEmbedded extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureForm.java b/src/com/itmill/toolkit/demo/features/FeatureForm.java
index da6ebd4b24..87f70aa340 100644
--- a/src/com/enably/tk/demo/features/FeatureForm.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureForm.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.Date;
 
-import com.enably.tk.data.Property;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureForm
 	extends Feature
diff --git a/src/com/enably/tk/demo/features/FeatureFrameWindow.java b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
index b0d1eac254..bf78a5e7ae 100644
--- a/src/com/enably/tk/demo/features/FeatureFrameWindow.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.HashMap;
 import java.util.List;
 
-import com.enably.tk.ui.*;
-import com.enably.tk.ui.Button.ClickEvent;
+import com.itmill.toolkit.ui.*;
+import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class FeatureFrameWindow
 	extends Feature
diff --git a/src/com/enably/tk/demo/features/FeatureGridLayout.java b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
index 8b52f0f9b0..6f1499bc6b 100644
--- a/src/com/enably/tk/demo/features/FeatureGridLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.Date;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureGridLayout extends Feature {
 
@@ -73,7 +73,7 @@ public class FeatureGridLayout extends Feature {
 			+ "gl.addComponent(new Label(\"Label 4 in GridLayout\"));\n";
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "<p>This feature provides a container that lays out components "
diff --git a/src/com/enably/tk/demo/features/FeatureItems.java b/src/com/itmill/toolkit/demo/features/FeatureItems.java
index bfa7333c5f..c089c70b3e 100644
--- a/src/com/enably/tk/demo/features/FeatureItems.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureItems.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class FeatureItems extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureLabel.java b/src/com/itmill/toolkit/demo/features/FeatureLabel.java
index 687cd163f4..2c7f9fc826 100644
--- a/src/com/enably/tk/demo/features/FeatureLabel.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureLabel.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureLabel extends Feature {
 
@@ -74,7 +74,7 @@ public class FeatureLabel extends Feature {
 		return "Label l = new Label(\"Caption\");\n";
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "Labels components are for captions and plain text. "
diff --git a/src/com/enably/tk/demo/features/FeatureLink.java b/src/com/itmill/toolkit/demo/features/FeatureLink.java
index b70e54afbd..7b586c3666 100644
--- a/src/com/enably/tk/demo/features/FeatureLink.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureLink.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,17 +19,17 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureLink extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureOrderedLayout.java b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
index 8dc7940bcd..7a5acfefac 100644
--- a/src/com/enably/tk/demo/features/FeatureOrderedLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureOrderedLayout extends Feature {
 
@@ -76,7 +76,7 @@ public class FeatureOrderedLayout extends Feature {
 
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "This feature provides a container for laying out components either "
diff --git a/src/com/enably/tk/demo/features/FeaturePanel.java b/src/com/itmill/toolkit/demo/features/FeaturePanel.java
index d4cb4eef97..031eefaa61 100644
--- a/src/com/enably/tk/demo/features/FeaturePanel.java
+++ b/src/com/itmill/toolkit/demo/features/FeaturePanel.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeaturePanel extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureParameters.java b/src/com/itmill/toolkit/demo/features/FeatureParameters.java
index b4aef7ce94..9c5887f19f 100644
--- a/src/com/enably/tk/demo/features/FeatureParameters.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureParameters.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,24 +19,24 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.enably.tk.terminal.DownloadStream;
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.terminal.ParameterHandler;
-import com.enably.tk.terminal.URIHandler;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.DownloadStream;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.terminal.ParameterHandler;
+import com.itmill.toolkit.terminal.URIHandler;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureParameters
 	extends Feature
@@ -111,7 +111,7 @@ public class FeatureParameters
 	}
 
 	/** Add URI and parametes handlers to window.
-	 * @see com.enably.tk.ui.Component#attach()
+	 * @see com.itmill.toolkit.ui.Component#attach()
 	 */
 	public void attach() {
 		super.attach();
@@ -120,7 +120,7 @@ public class FeatureParameters
 	}
 
 	/** Remove all handlers from window
-	 * @see com.enably.tk.ui.Component#detach()
+	 * @see com.itmill.toolkit.ui.Component#detach()
 	 */
 	public void detach() {
 		super.detach();
@@ -129,7 +129,7 @@ public class FeatureParameters
 	}
 
 	/** Update URI
-	 * @see com.enably.tk.terminal.URIHandler#handleURI(URL, String)
+	 * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
 	 */
 	public DownloadStream handleURI(URL context, String relativeUri) {
 		this.context.setValue(context.toString());
@@ -138,7 +138,7 @@ public class FeatureParameters
 	}
 
 	/** Update parameters table
-	 * @see com.enably.tk.terminal.ParameterHandler#handleParameters(Map)
+	 * @see com.itmill.toolkit.terminal.ParameterHandler#handleParameters(Map)
 	 */
 	public void handleParameters(Map parameters) {
 		params.removeAllItems();
diff --git a/src/com/enably/tk/demo/features/FeatureProperties.java b/src/com/itmill/toolkit/demo/features/FeatureProperties.java
index 0f59f88c9e..52efc42489 100644
--- a/src/com/enably/tk/demo/features/FeatureProperties.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureProperties.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class FeatureProperties extends Feature {
 
@@ -61,7 +61,7 @@ public class FeatureProperties extends Feature {
 	}
 
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getImage()
+	 * @see com.itmill.toolkit.demo.features.Feature#getImage()
 	 */
 	protected String getImage() {
 		return "properties.jpg";
diff --git a/src/com/enably/tk/demo/features/FeatureSelect.java b/src/com/itmill/toolkit/demo/features/FeatureSelect.java
index ee006d367c..6b0e4087d2 100644
--- a/src/com/enably/tk/demo/features/FeatureSelect.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureSelect.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureSelect extends Feature {
 
@@ -71,7 +71,7 @@ public class FeatureSelect extends Feature {
 
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "The select component combines two different modes of item selection.  "
diff --git a/src/com/enably/tk/demo/features/FeatureServerEvents.java b/src/com/itmill/toolkit/demo/features/FeatureServerEvents.java
index ebc8ebefdb..cdf371a91d 100644
--- a/src/com/enably/tk/demo/features/FeatureServerEvents.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureServerEvents.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureServerEvents extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureTabSheet.java b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
index 1a7da5f526..ef7ff5b7d7 100644
--- a/src/com/enably/tk/demo/features/FeatureTabSheet.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureTabSheet extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureTable.java b/src/com/itmill/toolkit/demo/features/FeatureTable.java
index 28c3f1b51f..013031dabb 100644
--- a/src/com/enably/tk/demo/features/FeatureTable.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,17 +19,17 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.event.Action;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.event.Action;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureTable extends Feature implements Action.Handler {
 
diff --git a/src/com/enably/tk/demo/features/FeatureTextField.java b/src/com/itmill/toolkit/demo/features/FeatureTextField.java
index d678f74c5c..68766ea57d 100644
--- a/src/com/enably/tk/demo/features/FeatureTextField.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTextField.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureTextField extends Feature {
 
@@ -70,7 +70,7 @@ public class FeatureTextField extends Feature {
 			+ "tf.setValue(\"Contents\");";
 	}
 	/**
-	 * @see com.enably.tk.demo.features.Feature#getDescriptionXHTML()
+	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
 		return "<p>Millstone combines the logic of both the single line text-entry field and the multi-line "
diff --git a/src/com/enably/tk/demo/features/FeatureTree.java b/src/com/itmill/toolkit/demo/features/FeatureTree.java
index 9737ca3989..b832655772 100644
--- a/src/com/enably/tk/demo/features/FeatureTree.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTree.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.util.Iterator;
 
-import com.enably.tk.event.Action;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.event.Action;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureTree extends Feature implements Action.Handler {
 
diff --git a/src/com/enably/tk/demo/features/FeatureUpload.java b/src/com/itmill/toolkit/demo/features/FeatureUpload.java
index b0b8c9765b..64d89cfb12 100644
--- a/src/com/enably/tk/demo/features/FeatureUpload.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureUpload.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,28 +19,28 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.enably.tk.terminal.StreamResource;
-import com.enably.tk.ui.Component;
-import com.enably.tk.ui.Label;
-import com.enably.tk.ui.Link;
-import com.enably.tk.ui.OrderedLayout;
-import com.enably.tk.ui.Panel;
-import com.enably.tk.ui.Upload;
-import com.enably.tk.ui.Upload.FinishedEvent;
+import com.itmill.toolkit.terminal.StreamResource;
+import com.itmill.toolkit.ui.Component;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Link;
+import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.Upload;
+import com.itmill.toolkit.ui.Upload.FinishedEvent;
 
 public class FeatureUpload
 	extends Feature
@@ -150,7 +150,7 @@ public class FeatureUpload
 		}
 
 		/**
-		 * @see com.enably.tk.ui.Upload.Receiver#receiveUpload(String, String)
+		 * @see com.itmill.toolkit.ui.Upload.Receiver#receiveUpload(String, String)
 		 */
 		public OutputStream receiveUpload(String filename, String MIMEType) {
 			fileName = filename;
diff --git a/src/com/enably/tk/demo/features/FeatureValidators.java b/src/com/itmill/toolkit/demo/features/FeatureValidators.java
index 0d4ef9ae3e..ac19f02b48 100644
--- a/src/com/enably/tk/demo/features/FeatureValidators.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureValidators.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class FeatureValidators extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/FeatureWindow.java b/src/com/itmill/toolkit/demo/features/FeatureWindow.java
index 546e298469..a08b94afdc 100644
--- a/src/com/enably/tk/demo/features/FeatureWindow.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureWindow.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeatureWindow extends Feature {
 	Button addButton = new Button("Add to application", this, "addWin");
diff --git a/src/com/enably/tk/demo/features/FeaturesApplication.java b/src/com/itmill/toolkit/demo/features/FeaturesApplication.java
index b53e0ab106..a4951b8326 100644
--- a/src/com/enably/tk/demo/features/FeaturesApplication.java
+++ b/src/com/itmill/toolkit/demo/features/FeaturesApplication.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.ui.*;
 
 public class FeaturesApplication
-	extends com.enably.tk.Application {
+	extends com.itmill.toolkit.Application {
 
 	public void init() {
 		Window main = new Window("Millstone Features Tour");
diff --git a/src/com/enably/tk/demo/features/PropertyPanel.java b/src/com/itmill/toolkit/demo/features/PropertyPanel.java
index fdc92d8d0b..b25c66f0f0 100644
--- a/src/com/enably/tk/demo/features/PropertyPanel.java
+++ b/src/com/itmill/toolkit/demo/features/PropertyPanel.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -37,10 +37,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.enably.tk.data.*;
-import com.enably.tk.data.util.*;
-import com.enably.tk.terminal.*;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.data.*;
+import com.itmill.toolkit.data.util.*;
+import com.itmill.toolkit.terminal.*;
+import com.itmill.toolkit.ui.*;
 
 public class PropertyPanel
 	extends Panel
diff --git a/src/com/enably/tk/demo/features/UIComponents.java b/src/com/itmill/toolkit/demo/features/UIComponents.java
index e4eb2d6b65..f51776a0e2 100644
--- a/src/com/enably/tk/demo/features/UIComponents.java
+++ b/src/com/itmill/toolkit/demo/features/UIComponents.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.demo.features;
+package com.itmill.toolkit.demo.features;
 
 public class UIComponents extends Feature {
 
diff --git a/src/com/enably/tk/demo/features/buffering.jpg b/src/com/itmill/toolkit/demo/features/buffering.jpg
index 23f1e89f29..23f1e89f29 100644
--- a/src/com/enably/tk/demo/features/buffering.jpg
+++ b/src/com/itmill/toolkit/demo/features/buffering.jpg
diff --git a/src/com/enably/tk/demo/features/button.jpg b/src/com/itmill/toolkit/demo/features/button.jpg
index c7e4bf8e3c..c7e4bf8e3c 100644
--- a/src/com/enably/tk/demo/features/button.jpg
+++ b/src/com/itmill/toolkit/demo/features/button.jpg
diff --git a/src/com/enably/tk/demo/features/containers.jpg b/src/com/itmill/toolkit/demo/features/containers.jpg
index 863e1342b1..863e1342b1 100644
--- a/src/com/enably/tk/demo/features/containers.jpg
+++ b/src/com/itmill/toolkit/demo/features/containers.jpg
diff --git a/src/com/enably/tk/demo/features/customlayout.jpg b/src/com/itmill/toolkit/demo/features/customlayout.jpg
index b668b3c27d..b668b3c27d 100644
--- a/src/com/enably/tk/demo/features/customlayout.jpg
+++ b/src/com/itmill/toolkit/demo/features/customlayout.jpg
diff --git a/src/com/enably/tk/demo/features/datefield.jpg b/src/com/itmill/toolkit/demo/features/datefield.jpg
index c035175541..c035175541 100644
--- a/src/com/enably/tk/demo/features/datefield.jpg
+++ b/src/com/itmill/toolkit/demo/features/datefield.jpg
diff --git a/src/com/enably/tk/demo/features/embedded.jpg b/src/com/itmill/toolkit/demo/features/embedded.jpg
index c428192c44..c428192c44 100644
--- a/src/com/enably/tk/demo/features/embedded.jpg
+++ b/src/com/itmill/toolkit/demo/features/embedded.jpg
diff --git a/src/com/enably/tk/demo/features/filetransfer.jpg b/src/com/itmill/toolkit/demo/features/filetransfer.jpg
index 4c2ceb0008..4c2ceb0008 100644
--- a/src/com/enably/tk/demo/features/filetransfer.jpg
+++ b/src/com/itmill/toolkit/demo/features/filetransfer.jpg
diff --git a/src/com/enably/tk/demo/features/form.jpg b/src/com/itmill/toolkit/demo/features/form.jpg
index d9993bdbe6..d9993bdbe6 100644
--- a/src/com/enably/tk/demo/features/form.jpg
+++ b/src/com/itmill/toolkit/demo/features/form.jpg
diff --git a/src/com/enably/tk/demo/features/framewindow.jpg b/src/com/itmill/toolkit/demo/features/framewindow.jpg
index 725df76ee3..725df76ee3 100644
--- a/src/com/enably/tk/demo/features/framewindow.jpg
+++ b/src/com/itmill/toolkit/demo/features/framewindow.jpg
diff --git a/src/com/enably/tk/demo/features/gridlayout.jpg b/src/com/itmill/toolkit/demo/features/gridlayout.jpg
index 63f06c3281..63f06c3281 100644
--- a/src/com/enably/tk/demo/features/gridlayout.jpg
+++ b/src/com/itmill/toolkit/demo/features/gridlayout.jpg
diff --git a/src/com/enably/tk/demo/features/items.jpg b/src/com/itmill/toolkit/demo/features/items.jpg
index fb5a38d55e..fb5a38d55e 100644
--- a/src/com/enably/tk/demo/features/items.jpg
+++ b/src/com/itmill/toolkit/demo/features/items.jpg
diff --git a/src/com/enably/tk/demo/features/label.jpg b/src/com/itmill/toolkit/demo/features/label.jpg
index 402dc4d4c5..402dc4d4c5 100644
--- a/src/com/enably/tk/demo/features/label.jpg
+++ b/src/com/itmill/toolkit/demo/features/label.jpg
diff --git a/src/com/enably/tk/demo/features/link.jpg b/src/com/itmill/toolkit/demo/features/link.jpg
index 6aaa06e5d4..6aaa06e5d4 100644
--- a/src/com/enably/tk/demo/features/link.jpg
+++ b/src/com/itmill/toolkit/demo/features/link.jpg
diff --git a/src/com/enably/tk/demo/features/m.gif b/src/com/itmill/toolkit/demo/features/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/src/com/enably/tk/demo/features/m.gif
+++ b/src/com/itmill/toolkit/demo/features/m.gif
diff --git a/src/com/enably/tk/demo/features/millstone-logo.gif b/src/com/itmill/toolkit/demo/features/millstone-logo.gif
index 05da85723e..05da85723e 100644
--- a/src/com/enably/tk/demo/features/millstone-logo.gif
+++ b/src/com/itmill/toolkit/demo/features/millstone-logo.gif
diff --git a/src/com/enably/tk/demo/features/orderedlayout.jpg b/src/com/itmill/toolkit/demo/features/orderedlayout.jpg
index 1724c7cb62..1724c7cb62 100644
--- a/src/com/enably/tk/demo/features/orderedlayout.jpg
+++ b/src/com/itmill/toolkit/demo/features/orderedlayout.jpg
diff --git a/src/com/enably/tk/demo/features/panel.jpg b/src/com/itmill/toolkit/demo/features/panel.jpg
index dd06508b30..dd06508b30 100644
--- a/src/com/enably/tk/demo/features/panel.jpg
+++ b/src/com/itmill/toolkit/demo/features/panel.jpg
diff --git a/src/com/enably/tk/demo/features/parameters.jpg b/src/com/itmill/toolkit/demo/features/parameters.jpg
index f4e5fd577c..f4e5fd577c 100644
--- a/src/com/enably/tk/demo/features/parameters.jpg
+++ b/src/com/itmill/toolkit/demo/features/parameters.jpg
diff --git a/src/com/enably/tk/demo/features/properties.jpg b/src/com/itmill/toolkit/demo/features/properties.jpg
index 3c2ef430f2..3c2ef430f2 100644
--- a/src/com/enably/tk/demo/features/properties.jpg
+++ b/src/com/itmill/toolkit/demo/features/properties.jpg
diff --git a/src/com/enably/tk/demo/features/select.jpg b/src/com/itmill/toolkit/demo/features/select.jpg
index 1ce629fb68..1ce629fb68 100644
--- a/src/com/enably/tk/demo/features/select.jpg
+++ b/src/com/itmill/toolkit/demo/features/select.jpg
diff --git a/src/com/enably/tk/demo/features/serverevents.jpg b/src/com/itmill/toolkit/demo/features/serverevents.jpg
index 36d88a8b35..36d88a8b35 100644
--- a/src/com/enably/tk/demo/features/serverevents.jpg
+++ b/src/com/itmill/toolkit/demo/features/serverevents.jpg
diff --git a/src/com/enably/tk/demo/features/table.jpg b/src/com/itmill/toolkit/demo/features/table.jpg
index fe0f30dbf4..fe0f30dbf4 100644
--- a/src/com/enably/tk/demo/features/table.jpg
+++ b/src/com/itmill/toolkit/demo/features/table.jpg
diff --git a/src/com/enably/tk/demo/features/tabsheet.jpg b/src/com/itmill/toolkit/demo/features/tabsheet.jpg
index 402b2a464a..402b2a464a 100644
--- a/src/com/enably/tk/demo/features/tabsheet.jpg
+++ b/src/com/itmill/toolkit/demo/features/tabsheet.jpg
diff --git a/src/com/enably/tk/demo/features/textfield.gif b/src/com/itmill/toolkit/demo/features/textfield.gif
index 58b6e57e32..58b6e57e32 100644
--- a/src/com/enably/tk/demo/features/textfield.gif
+++ b/src/com/itmill/toolkit/demo/features/textfield.gif
diff --git a/src/com/enably/tk/demo/features/tree.jpg b/src/com/itmill/toolkit/demo/features/tree.jpg
index d563b90eb4..d563b90eb4 100644
--- a/src/com/enably/tk/demo/features/tree.jpg
+++ b/src/com/itmill/toolkit/demo/features/tree.jpg
diff --git a/src/com/enably/tk/demo/features/ui-components.gif b/src/com/itmill/toolkit/demo/features/ui-components.gif
index 8f5ef507c0..8f5ef507c0 100644
--- a/src/com/enably/tk/demo/features/ui-components.gif
+++ b/src/com/itmill/toolkit/demo/features/ui-components.gif
diff --git a/src/com/enably/tk/demo/features/validators.gif b/src/com/itmill/toolkit/demo/features/validators.gif
index 55faff1796..55faff1796 100644
--- a/src/com/enably/tk/demo/features/validators.gif
+++ b/src/com/itmill/toolkit/demo/features/validators.gif
diff --git a/src/com/enably/tk/demo/features/window.jpg b/src/com/itmill/toolkit/demo/features/window.jpg
index c297341523..c297341523 100644
--- a/src/com/enably/tk/demo/features/window.jpg
+++ b/src/com/itmill/toolkit/demo/features/window.jpg
diff --git a/src/com/enably/tk/demo/gogame/Board.java b/src/com/itmill/toolkit/demo/gogame/Board.java
index f57751b60c..db37d1262b 100644
--- a/src/com/enably/tk/demo/gogame/Board.java
+++ b/src/com/itmill/toolkit/demo/gogame/Board.java
@@ -1,12 +1,12 @@
-package com.enably.tk.demo.gogame;
+package com.itmill.toolkit.demo.gogame;
 
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.ui.AbstractComponent;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.ui.AbstractComponent;
 
 public class Board extends AbstractComponent implements Game.Listener {
 
diff --git a/src/com/enably/tk/demo/gogame/Game.java b/src/com/itmill/toolkit/demo/gogame/Game.java
index 3cdf8447d5..5e5a8d1fe2 100644
--- a/src/com/enably/tk/demo/gogame/Game.java
+++ b/src/com/itmill/toolkit/demo/gogame/Game.java
@@ -1,4 +1,4 @@
-package com.enably.tk.demo.gogame;
+package com.itmill.toolkit.demo.gogame;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/com/enably/tk/demo/gogame/Go.java b/src/com/itmill/toolkit/demo/gogame/Go.java
index 875e0c046d..556f4e5c3d 100644
--- a/src/com/enably/tk/demo/gogame/Go.java
+++ b/src/com/itmill/toolkit/demo/gogame/Go.java
@@ -1,16 +1,16 @@
-package com.enably.tk.demo.gogame;
+package com.itmill.toolkit.demo.gogame;
 
-import com.enably.tk.Application;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
-import com.enably.tk.data.util.IndexedContainer;
-import com.enably.tk.event.*;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.data.util.IndexedContainer;
+import com.itmill.toolkit.event.*;
+import com.itmill.toolkit.ui.*;
 
 /** The classic game 'Go' as an example for the Millstone framework. 
  *
  * @author IT Mill Ltd.
- * @see com.enably.tk.Application
+ * @see com.itmill.toolkit.Application
  */
 public class Go
 	extends Application
@@ -48,7 +48,7 @@ public class Go
 	private Board board = null;
 
 	/** The initialization method that is the only requirement for
-	 * inheriting the com.enably.tk.service.Application class. It will
+	 * inheriting the com.itmill.toolkit.service.Application class. It will
 	 * be automatically called by the framework when a user accesses the
 	 * application.
 	 * We'll initialize our components here.
@@ -118,7 +118,7 @@ public class Go
 
 	/** Implementing the Action.Handler interface - this function returns
 	 * the available actions.
-	 * @see com.enably.tk.event.Action.Handler
+	 * @see com.itmill.toolkit.event.Action.Handler
 	 */
 	public Action[] getActions(Object target, Object source) {
 		Property p = players.getContainerProperty(target, "Current game");
@@ -135,7 +135,7 @@ public class Go
 
 	/** Implementing the Action.Handler interface - this function handles
 	 * the specified action.
-	 * @see com.enably.tk.event.Action.Handler
+	 * @see com.itmill.toolkit.event.Action.Handler
 	 */
 	public void handleAction(Action action, Object sender, Object target) {
 		if (action == challengeAction) {
@@ -154,7 +154,7 @@ public class Go
 
 	/** Implementing the Property.ValueChangeListener interface - this function 
 	 * is called when a value change event occurs.
-	 * @see com.enably.tk.data.Property.ValueChangeListener
+	 * @see com.itmill.toolkit.data.Property.ValueChangeListener
 	 */
 	public void valueChange(Property.ValueChangeEvent event) {
 		if (board != null)
diff --git a/src/com/enably/tk/demo/package.html b/src/com/itmill/toolkit/demo/package.html
index ebff0df337..ebff0df337 100644
--- a/src/com/enably/tk/demo/package.html
+++ b/src/com/itmill/toolkit/demo/package.html
diff --git a/src/com/enably/tk/demo/table/TableDemoApplication.java b/src/com/itmill/toolkit/demo/table/TableDemoApplication.java
index 25ea227764..ecd9f98ca4 100644
--- a/src/com/enably/tk/demo/table/TableDemoApplication.java
+++ b/src/com/itmill/toolkit/demo/table/TableDemoApplication.java
@@ -1,21 +1,21 @@
 
-package com.enably.tk.demo.table;
+package com.itmill.toolkit.demo.table;
 
-import com.enably.tk.Application;
-import com.enably.tk.event.Action;
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.ui.Button;
-import com.enably.tk.ui.DateField;
-import com.enably.tk.ui.GridLayout;
-import com.enably.tk.ui.Label;
-import com.enably.tk.ui.Link;
-import com.enably.tk.ui.Panel;
-import com.enably.tk.ui.Select;
-import com.enably.tk.ui.TabSheet;
-import com.enably.tk.ui.Table;
-import com.enably.tk.ui.TextField;
-import com.enably.tk.ui.Tree;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.event.Action;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.DateField;
+import com.itmill.toolkit.ui.GridLayout;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Link;
+import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.Select;
+import com.itmill.toolkit.ui.TabSheet;
+import com.itmill.toolkit.ui.Table;
+import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.Tree;
+import com.itmill.toolkit.ui.Window;
 
 
 public class TableDemoApplication extends Application implements Action.Handler {
diff --git a/src/com/enably/tk/event/Action.java b/src/com/itmill/toolkit/event/Action.java
index cec1023d8f..ce61c97022 100644
--- a/src/com/enably/tk/event/Action.java
+++ b/src/com/itmill/toolkit/event/Action.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.event;
+package com.itmill.toolkit.event;
 
-import com.enably.tk.terminal.*;
+import com.itmill.toolkit.terminal.*;
 
 /** Implements the MillStone action framework. This class contains
  * subinterfaces for action handling and listing, and for action handler
diff --git a/src/com/enably/tk/event/EventRouter.java b/src/com/itmill/toolkit/event/EventRouter.java
index bbe1a31d36..db83085300 100644
--- a/src/com/enably/tk/event/EventRouter.java
+++ b/src/com/itmill/toolkit/event/EventRouter.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.event;
+package com.itmill.toolkit.event;
 
 import java.util.EventObject;
 import java.util.LinkedList;
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
 
 /** Event router class implementing the MillStone inheritable event
  * listening model. For more information on the event model see the
- * {@link com.enably.tk.event package documentation}.
+ * {@link com.itmill.toolkit.event package documentation}.
  *
  * @author IT Mill Ltd.
  * @version @VERSION@
diff --git a/src/com/enably/tk/event/ListenerMethod.java b/src/com/itmill/toolkit/event/ListenerMethod.java
index 449dcb51fe..0d899e420c 100644
--- a/src/com/enably/tk/event/ListenerMethod.java
+++ b/src/com/itmill/toolkit/event/ListenerMethod.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.event;
+package com.itmill.toolkit.event;
 
 import java.util.EventListener;
 import java.util.EventObject;
diff --git a/src/com/enably/tk/event/MethodEventSource.java b/src/com/itmill/toolkit/event/MethodEventSource.java
index 10927d1d83..fa994ee9b7 100644
--- a/src/com/enably/tk/event/MethodEventSource.java
+++ b/src/com/itmill/toolkit/event/MethodEventSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.event;
+package com.itmill.toolkit.event;
 
 import java.lang.reflect.Method;
 
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
  * 
  * <p>For more information on the MillStone inheritable event mechanism
  * see the 
- * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+ * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
  * 
  * @author IT Mill Ltd.
  * @version @VERSION@
@@ -50,7 +50,7 @@ public interface MethodEventSource {
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType type of the listened event. Events of this type or
 	 * its subclasses activate the listener.
@@ -73,7 +73,7 @@ public interface MethodEventSource {
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType type of the listened event. Events of this type or
 	 * its subclasses activate the listener.
@@ -92,7 +92,7 @@ public interface MethodEventSource {
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
@@ -106,7 +106,7 @@ public interface MethodEventSource {
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
@@ -127,7 +127,7 @@ public interface MethodEventSource {
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
diff --git a/src/com/enably/tk/event/package.html b/src/com/itmill/toolkit/event/package.html
index bd1faf7e89..bd1faf7e89 100644
--- a/src/com/enably/tk/event/package.html
+++ b/src/com/itmill/toolkit/event/package.html
diff --git a/src/com/enably/tk/package.html b/src/com/itmill/toolkit/package.html
index 661219adeb..661219adeb 100644
--- a/src/com/enably/tk/package.html
+++ b/src/com/itmill/toolkit/package.html
diff --git a/src/com/enably/tk/service/ApplicationContext.java b/src/com/itmill/toolkit/service/ApplicationContext.java
index 253d950433..2cc36fe2b9 100644
--- a/src/com/enably/tk/service/ApplicationContext.java
+++ b/src/com/itmill/toolkit/service/ApplicationContext.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.service;
+package com.itmill.toolkit.service;
 
 import java.io.File;
 import java.util.Collection;
 
-import com.enably.tk.Application;
+import com.itmill.toolkit.Application;
 
 /** Application context provides information about the running context of
  * the application. Each context is shared by all applications that are open
diff --git a/src/com/enably/tk/service/FileTypeResolver.java b/src/com/itmill/toolkit/service/FileTypeResolver.java
index 45328462e8..39f16796cd 100644
--- a/src/com/enably/tk/service/FileTypeResolver.java
+++ b/src/com/itmill/toolkit/service/FileTypeResolver.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.service;
+package com.itmill.toolkit.service;
 
 import java.io.File;
 import java.util.Collections;
@@ -34,8 +34,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.ThemeResource;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.ThemeResource;
 
 /** Utility class that can figure out mime-types and icons related to files.
  * Note that the icons are associated purely to mime-types, so a file
diff --git a/src/com/enably/tk/service/package.html b/src/com/itmill/toolkit/service/package.html
index 393fe83544..393fe83544 100644
--- a/src/com/enably/tk/service/package.html
+++ b/src/com/itmill/toolkit/service/package.html
diff --git a/src/com/enably/tk/terminal/ApplicationResource.java b/src/com/itmill/toolkit/terminal/ApplicationResource.java
index 5ce5dd03cd..dcbc23321a 100644
--- a/src/com/enably/tk/terminal/ApplicationResource.java
+++ b/src/com/itmill/toolkit/terminal/ApplicationResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
-import com.enably.tk.Application;
+import com.itmill.toolkit.Application;
 
 /** This interface must be implemented by classes wishing to provide Application resources.
  * 
diff --git a/src/com/enably/tk/terminal/ClassResource.java b/src/com/itmill/toolkit/terminal/ClassResource.java
index cad98b232d..357b2cbd67 100644
--- a/src/com/enably/tk/terminal/ClassResource.java
+++ b/src/com/itmill/toolkit/terminal/ClassResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,17 +19,17 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
-import com.enably.tk.Application;
-import com.enably.tk.service.FileTypeResolver;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.service.FileTypeResolver;
 
 /** Class resource is a named resource accessed with the class loader.
  *  
diff --git a/src/com/enably/tk/terminal/CompositeErrorMessage.java b/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java
index bad56af53e..3de9e22f99 100644
--- a/src/com/enably/tk/terminal/CompositeErrorMessage.java
+++ b/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -86,7 +86,7 @@ public class CompositeErrorMessage implements ErrorMessage {
 	}
 
 	/** The error level is the largest error level in 
-	 * @see com.enably.tk.terminal.ErrorMessage#getErrorLevel()
+	 * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
 	 */
 	public final int getErrorLevel() {
 		return level;
diff --git a/src/com/enably/tk/terminal/DownloadStream.java b/src/com/itmill/toolkit/terminal/DownloadStream.java
index 804042e622..64be0ac465 100644
--- a/src/com/enably/tk/terminal/DownloadStream.java
+++ b/src/com/itmill/toolkit/terminal/DownloadStream.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.InputStream;
 import java.util.HashMap;
diff --git a/src/com/enably/tk/terminal/ErrorMessage.java b/src/com/itmill/toolkit/terminal/ErrorMessage.java
index d6a190b94f..9b07f96a63 100644
--- a/src/com/enably/tk/terminal/ErrorMessage.java
+++ b/src/com/itmill/toolkit/terminal/ErrorMessage.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** Interface for rendering error messages to terminal. All the visible errors
  * shown to user must implement this interface.
@@ -61,21 +61,21 @@ public interface ErrorMessage extends Paintable {
 	/** Error messages are inmodifiable and thus listeners are not needed. This
 	 * method should be implemented as empty.
 	 * 
-	 * @see com.enably.tk.terminal.Paintable#addListener(Paintable.RepaintRequestListener)
+	 * @see com.itmill.toolkit.terminal.Paintable#addListener(Paintable.RepaintRequestListener)
 	 */
 	public void addListener(RepaintRequestListener listener);
 
 	/** Error messages are inmodifiable and thus listeners are not needed. This
 	 * method should be implemented as empty.
 	 *
-	 * @see com.enably.tk.terminal.Paintable#removeListener(Paintable.RepaintRequestListener)
+	 * @see com.itmill.toolkit.terminal.Paintable#removeListener(Paintable.RepaintRequestListener)
 	 */
 	public void removeListener(RepaintRequestListener listener);
 
 	/** Error messages are inmodifiable and thus listeners are not needed. This
 	 * method should be implemented as empty.
 	 *
-	 * @see com.enably.tk.terminal.Paintable#requestRepaint()
+	 * @see com.itmill.toolkit.terminal.Paintable#requestRepaint()
 	 */
 	public void requestRepaint();
 
diff --git a/src/com/enably/tk/terminal/ExternalResource.java b/src/com/itmill/toolkit/terminal/ExternalResource.java
index 892e4e0214..981dc77f4c 100644
--- a/src/com/enably/tk/terminal/ExternalResource.java
+++ b/src/com/itmill/toolkit/terminal/ExternalResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.net.URL;
 
-import com.enably.tk.service.FileTypeResolver;
+import com.itmill.toolkit.service.FileTypeResolver;
 
 /** External resource implements source for resources fetched from 
  * location specified by URL:s. The resources are fetched directly by the
diff --git a/src/com/enably/tk/terminal/FileResource.java b/src/com/itmill/toolkit/terminal/FileResource.java
index d804832c4f..9774de1793 100644
--- a/src/com/enably/tk/terminal/FileResource.java
+++ b/src/com/itmill/toolkit/terminal/FileResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
-import com.enably.tk.Application;
-import com.enably.tk.service.FileTypeResolver;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.service.FileTypeResolver;
 
 /** File resources are files or directories on local filesystem. The files and directories
  * are served trough URI:s to the client terminal and thus must be registered to an 
@@ -96,21 +96,21 @@ public class FileResource implements ApplicationResource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.ApplicationResource#getApplication()
+	 * @see com.itmill.toolkit.terminal.ApplicationResource#getApplication()
 	 */
 	public Application getApplication() {
 		return application;
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.ApplicationResource#getFilename()
+	 * @see com.itmill.toolkit.terminal.ApplicationResource#getFilename()
 	 */
 	public String getFilename() {
 		return sourceFile.getName();
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.Resource#getMIMEType()
+	 * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
 	 */
 	public String getMIMEType() {
 		return FileTypeResolver.getMIMEType(sourceFile);
diff --git a/src/com/enably/tk/terminal/KeyMapper.java b/src/com/itmill/toolkit/terminal/KeyMapper.java
index b01d9c2eef..16625944eb 100644
--- a/src/com/enably/tk/terminal/KeyMapper.java
+++ b/src/com/itmill/toolkit/terminal/KeyMapper.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.util.Hashtable;
 
diff --git a/src/com/enably/tk/terminal/PaintException.java b/src/com/itmill/toolkit/terminal/PaintException.java
index b1c7707bc1..b792efbbe1 100644
--- a/src/com/enably/tk/terminal/PaintException.java
+++ b/src/com/itmill/toolkit/terminal/PaintException.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.IOException;
 
diff --git a/src/com/enably/tk/terminal/PaintTarget.java b/src/com/itmill/toolkit/terminal/PaintTarget.java
index 456bd8022b..e5bd6f80b9 100644
--- a/src/com/enably/tk/terminal/PaintTarget.java
+++ b/src/com/itmill/toolkit/terminal/PaintTarget.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** This interface defines the methods for 
  *  painting XML to the UIDL stream. 
diff --git a/src/com/enably/tk/terminal/Paintable.java b/src/com/itmill/toolkit/terminal/Paintable.java
index d637be37d9..f334e1ea72 100644
--- a/src/com/enably/tk/terminal/Paintable.java
+++ b/src/com/itmill/toolkit/terminal/Paintable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.util.EventObject;
 
diff --git a/src/com/enably/tk/terminal/ParameterHandler.java b/src/com/itmill/toolkit/terminal/ParameterHandler.java
index 730f29e2ce..3ea033118b 100644
--- a/src/com/enably/tk/terminal/ParameterHandler.java
+++ b/src/com/itmill/toolkit/terminal/ParameterHandler.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.util.Map;
 
@@ -36,7 +36,7 @@ import java.util.Map;
  * GET and POST parameters are passed to application as external parameters on 
  * Web Adapter. The parameters can be received at any time during the application 
  * lifecycle. All the parameter handlers implementing this interface and registered
- * to {@link com.enably.tk.ui.Window} receive all the parameters got from
+ * to {@link com.itmill.toolkit.ui.Window} receive all the parameters got from
  * the terminal in the given window.</p>
  *
  * @author IT Mill Ltd.
diff --git a/src/com/enably/tk/terminal/Resource.java b/src/com/itmill/toolkit/terminal/Resource.java
index 4e3b7ba23e..0dfe67a5f6 100644
--- a/src/com/enably/tk/terminal/Resource.java
+++ b/src/com/itmill/toolkit/terminal/Resource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** Resource provided to the client terminal. Support for actually displaying the resource type
  *  is left to the terminal.
diff --git a/src/com/enably/tk/terminal/Scrollable.java b/src/com/itmill/toolkit/terminal/Scrollable.java
index 3ffea9b65e..ea5d5a062c 100644
--- a/src/com/enably/tk/terminal/Scrollable.java
+++ b/src/com/itmill/toolkit/terminal/Scrollable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** Scrollable interface. 
  * 
diff --git a/src/com/enably/tk/terminal/Sizeable.java b/src/com/itmill/toolkit/terminal/Sizeable.java
index 339db0ad16..8d0515aea3 100644
--- a/src/com/enably/tk/terminal/Sizeable.java
+++ b/src/com/itmill/toolkit/terminal/Sizeable.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** Interface to be implemented by components wishing to
  *  display some object that may be dynamically 
diff --git a/src/com/enably/tk/terminal/StreamResource.java b/src/com/itmill/toolkit/terminal/StreamResource.java
index fce22db85b..6476b8cd29 100644
--- a/src/com/enably/tk/terminal/StreamResource.java
+++ b/src/com/itmill/toolkit/terminal/StreamResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.InputStream;
 
-import com.enably.tk.Application;
-import com.enably.tk.service.FileTypeResolver;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.service.FileTypeResolver;
 
 /** Stream resource is a resource provided to the client directly
  * by the application. The strean resource is fetched from URI
@@ -120,14 +120,14 @@ public class StreamResource implements ApplicationResource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.ApplicationResource#getApplication()
+	 * @see com.itmill.toolkit.terminal.ApplicationResource#getApplication()
 	 */
 	public Application getApplication() {
 		return application;
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.ApplicationResource#getStream()
+	 * @see com.itmill.toolkit.terminal.ApplicationResource#getStream()
 	 */
 	public DownloadStream getStream() {
 		StreamSource ss = getStreamSource();
diff --git a/src/com/enably/tk/terminal/SystemError.java b/src/com/itmill/toolkit/terminal/SystemError.java
index 4d811a7aad..0ab836f520 100644
--- a/src/com/enably/tk/terminal/SystemError.java
+++ b/src/com/itmill/toolkit/terminal/SystemError.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/src/com/enably/tk/terminal/Terminal.java b/src/com/itmill/toolkit/terminal/Terminal.java
index 75923c468c..4a116f0124 100644
--- a/src/com/enably/tk/terminal/Terminal.java
+++ b/src/com/itmill/toolkit/terminal/Terminal.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** Interface for different terminal types.
  *
diff --git a/src/com/enably/tk/terminal/ThemeResource.java b/src/com/itmill/toolkit/terminal/ThemeResource.java
index db0ec32e9a..eecff3dcac 100644
--- a/src/com/enably/tk/terminal/ThemeResource.java
+++ b/src/com/itmill/toolkit/terminal/ThemeResource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
-import com.enably.tk.service.FileTypeResolver;
+import com.itmill.toolkit.service.FileTypeResolver;
 
 /** Theme resource is a named theme dependant resource provided and 
  * managed by a theme. The actual resource contents are dynamically
diff --git a/src/com/enably/tk/terminal/URIHandler.java b/src/com/itmill/toolkit/terminal/URIHandler.java
index d6f968bbbf..5fac9e08eb 100644
--- a/src/com/enably/tk/terminal/URIHandler.java
+++ b/src/com/itmill/toolkit/terminal/URIHandler.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.net.URL;
 
diff --git a/src/com/enably/tk/terminal/UploadStream.java b/src/com/itmill/toolkit/terminal/UploadStream.java
index 1ffa235327..12dbc4dc0d 100644
--- a/src/com/enably/tk/terminal/UploadStream.java
+++ b/src/com/itmill/toolkit/terminal/UploadStream.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.io.InputStream;
 
 /** Defines a variable type, that is used for passing uploaded files from
  * terminal. Most often, file upload is implented using the 
- * {@link com.enably.tk.ui.Upload Upload} component.
+ * {@link com.itmill.toolkit.ui.Upload Upload} component.
  *
  * @author IT Mill Ltd.
  * @version @VERSION@
diff --git a/src/com/enably/tk/terminal/UserError.java b/src/com/itmill/toolkit/terminal/UserError.java
index b911222057..ee106f226a 100644
--- a/src/com/enably/tk/terminal/UserError.java
+++ b/src/com/itmill/toolkit/terminal/UserError.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 /** User error is a controlled error occurred in application. User errors
  * are occur in normal usage of the application and guide the user.
diff --git a/src/com/enably/tk/terminal/VariableOwner.java b/src/com/itmill/toolkit/terminal/VariableOwner.java
index 32e739fee3..21c64cfb52 100644
--- a/src/com/enably/tk/terminal/VariableOwner.java
+++ b/src/com/itmill/toolkit/terminal/VariableOwner.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal;
+package com.itmill.toolkit.terminal;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/src/com/enably/tk/terminal/ajax/AjaxAdapterServlet.java b/src/com/itmill/toolkit/terminal/ajax/AjaxAdapterServlet.java
index d9a69afdbf..e001d74468 100644
--- a/src/com/enably/tk/terminal/ajax/AjaxAdapterServlet.java
+++ b/src/com/itmill/toolkit/terminal/ajax/AjaxAdapterServlet.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -46,7 +46,7 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import com.enably.tk.Application;
+import com.itmill.toolkit.Application;
 
 /**
  * Servlet implementing connection between a web-browser and Millstone
diff --git a/src/com/enably/tk/terminal/ajax/AjaxApplicationContext.java b/src/com/itmill/toolkit/terminal/ajax/AjaxApplicationContext.java
index ea67a81d52..26e6565fff 100644
--- a/src/com/enably/tk/terminal/ajax/AjaxApplicationContext.java
+++ b/src/com/itmill/toolkit/terminal/ajax/AjaxApplicationContext.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.File;
 import java.net.URL;
@@ -41,8 +41,8 @@ import java.util.WeakHashMap;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
-import com.enably.tk.Application;
-import com.enably.tk.service.ApplicationContext;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.service.ApplicationContext;
 
 /** Application context for ajax applications.
  * 
@@ -77,7 +77,7 @@ public class AjaxApplicationContext implements ApplicationContext {
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.service.ApplicationContext#getBaseDirectory()
+     * @see com.itmill.toolkit.service.ApplicationContext#getBaseDirectory()
      */
     public File getBaseDirectory() {
 
@@ -90,7 +90,7 @@ public class AjaxApplicationContext implements ApplicationContext {
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.service.ApplicationContext#getApplications()
+     * @see com.itmill.toolkit.service.ApplicationContext#getApplications()
      */
     public Collection getApplications() {
         return Collections.unmodifiableCollection(applications);
@@ -99,7 +99,7 @@ public class AjaxApplicationContext implements ApplicationContext {
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.service.ApplicationContext#addTransactionListener(com.enably.tk.service.ApplicationContext.TransactionListener)
+     * @see com.itmill.toolkit.service.ApplicationContext#addTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
      */
     public void addTransactionListener(TransactionListener listener) {
         transactionListeners.add(listener);
@@ -108,7 +108,7 @@ public class AjaxApplicationContext implements ApplicationContext {
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.service.ApplicationContext#removeTransactionListener(com.enably.tk.service.ApplicationContext.TransactionListener)
+     * @see com.itmill.toolkit.service.ApplicationContext#removeTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
      */
     public void removeTransactionListener(TransactionListener listener) {
         transactionListeners.remove(listener);
diff --git a/src/com/enably/tk/terminal/ajax/ApplicationManager.java b/src/com/itmill/toolkit/terminal/ajax/ApplicationManager.java
index 738b6e28ac..403d6721eb 100644
--- a/src/com/enably/tk/terminal/ajax/ApplicationManager.java
+++ b/src/com/itmill/toolkit/terminal/ajax/ApplicationManager.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,16 +48,16 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.enably.tk.Application;
-import com.enably.tk.Application.WindowAttachEvent;
-import com.enably.tk.Application.WindowDetachEvent;
-import com.enably.tk.terminal.DownloadStream;
-import com.enably.tk.terminal.Paintable;
-import com.enably.tk.terminal.URIHandler;
-import com.enably.tk.terminal.Paintable.RepaintRequestEvent;
-import com.enably.tk.ui.Component;
-import com.enably.tk.ui.FrameWindow;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.Application.WindowAttachEvent;
+import com.itmill.toolkit.Application.WindowDetachEvent;
+import com.itmill.toolkit.terminal.DownloadStream;
+import com.itmill.toolkit.terminal.Paintable;
+import com.itmill.toolkit.terminal.URIHandler;
+import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent;
+import com.itmill.toolkit.ui.Component;
+import com.itmill.toolkit.ui.FrameWindow;
+import com.itmill.toolkit.ui.Window;
 
 /** Application manager processes changes and paints for single
  *  application instance.
@@ -345,7 +345,7 @@ public class ApplicationManager implements Paintable.RepaintRequestListener,
      * before any windows URIs are processed and if a DownloadStream is returned
      * it is sent to the client.
      * 
-     * @see com.enably.tk.terminal.URIHandler
+     * @see com.itmill.toolkit.terminal.URIHandler
      * 
      * @param application
      *            Application owning the URI
@@ -386,7 +386,7 @@ public class ApplicationManager implements Paintable.RepaintRequestListener,
      * before any windows URIs are processed and if a DownloadStream is returned
      * it is sent to the client.
      * 
-     * @see com.enably.tk.terminal.URIHandler
+     * @see com.itmill.toolkit.terminal.URIHandler
      * 
      * @param application
      *            Application owning the URI
@@ -588,14 +588,14 @@ public class ApplicationManager implements Paintable.RepaintRequestListener,
         }
 
         /**
-         * @see com.enably.tk.terminal.Terminal.ErrorEvent#getThrowable()
+         * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
             return this.throwable;
         }
 
         /**
-         * @see com.enably.tk.terminal.URIHandler.ErrorEvent#getURIHandler()
+         * @see com.itmill.toolkit.terminal.URIHandler.ErrorEvent#getURIHandler()
          */
         public URIHandler getURIHandler() {
             return this.owner;
diff --git a/src/com/enably/tk/terminal/ajax/HttpUploadStream.java b/src/com/itmill/toolkit/terminal/ajax/HttpUploadStream.java
index 55a292feca..e76179d5c2 100644
--- a/src/com/enably/tk/terminal/ajax/HttpUploadStream.java
+++ b/src/com/itmill/toolkit/terminal/ajax/HttpUploadStream.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.InputStream;
 
@@ -37,7 +37,7 @@ import java.io.InputStream;
  * @since 3.1
  */
 public class HttpUploadStream
-	implements com.enably.tk.terminal.UploadStream {
+	implements com.itmill.toolkit.terminal.UploadStream {
 
 	/** Holds value of property variableName. */
 	private String streamName;
diff --git a/src/com/enably/tk/terminal/ajax/Log.java b/src/com/itmill/toolkit/terminal/ajax/Log.java
index 027c9d86ec..890dd04d5a 100644
--- a/src/com/enably/tk/terminal/ajax/Log.java
+++ b/src/com/itmill/toolkit/terminal/ajax/Log.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 /** <p>Class providing centralized logging services. The logger defines
  * five message types, and provides methods to create messages of those
diff --git a/src/com/enably/tk/terminal/ajax/MultipartRequest.java b/src/com/itmill/toolkit/terminal/ajax/MultipartRequest.java
index 9d64cdfde8..48f86606c2 100644
--- a/src/com/enably/tk/terminal/ajax/MultipartRequest.java
+++ b/src/com/itmill/toolkit/terminal/ajax/MultipartRequest.java
@@ -1,4 +1,4 @@
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.util.Hashtable;
 import java.io.BufferedOutputStream;
diff --git a/src/com/enably/tk/terminal/web/ServletMultipartRequest.java b/src/com/itmill/toolkit/terminal/ajax/ServletMultipartRequest.java
index 417aff6c39..54dc518ffd 100644
--- a/src/com/enably/tk/terminal/web/ServletMultipartRequest.java
+++ b/src/com/itmill/toolkit/terminal/ajax/ServletMultipartRequest.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.IOException;
 
diff --git a/src/com/enably/tk/terminal/ajax/UIDLPaintTarget.java b/src/com/itmill/toolkit/terminal/ajax/UIDLPaintTarget.java
index 94384135e4..69fc162b01 100644
--- a/src/com/enably/tk/terminal/ajax/UIDLPaintTarget.java
+++ b/src/com/itmill/toolkit/terminal/ajax/UIDLPaintTarget.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,25 +19,25 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.ApplicationResource;
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Paintable;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.ThemeResource;
-import com.enably.tk.terminal.UploadStream;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.ApplicationResource;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Paintable;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.ThemeResource;
+import com.itmill.toolkit.terminal.UploadStream;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 import java.io.BufferedWriter;
 import java.io.OutputStream;
@@ -574,7 +574,7 @@ public class UIDLPaintTarget implements PaintTarget {
     /**
      * Add XML section with namespace
      * 
-     * @see com.enably.tk.terminal.PaintTarget#addXMLSection(String,
+     * @see com.itmill.toolkit.terminal.PaintTarget#addXMLSection(String,
      *      String, String)
      */
     public void addXMLSection(String sectionTagName, String sectionData,
@@ -633,7 +633,7 @@ public class UIDLPaintTarget implements PaintTarget {
     }
 
     /**
-     * @see com.enably.tk.terminal.PaintTarget#startTag(com.enably.tk.terminal.Paintable,
+     * @see com.itmill.toolkit.terminal.PaintTarget#startTag(com.itmill.toolkit.terminal.Paintable,
      *      java.lang.String)
      */
     public boolean startTag(Paintable paintable, String tag)
@@ -648,7 +648,7 @@ public class UIDLPaintTarget implements PaintTarget {
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.terminal.PaintTarget#addCharacterData(java.lang.String)
+     * @see com.itmill.toolkit.terminal.PaintTarget#addCharacterData(java.lang.String)
      */
     public void addCharacterData(String text) throws PaintException {
         // TODO: This should check the validity of characters
diff --git a/src/com/enably/tk/terminal/ajax/VariableMap.java b/src/com/itmill/toolkit/terminal/ajax/VariableMap.java
index cce9a741a9..54027ef703 100644
--- a/src/com/enably/tk/terminal/ajax/VariableMap.java
+++ b/src/com/itmill/toolkit/terminal/ajax/VariableMap.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.ajax;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -45,10 +45,10 @@ import java.util.WeakHashMap;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.enably.tk.terminal.SystemError;
-import com.enably.tk.terminal.Terminal;
-import com.enably.tk.terminal.UploadStream;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.terminal.SystemError;
+import com.itmill.toolkit.terminal.Terminal;
+import com.itmill.toolkit.terminal.UploadStream;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 /** Variable map for ajax applications.
  * 
@@ -591,7 +591,7 @@ public class VariableMap {
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.Terminal.ErrorEvent#getThrowable()
+		 * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
 		 */
 		public Throwable getThrowable() {
 			return this.throwable;
@@ -614,7 +614,7 @@ public class VariableMap {
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.VariableOwner.ErrorEvent#getVariableOwner()
+		 * @see com.itmill.toolkit.terminal.VariableOwner.ErrorEvent#getVariableOwner()
 		 */
 		public VariableOwner getVariableOwner() {
 			return this.owner;
diff --git a/src/com/enably/tk/terminal/package.html b/src/com/itmill/toolkit/terminal/package.html
index 83514a0de5..83514a0de5 100644
--- a/src/com/enably/tk/terminal/package.html
+++ b/src/com/itmill/toolkit/terminal/package.html
diff --git a/src/com/enably/tk/terminal/web/CollectionThemeSource.java b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java
index 65696d44ac..5f0de2e54d 100644
--- a/src/com/enably/tk/terminal/web/CollectionThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.InputStream;
 import java.util.Collection;
@@ -47,14 +47,14 @@ public class CollectionThemeSource implements ThemeSource {
 	private List sources = new LinkedList();
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getName()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getName()
 	 */
 	public String getName() {
 		return "THEMES";
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
 	 */
 	public Collection getXSLStreams(Theme theme, WebBrowser type)
 		throws ThemeException {
@@ -91,7 +91,7 @@ public class CollectionThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getModificationTime()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getModificationTime()
 	 */
 	public long getModificationTime() {
 		long modTime = 0;
@@ -104,7 +104,7 @@ public class CollectionThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getResource(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getResource(String)
 	 */
 	public InputStream getResource(String resourceId) throws ThemeException {
 
@@ -167,7 +167,7 @@ public class CollectionThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getThemes()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getThemes()
 	 */
 	public Collection getThemes() {
 		Collection themes = new LinkedList();
@@ -179,7 +179,7 @@ public class CollectionThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getThemeByName(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getThemeByName(String)
 	 */
 	public Theme getThemeByName(String name) {
 		for (Iterator i = this.sources.iterator(); i.hasNext();) {
diff --git a/src/com/enably/tk/terminal/web/DebugWindow.java b/src/com/itmill/toolkit/terminal/web/DebugWindow.java
index c2d6af00ae..ee760476bc 100644
--- a/src/com/enably/tk/terminal/web/DebugWindow.java
+++ b/src/com/itmill/toolkit/terminal/web/DebugWindow.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -44,11 +44,11 @@ import java.util.LinkedList;
 
 import javax.servlet.http.HttpSession;
 
-import com.enably.tk.Application;
-import com.enably.tk.data.util.BeanItem;
-import com.enably.tk.data.util.MethodProperty;
-import com.enably.tk.terminal.FileResource;
-import com.enably.tk.ui.*;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.data.util.BeanItem;
+import com.itmill.toolkit.data.util.MethodProperty;
+import com.itmill.toolkit.terminal.FileResource;
+import com.itmill.toolkit.ui.*;
 
 /**
  * This class provides a debugging window where one may view the UIDL of
diff --git a/src/com/enably/tk/terminal/web/DirectoryThemeSource.java b/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java
index 5cc8b78173..b4628f1e18 100644
--- a/src/com/enably/tk/terminal/web/DirectoryThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -109,7 +109,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
 	 */
 	public Collection getXSLStreams(Theme theme, WebBrowser type)
 		throws ThemeException {
@@ -162,7 +162,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getModificationTime()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getModificationTime()
 	 */
 	public long getModificationTime() {
 
@@ -203,7 +203,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getResource(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getResource(String)
 	 */
 	public InputStream getResource(String resourceId)
 		throws ThemeSource.ThemeException {
@@ -239,7 +239,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getThemes()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getThemes()
 	 */
 	public Collection getThemes() {
 		Collection themes = new LinkedList();
@@ -256,7 +256,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getName()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getName()
 	 */
 	public String getName() {
 		if (this.theme != null) {
@@ -267,7 +267,7 @@ public class DirectoryThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getThemeByName(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getThemeByName(String)
 	 */
 	public Theme getThemeByName(String name) {
 		Collection themes = this.getThemes();
diff --git a/src/com/enably/tk/terminal/web/HttpUploadStream.java b/src/com/itmill/toolkit/terminal/web/HttpUploadStream.java
index fdbbdf81b3..6bfa4c34fd 100644
--- a/src/com/enably/tk/terminal/web/HttpUploadStream.java
+++ b/src/com/itmill/toolkit/terminal/web/HttpUploadStream.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.InputStream;
 
@@ -37,7 +37,7 @@ import java.io.InputStream;
  * @since 3.0
  */
 public class HttpUploadStream
-	implements com.enably.tk.terminal.UploadStream {
+	implements com.itmill.toolkit.terminal.UploadStream {
 
 	/** Holds value of property variableName. */
 	private String streamName;
diff --git a/src/com/enably/tk/terminal/web/HttpVariableMap.java b/src/com/itmill/toolkit/terminal/web/HttpVariableMap.java
index 2b305983ac..b14739f862 100644
--- a/src/com/enably/tk/terminal/web/HttpVariableMap.java
+++ b/src/com/itmill/toolkit/terminal/web/HttpVariableMap.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
-import com.enably.tk.terminal.SystemError;
-import com.enably.tk.terminal.Terminal;
-import com.enably.tk.terminal.UploadStream;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.terminal.SystemError;
+import com.itmill.toolkit.terminal.Terminal;
+import com.itmill.toolkit.terminal.UploadStream;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -591,7 +591,7 @@ public class HttpVariableMap {
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.Terminal.ErrorEvent#getThrowable()
+		 * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
 		 */
 		public Throwable getThrowable() {
 			return this.throwable;
@@ -614,7 +614,7 @@ public class HttpVariableMap {
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.VariableOwner.ErrorEvent#getVariableOwner()
+		 * @see com.itmill.toolkit.terminal.VariableOwner.ErrorEvent#getVariableOwner()
 		 */
 		public VariableOwner getVariableOwner() {
 			return this.owner;
diff --git a/src/com/enably/tk/terminal/web/JarThemeSource.java b/src/com/itmill/toolkit/terminal/web/JarThemeSource.java
index 5790d24302..9c6f403180 100644
--- a/src/com/enably/tk/terminal/web/JarThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/JarThemeSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -139,7 +139,7 @@ public class JarThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
 	 */
 	public Collection getXSLStreams(Theme theme, WebBrowser type)
 		throws ThemeException {
@@ -196,14 +196,14 @@ public class JarThemeSource implements ThemeSource {
 	}
 
 	/** Return modication time of the jar file.
-	 * @see com.enably.tk.terminal.web.ThemeSource#getModificationTime()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getModificationTime()
 	 */
 	public long getModificationTime() {
 		return this.file.lastModified();
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getResource(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getResource(String)
 	 */
 	public InputStream getResource(String resourceId)
 		throws ThemeSource.ThemeException {
@@ -248,7 +248,7 @@ public class JarThemeSource implements ThemeSource {
 	}
 
 	/**
-	* @see com.enably.tk.terminal.web.ThemeSource#getThemes()
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getThemes()
 	*/
 	public Collection getThemes() {
 		Collection themes = new LinkedList();
@@ -264,7 +264,7 @@ public class JarThemeSource implements ThemeSource {
 	}
 
 	/**
-	* @see com.enably.tk.terminal.web.ThemeSource#getName()
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getName()
 	*/
 	public String getName() {
 		if (this.theme != null) {
@@ -275,7 +275,7 @@ public class JarThemeSource implements ThemeSource {
 	}
 
 	/**																											 
-	* @see com.enably.tk.terminal.web.ThemeSource#getThemeByName(String)
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getThemeByName(String)
 	*/
 	public Theme getThemeByName(String name) {
 		Collection themes = this.getThemes();
diff --git a/src/com/enably/tk/terminal/web/Log.java b/src/com/itmill/toolkit/terminal/web/Log.java
index 707bd110a0..3fb0011e49 100644
--- a/src/com/enably/tk/terminal/web/Log.java
+++ b/src/com/itmill/toolkit/terminal/web/Log.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 /** <p>Class providing centralized logging services. The logger defines
  * five message types, and provides methods to create messages of those
diff --git a/src/com/enably/tk/terminal/web/MultipartRequest.java b/src/com/itmill/toolkit/terminal/web/MultipartRequest.java
index 3681c81298..ce3729cf24 100644
--- a/src/com/enably/tk/terminal/web/MultipartRequest.java
+++ b/src/com/itmill/toolkit/terminal/web/MultipartRequest.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.util.Hashtable;
 import java.io.BufferedOutputStream;
diff --git a/src/com/enably/tk/terminal/ajax/ServletMultipartRequest.java b/src/com/itmill/toolkit/terminal/web/ServletMultipartRequest.java
index edc7ae8919..c824bd5ccc 100644
--- a/src/com/enably/tk/terminal/ajax/ServletMultipartRequest.java
+++ b/src/com/itmill/toolkit/terminal/web/ServletMultipartRequest.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.ajax;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.IOException;
 
diff --git a/src/com/enably/tk/terminal/web/ServletThemeSource.java b/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java
index 8ef09b325d..c2db9c92bd 100644
--- a/src/com/enably/tk/terminal/web/ServletThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,15 +19,15 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -121,7 +121,7 @@ public class ServletThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getXSLStreams(Theme, WebBrowser)
 	 */
 	public Collection getXSLStreams(Theme theme, WebBrowser type)
 		throws ThemeException {
@@ -168,7 +168,7 @@ public class ServletThemeSource implements ThemeSource {
 	}
 
 	/** Return modication time of the description file.
-	 * @see com.enably.tk.terminal.web.ThemeSource#getModificationTime()
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getModificationTime()
 	 */
 	public long getModificationTime() {
 		long modTime = 0;
@@ -182,7 +182,7 @@ public class ServletThemeSource implements ThemeSource {
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.web.ThemeSource#getResource(String)
+	 * @see com.itmill.toolkit.terminal.web.ThemeSource#getResource(String)
 	 */
 	public InputStream getResource(String resourceId)
 		throws ThemeSource.ThemeException {
@@ -232,7 +232,7 @@ public class ServletThemeSource implements ThemeSource {
 	}
 
 	/**
-	* @see com.enably.tk.terminal.web.ThemeSource#getThemes()
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getThemes()
 	*/
 	public Collection getThemes() {
 		Collection themes = new LinkedList();
@@ -243,14 +243,14 @@ public class ServletThemeSource implements ThemeSource {
 	}
 
 	/**
-	* @see com.enably.tk.terminal.web.ThemeSource#getName()
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getName()
 	*/
 	public String getName() {
 		return this.theme.getName();
 	}
 
 	/**																											 
-	* @see com.enably.tk.terminal.web.ThemeSource#getThemeByName(String)
+	* @see com.itmill.toolkit.terminal.web.ThemeSource#getThemeByName(String)
 	*/
 	public Theme getThemeByName(String name) {
 		Collection themes = this.getThemes();
diff --git a/src/com/enably/tk/terminal/web/Theme.java b/src/com/itmill/toolkit/terminal/web/Theme.java
index 478189109b..ba1eedea9c 100644
--- a/src/com/enably/tk/terminal/web/Theme.java
+++ b/src/com/itmill/toolkit/terminal/web/Theme.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/src/com/enably/tk/terminal/web/ThemeFunctionLibrary.java b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
index d50553e857..51472578c3 100644
--- a/src/com/enably/tk/terminal/web/ThemeFunctionLibrary.java
+++ b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.ThemeResource;
-import com.enably.tk.ui.FrameWindow;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.ThemeResource;
+import com.itmill.toolkit.ui.FrameWindow;
+import com.itmill.toolkit.ui.Window;
 
 import java.text.DateFormatSymbols;
 import java.util.Calendar;
diff --git a/src/com/enably/tk/terminal/web/ThemeSource.java b/src/com/itmill/toolkit/terminal/web/ThemeSource.java
index 950384ca7e..300e9488c4 100644
--- a/src/com/enably/tk/terminal/web/ThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/ThemeSource.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.InputStream;
 import java.util.Collection;
diff --git a/src/com/enably/tk/terminal/web/UIDLTransformer.java b/src/com/itmill/toolkit/terminal/web/UIDLTransformer.java
index 2216cf2eb4..3588555e0e 100644
--- a/src/com/enably/tk/terminal/web/UIDLTransformer.java
+++ b/src/com/itmill/toolkit/terminal/web/UIDLTransformer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -34,7 +34,7 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import com.enably.tk.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintException;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
diff --git a/src/com/enably/tk/terminal/web/UIDLTransformerException.java b/src/com/itmill/toolkit/terminal/web/UIDLTransformerException.java
index 93c21ec24e..96133c0605 100644
--- a/src/com/enably/tk/terminal/web/UIDLTransformerException.java
+++ b/src/com/itmill/toolkit/terminal/web/UIDLTransformerException.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 /** Exception in transform process.
  *
diff --git a/src/com/enably/tk/terminal/web/UIDLTransformerFactory.java b/src/com/itmill/toolkit/terminal/web/UIDLTransformerFactory.java
index d5b0703ce9..fc57b71a84 100644
--- a/src/com/enably/tk/terminal/web/UIDLTransformerFactory.java
+++ b/src/com/itmill/toolkit/terminal/web/UIDLTransformerFactory.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/src/com/enably/tk/terminal/web/UIDLTransformerType.java b/src/com/itmill/toolkit/terminal/web/UIDLTransformerType.java
index a33c447f02..596d0df58d 100644
--- a/src/com/enably/tk/terminal/web/UIDLTransformerType.java
+++ b/src/com/itmill/toolkit/terminal/web/UIDLTransformerType.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 /** Type of the transformer.
  * 
diff --git a/src/com/enably/tk/terminal/web/WebAdapterServlet.java b/src/com/itmill/toolkit/terminal/web/WebAdapterServlet.java
index a67a6e851a..890bd63b43 100644
--- a/src/com/enably/tk/terminal/web/WebAdapterServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/WebAdapterServlet.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -64,18 +64,18 @@ import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
 
-import com.enably.tk.Application;
-import com.enably.tk.Application.WindowAttachEvent;
-import com.enably.tk.Application.WindowDetachEvent;
-import com.enably.tk.service.FileTypeResolver;
-import com.enably.tk.terminal.DownloadStream;
-import com.enably.tk.terminal.Paintable;
-import com.enably.tk.terminal.ParameterHandler;
-import com.enably.tk.terminal.ThemeResource;
-import com.enably.tk.terminal.URIHandler;
-import com.enably.tk.terminal.Paintable.RepaintRequestEvent;
-import com.enably.tk.terminal.web.ThemeSource.ThemeException;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.Application.WindowAttachEvent;
+import com.itmill.toolkit.Application.WindowDetachEvent;
+import com.itmill.toolkit.service.FileTypeResolver;
+import com.itmill.toolkit.terminal.DownloadStream;
+import com.itmill.toolkit.terminal.Paintable;
+import com.itmill.toolkit.terminal.ParameterHandler;
+import com.itmill.toolkit.terminal.ThemeResource;
+import com.itmill.toolkit.terminal.URIHandler;
+import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent;
+import com.itmill.toolkit.terminal.web.ThemeSource.ThemeException;
+import com.itmill.toolkit.ui.Window;
 
 /**
  * This servlet is the core of the MillStone Web Adapter, that adapts the
@@ -713,7 +713,7 @@ public class WebAdapterServlet extends HttpServlet
 	 * before any windows URIs are processed and if a DownloadStream is returned
 	 * it is sent to the client.
 	 * 
-	 * @see com.enably.tk.terminal.URIHandler
+	 * @see com.itmill.toolkit.terminal.URIHandler
 	 * 
 	 * @param application
 	 *            Application owning the URI
@@ -754,7 +754,7 @@ public class WebAdapterServlet extends HttpServlet
 	 * before any windows URIs are processed and if a DownloadStream is returned
 	 * it is sent to the client.
 	 * 
-	 * @see com.enably.tk.terminal.URIHandler
+	 * @see com.itmill.toolkit.terminal.URIHandler
 	 * 
 	 * @param application
 	 *            Application owning the URI
@@ -1275,7 +1275,7 @@ public class WebAdapterServlet extends HttpServlet
 	}
 
 	/**
-	 * @see com.enably.tk.Application.WindowAttachListener#windowAttached(Application.WindowAttachEvent)
+	 * @see com.itmill.toolkit.Application.WindowAttachListener#windowAttached(Application.WindowAttachEvent)
 	 */
 	public void windowAttached(WindowAttachEvent event) {
 		Window win = event.getWindow();
@@ -1294,7 +1294,7 @@ public class WebAdapterServlet extends HttpServlet
 	}
 
 	/**
-	 * @see com.enably.tk.Application.WindowDetachListener#windowDetached(Application.WindowDetachEvent)
+	 * @see com.itmill.toolkit.Application.WindowDetachListener#windowDetached(Application.WindowDetachEvent)
 	 */
 	public void windowDetached(WindowDetachEvent event) {
 		event.getWindow().removeListener(
@@ -1305,7 +1305,7 @@ public class WebAdapterServlet extends HttpServlet
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.Paintable.RepaintRequestListener#repaintRequested(Paintable.RepaintRequestEvent)
+	 * @see com.itmill.toolkit.terminal.Paintable.RepaintRequestListener#repaintRequested(Paintable.RepaintRequestEvent)
 	 */
 	public void repaintRequested(RepaintRequestEvent event) {
 
@@ -1517,13 +1517,13 @@ public class WebAdapterServlet extends HttpServlet
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.Terminal.ErrorEvent#getThrowable()
+		 * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
 		 */
 		public Throwable getThrowable() {
 			return this.throwable;
 		}
 		/**
-		 * @see com.enably.tk.terminal.ParameterHandler.ErrorEvent#getParameterHandler()
+		 * @see com.itmill.toolkit.terminal.ParameterHandler.ErrorEvent#getParameterHandler()
 		 */
 		public ParameterHandler getParameterHandler() {
 			return this.owner;
@@ -1543,13 +1543,13 @@ public class WebAdapterServlet extends HttpServlet
 		}
 
 		/**
-		 * @see com.enably.tk.terminal.Terminal.ErrorEvent#getThrowable()
+		 * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
 		 */
 		public Throwable getThrowable() {
 			return this.throwable;
 		}
 		/**
-		 * @see com.enably.tk.terminal.URIHandler.ErrorEvent#getURIHandler()
+		 * @see com.itmill.toolkit.terminal.URIHandler.ErrorEvent#getURIHandler()
 		 */
 		public URIHandler getURIHandler() {
 			return this.owner;
diff --git a/src/com/enably/tk/terminal/web/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java
index 742f980ae9..8fc19cfbca 100644
--- a/src/com/enably/tk/terminal/web/WebApplicationContext.java
+++ b/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.File;
 import java.util.Collection;
@@ -39,9 +39,9 @@ import java.util.WeakHashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.enably.tk.Application;
-import com.enably.tk.service.ApplicationContext;
-import com.enably.tk.ui.Window;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.service.ApplicationContext;
+import com.itmill.toolkit.ui.Window;
 
 /** Web application context for Millstone applications.
  *
@@ -93,7 +93,7 @@ public class WebApplicationContext implements ApplicationContext {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.enably.tk.service.ApplicationContext#getBaseDirectory()
+	 * @see com.itmill.toolkit.service.ApplicationContext#getBaseDirectory()
 	 */
 	public File getBaseDirectory() {
 		String realPath = session.getServletContext().getRealPath("/");
@@ -109,7 +109,7 @@ public class WebApplicationContext implements ApplicationContext {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.enably.tk.service.ApplicationContext#getApplications()
+	 * @see com.itmill.toolkit.service.ApplicationContext#getApplications()
 	 */
 	public Collection getApplications() {
 		LinkedList applications =
@@ -143,7 +143,7 @@ public class WebApplicationContext implements ApplicationContext {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.enably.tk.service.ApplicationContext#addTransactionListener(com.enably.tk.service.ApplicationContext.TransactionListener)
+	 * @see com.itmill.toolkit.service.ApplicationContext#addTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
 	 */
 	public void addTransactionListener(TransactionListener listener) {
 		if (this.listeners == null)
@@ -152,7 +152,7 @@ public class WebApplicationContext implements ApplicationContext {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.enably.tk.service.ApplicationContext#removeTransactionListener(com.enably.tk.service.ApplicationContext.TransactionListener)
+	 * @see com.itmill.toolkit.service.ApplicationContext#removeTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
 	 */
 	public void removeTransactionListener(TransactionListener listener) {
 		if (this.listeners != null)
diff --git a/src/com/enably/tk/terminal/web/WebBrowser.java b/src/com/itmill/toolkit/terminal/web/WebBrowser.java
index 79c589002b..f6091d4a14 100644
--- a/src/com/enably/tk/terminal/web/WebBrowser.java
+++ b/src/com/itmill/toolkit/terminal/web/WebBrowser.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,16 +19,16 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
-import com.enably.tk.terminal.Terminal;
+import com.itmill.toolkit.terminal.Terminal;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/enably/tk/terminal/web/WebBrowserProbe.java b/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java
index a88d245403..37edb6aeb8 100644
--- a/src/com/enably/tk/terminal/web/WebBrowserProbe.java
+++ b/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.util.Collection;
 import java.util.Enumeration;
diff --git a/src/com/enably/tk/terminal/web/WebPaintTarget.java b/src/com/itmill/toolkit/terminal/web/WebPaintTarget.java
index ca2c91c5f7..8f1b6672cb 100644
--- a/src/com/enably/tk/terminal/web/WebPaintTarget.java
+++ b/src/com/itmill/toolkit/terminal/web/WebPaintTarget.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,25 +19,25 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.ApplicationResource;
-import com.enably.tk.terminal.ExternalResource;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Paintable;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.ThemeResource;
-import com.enably.tk.terminal.UploadStream;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.ApplicationResource;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Paintable;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.ThemeResource;
+import com.itmill.toolkit.terminal.UploadStream;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 import java.util.Stack;
 
@@ -514,7 +514,7 @@ public class WebPaintTarget implements PaintTarget {
 
 	}
 	/** Add XML section with namespace
-	 * @see com.enably.tk.terminal.PaintTarget#addXMLSection(String, String, String)
+	 * @see com.itmill.toolkit.terminal.PaintTarget#addXMLSection(String, String, String)
 	 */
 	public void addXMLSection(
 		String sectionTagName,
@@ -576,7 +576,7 @@ public class WebPaintTarget implements PaintTarget {
 	 * @param paintable The paintable to start
 	 * @param tagName The name of the start tag
 	 * @return false
-	 * @see com.enably.tk.terminal.PaintTarget#startTag(Paintable, String),
+	 * @see com.itmill.toolkit.terminal.PaintTarget#startTag(Paintable, String),
 	 * #startTag(String)
 	 * @since 3.1
 	 */
diff --git a/src/com/enably/tk/terminal/web/XSLReader.java b/src/com/itmill/toolkit/terminal/web/XSLReader.java
index 9d62c079ae..fecb08a2b1 100644
--- a/src/com/enably/tk/terminal/web/XSLReader.java
+++ b/src/com/itmill/toolkit/terminal/web/XSLReader.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.terminal.web;
+package com.itmill.toolkit.terminal.web;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/com/enably/tk/terminal/web/package.html b/src/com/itmill/toolkit/terminal/web/package.html
index 5e034235df..5e034235df 100644
--- a/src/com/enably/tk/terminal/web/package.html
+++ b/src/com/itmill/toolkit/terminal/web/package.html
diff --git a/src/com/enably/tk/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java
index b9a2e28b15..4c08b3811f 100644
--- a/src/com/enably/tk/ui/AbstractComponent.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponent.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,19 +19,19 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.Application;
-import com.enably.tk.event.EventRouter;
-import com.enably.tk.event.MethodEventSource;
-import com.enably.tk.terminal.*;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.event.EventRouter;
+import com.itmill.toolkit.event.MethodEventSource;
+import com.itmill.toolkit.terminal.*;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -151,7 +151,7 @@ public abstract class AbstractComponent
 
 	/** Sets the component's caption <code>String</code>. Caption is the
 	 * visible name of the component. This method will trigger a
-	 * {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 * 
 	 * @param caption new caption <code>String</code> for the component
 	 */
@@ -190,7 +190,7 @@ public abstract class AbstractComponent
 	}
 
 	/** Sets the component's icon.  This method will trigger a
-	  * {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	  * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	  * 
 	  * @param icon the icon to be shown with the component's caption
 	  */
@@ -228,7 +228,7 @@ public abstract class AbstractComponent
 
 	/** Sets the component's immediate mode to the specified status. This
 	 * method will trigger a 
-	 * {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 * 
 	 * @param immediate boolean value specifying if the component should
 	 * be in the immediate mode after the call.
@@ -304,7 +304,7 @@ public abstract class AbstractComponent
 
 	/** Sets the component's description. See {@link #getDescription()} for
 	 * more information on what the description is. This method will trigger
-	 * a {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * a {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 *
 	 * @param description new description string for the component
 	 */
@@ -631,7 +631,7 @@ public abstract class AbstractComponent
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType type of the listened event. Events of this type or
 	 * its subclasses activate the listener.
@@ -658,7 +658,7 @@ public abstract class AbstractComponent
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType type of the listened event. Events of this type or
 	 * its subclasses activate the listener.
@@ -684,7 +684,7 @@ public abstract class AbstractComponent
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
@@ -701,7 +701,7 @@ public abstract class AbstractComponent
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
@@ -725,7 +725,7 @@ public abstract class AbstractComponent
 	 * 
 	 * <p>For more information on the MillStone inheritable event mechanism
 	 * see the 
-	 * {@link com.enably.tk.event com.enably.tk.event package documentation}.</p>
+	 * {@link com.itmill.toolkit.event com.itmill.toolkit.event package documentation}.</p>
 	 * 
 	 * @param eventType exact event type the <code>object</code> listens to
 	 * @param target target object that has registered to listen to events
diff --git a/src/com/enably/tk/ui/AbstractComponentContainer.java b/src/com/itmill/toolkit/ui/AbstractComponentContainer.java
index 1a9cb0f666..e7b142f828 100644
--- a/src/com/enably/tk/ui/AbstractComponentContainer.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponentContainer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.lang.reflect.Method;
 import java.util.LinkedList;
@@ -84,7 +84,7 @@ extends AbstractComponent implements ComponentContainer {
 	/** Notifies all contained components that the container is attached to
 	 * a window.
 	 * 
-	 * @see com.enably.tk.ui.Component#attach()
+	 * @see com.itmill.toolkit.ui.Component#attach()
 	 */
 	public void attach() {
 		super.attach();
@@ -96,7 +96,7 @@ extends AbstractComponent implements ComponentContainer {
 	/** Notifies all contained components that the container is detached
 	 * from a window.
 	 * 
-	 * @see com.enably.tk.ui.Component#detach()
+	 * @see com.itmill.toolkit.ui.Component#detach()
 	 */
 	public void detach() {
 		super.detach();
@@ -166,7 +166,7 @@ extends AbstractComponent implements ComponentContainer {
 	/** This only implements the events and component parent calls. The extending
 	 * classes must implement component list maintenance and call this method 
 	 * after component list maintenance.
-	 * @see com.enably.tk.ui.ComponentContainer#addComponent(Component)
+	 * @see com.itmill.toolkit.ui.ComponentContainer#addComponent(Component)
 	 */
 	public void addComponent(Component c) {
 		c.setParent(this);
@@ -178,7 +178,7 @@ extends AbstractComponent implements ComponentContainer {
 	/** This only implements the events and component parent calls. The extending
 	 * classes must implement component list maintenance and call this method 
 	 * before component list maintenance.
-	 * @see com.enably.tk.ui.ComponentContainer#removeComponent(Component)
+	 * @see com.itmill.toolkit.ui.ComponentContainer#removeComponent(Component)
 	 */
 	public void removeComponent(Component c) {
 		if (getApplication() != null)
diff --git a/src/com/enably/tk/ui/AbstractField.java b/src/com/itmill/toolkit/ui/AbstractField.java
index e34b2dd938..13a20ad23d 100644
--- a/src/com/enably/tk/ui/AbstractField.java
+++ b/src/com/itmill/toolkit/ui/AbstractField.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -35,32 +35,32 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.enably.tk.data.Buffered;
-import com.enably.tk.data.Property;
-import com.enably.tk.data.Validatable;
-import com.enably.tk.data.Validator;
-import com.enably.tk.terminal.ErrorMessage;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.Buffered;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.data.Validatable;
+import com.itmill.toolkit.data.Validator;
+import com.itmill.toolkit.terminal.ErrorMessage;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /**
  * <p>
  * Abstract field component for implementing buffered property editors. The
  * field may hold an internal value, or it may be connected to any data source
- * that implements the {@link com.enably.tk.data.Property}interface.
+ * that implements the {@link com.itmill.toolkit.data.Property}interface.
  * <code>AbstractField</code> implements that interface itself, too, so
  * accessing the Property value represented by it is straightforward.
  * </p>
  * 
  * <p>
- * AbstractField also provides the {@link com.enably.tk.data.Buffered}
+ * AbstractField also provides the {@link com.itmill.toolkit.data.Buffered}
  * interface for buffering the data source value. By default the Field is in
  * write through-mode and {@link #setWriteThrough(boolean)}should be called to
  * enable buffering.
  * </p>
  * 
  * <p>
- * The class also supports {@link com.enably.tk.data.Validator validators}
+ * The class also supports {@link com.itmill.toolkit.data.Validator validators}
  * to make sure the value contained in the field is valid.
  * </p>
  * 
@@ -161,7 +161,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Change the readonly state and throw read-only status change events.
      * 
-     * @see com.enably.tk.ui.Component#setReadOnly(boolean)
+     * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean)
      */
     public void setReadOnly(boolean readOnly) {
         super.setReadOnly(readOnly);
@@ -609,7 +609,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * Fields allow invalid values by default. In most cases this is wanted,
      * because the field otherwise visually forget the user input immediately.
      * 
-     * @see com.enably.tk.data.Validatable#isInvalidAllowed()
+     * @see com.itmill.toolkit.data.Validatable#isInvalidAllowed()
      * 
      * @return true iff the invalid values are allowed.
      */
@@ -626,7 +626,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * values. The validators are automatically copied to the field when the
      * datasource is set.
      * 
-     * @see com.enably.tk.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.itmill.toolkit.data.Validatable#setInvalidAllowed(boolean)
      */
     public void setInvalidAllowed(boolean invalidAllowed)
             throws UnsupportedOperationException {
@@ -638,7 +638,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * thrown by the superclasses (that is the component error message),
      * validation errors and buffered source errors.
      * 
-     * @see com.enably.tk.ui.AbstractComponent#getErrorMessage()
+     * @see com.itmill.toolkit.ui.AbstractComponent#getErrorMessage()
      */
     public ErrorMessage getErrorMessage() {
         ErrorMessage superError = super.getErrorMessage();
@@ -872,14 +872,14 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     }
 
     /**
-     * @see com.enably.tk.ui.Component.Focusable#getFocusableId()
+     * @see com.itmill.toolkit.ui.Component.Focusable#getFocusableId()
      */
     public long getFocusableId() {
         return this.focusableId;
     }
 
     /**
-     * @see com.enably.tk.ui.Component#attach()
+     * @see com.itmill.toolkit.ui.Component#attach()
      */
     public void attach() {
         super.attach();
diff --git a/src/com/enably/tk/ui/BaseFieldFactory.java b/src/com/itmill/toolkit/ui/BaseFieldFactory.java
index 8326315645..9ea6d3efc8 100644
--- a/src/com/enably/tk/ui/BaseFieldFactory.java
+++ b/src/com/itmill/toolkit/ui/BaseFieldFactory.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Date;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /** Default implementation of the 
 
@@ -58,7 +58,7 @@ public class BaseFieldFactory implements FieldFactory {
 	 * @param type The type of data presented in field
 	 * @param uiContext The context where the Field is presented.
 	 * 
-	 * @see com.enably.tk.ui.FieldFactory#createField(Class, Component)
+	 * @see com.itmill.toolkit.ui.FieldFactory#createField(Class, Component)
 	 */
 	public Field createField(Class type, Component uiContext) {
 		// Null typed properties can not be edited
@@ -92,7 +92,7 @@ public class BaseFieldFactory implements FieldFactory {
 
 	/** Create field based on the datasource property.
 	 * 
-	 * @see com.enably.tk.ui.FieldFactory#createField(Property, Component)
+	 * @see com.itmill.toolkit.ui.FieldFactory#createField(Property, Component)
 	 */
 	public Field createField(Property property, Component uiContext) {
 		if (property != null)
@@ -103,7 +103,7 @@ public class BaseFieldFactory implements FieldFactory {
 
 	/** Creates field based on the item and property id.
 	 * 
-	 * @see com.enably.tk.ui.FieldFactory#createField(Item, Object, Component)
+	 * @see com.itmill.toolkit.ui.FieldFactory#createField(Item, Object, Component)
 	 */
 	public Field createField(Item item, Object propertyId, Component uiContext) {
 		if (item != null && propertyId != null){
@@ -117,7 +117,7 @@ public class BaseFieldFactory implements FieldFactory {
 	}
 	
 	/**
-	 * @see com.enably.tk.ui.FieldFactory#createField(com.enably.tk.data.Container, java.lang.Object, java.lang.Object, com.enably.tk.ui.Component)
+	 * @see com.itmill.toolkit.ui.FieldFactory#createField(com.itmill.toolkit.data.Container, java.lang.Object, java.lang.Object, com.itmill.toolkit.ui.Component)
 	 */
 	public Field createField(
 		Container container,
diff --git a/src/com/enably/tk/ui/Button.java b/src/com/itmill/toolkit/ui/Button.java
index 1aa3fb5776..1b1d22d3d9 100644
--- a/src/com/enably/tk/ui/Button.java
+++ b/src/com/itmill/toolkit/ui/Button.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Map;
 import java.lang.reflect.Method;
 
-import com.enably.tk.data.Property;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** A generic button component.
  *
@@ -194,7 +194,7 @@ public class Button extends AbstractField {
 	}
 
 	/** Set immediate mode. 
-	* @see com.enably.tk.ui.AbstractComponent#setImmediate(boolean)
+	* @see com.itmill.toolkit.ui.AbstractComponent#setImmediate(boolean)
 	* 
 	* Push buttons can not be set in non-immediate mode.
 	*/
@@ -204,7 +204,7 @@ public class Button extends AbstractField {
 	}
 
 	/** The type of the button as a property.
-	* @see com.enably.tk.data.Property#getType()
+	* @see com.itmill.toolkit.data.Property#getType()
 	*/
 	public Class getType() {
 		return Boolean.class;
diff --git a/src/com/enably/tk/ui/Component.java b/src/com/itmill/toolkit/ui/Component.java
index bbd74a3890..d1e6bb8039 100644
--- a/src/com/enably/tk/ui/Component.java
+++ b/src/com/itmill/toolkit/ui/Component.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,20 +19,20 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.ErrorMessage;
-import com.enably.tk.terminal.Paintable;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.ErrorMessage;
+import com.itmill.toolkit.terminal.Paintable;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 import java.util.Collection;
 import java.util.EventListener;
@@ -56,7 +56,7 @@ public interface Component extends Paintable, VariableOwner {
 	public String getStyle();
 
 	/** Sets the look-and-feel style of the component.  This method will
-	 * trigger a {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * trigger a {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 * .
 	 * @param style new style of the component
 	 */
@@ -78,7 +78,7 @@ public interface Component extends Paintable, VariableOwner {
 
 	/** Enable or disable the component. Being enabled means that the
 	 * component can be edited.  This method will trigger a
-	 * {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 * 
 	 * @param enabled boolean value specifying if the component should be
 	 * enabled after the call or not
@@ -133,7 +133,7 @@ public interface Component extends Paintable, VariableOwner {
 
 	/** Sets the component's to read-only mode to the specified state. This
 	 * method will trigger a 
-	 * {@link com.enably.tk.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
+	 * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent RepaintRequestEvent}.
 	 * 
 	 * @param readOnly boolean value specifying if the component should be
 	 * in read-only mode after the call or not
diff --git a/src/com/enably/tk/ui/ComponentContainer.java b/src/com/itmill/toolkit/ui/ComponentContainer.java
index 762f15409a..0ea1b9b9c4 100644
--- a/src/com/enably/tk/ui/ComponentContainer.java
+++ b/src/com/itmill/toolkit/ui/ComponentContainer.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Iterator;
 
diff --git a/src/com/enably/tk/ui/CustomComponent.java b/src/com/itmill/toolkit/ui/CustomComponent.java
index e19fb68eec..1df4abc134 100644
--- a/src/com/enably/tk/ui/CustomComponent.java
+++ b/src/com/itmill/toolkit/ui/CustomComponent.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -35,11 +35,11 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.VariableOwner;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.VariableOwner;
 
 /** Custom component provides simple implementation of Component interface for 
  * creation of new UI components by composition of existing components. 
diff --git a/src/com/enably/tk/ui/CustomLayout.java b/src/com/itmill/toolkit/ui/CustomLayout.java
index afcdcc63f9..c3ced267d4 100644
--- a/src/com/enably/tk/ui/CustomLayout.java
+++ b/src/com/itmill/toolkit/ui/CustomLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,17 +19,17 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 import java.util.Iterator;
 import java.util.HashMap;
diff --git a/src/com/enably/tk/ui/DateField.java b/src/com/itmill/toolkit/ui/DateField.java
index 8497e61b02..facb8d3f30 100644
--- a/src/com/enably/tk/ui/DateField.java
+++ b/src/com/itmill/toolkit/ui/DateField.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -35,9 +35,9 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 
-import com.enably.tk.data.Property;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /**
  * <p>
@@ -46,9 +46,9 @@ import com.enably.tk.terminal.PaintTarget;
  * 
  * <p>
  * Since <code>DateField</code> extends <code>AbstractField</code> it
- * implements the {@link com.enably.tk.data.Buffered}interface. A
+ * implements the {@link com.itmill.toolkit.data.Buffered}interface. A
  * <code>DateField</code> is in write-through mode by default, so
- * {@link com.enably.tk.ui.AbstractField#setWriteThrough(boolean)}must be
+ * {@link com.itmill.toolkit.ui.AbstractField#setWriteThrough(boolean)}must be
  * called to enable buffering.
  * </p>
  * 
@@ -141,7 +141,7 @@ public class DateField extends AbstractField {
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents. The editor constructed this way will not be bound
      * to a Property unless
-     * {@link com.enably.tk.data.Property.Viewer#setPropertyDataSource(Property)}
+     * {@link com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
      * 
      * @param caption
@@ -346,7 +346,7 @@ public class DateField extends AbstractField {
     /**
      * Set DateField datasource. Datasource type must assignable to Date.
      * 
-     * @see com.enably.tk.data.Property.Viewer#setPropertyDataSource(Property)
+     * @see com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)
      */
     public void setPropertyDataSource(Property newDataSource) {
         if (newDataSource == null
diff --git a/src/com/enably/tk/ui/Embedded.java b/src/com/itmill/toolkit/ui/Embedded.java
index a6cd0861fc..9422077c14 100644
--- a/src/com/enably/tk/ui/Embedded.java
+++ b/src/com/itmill/toolkit/ui/Embedded.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,22 +19,22 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.Sizeable;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.Sizeable;
 
 /** Component for embedding external objects.
  *
@@ -396,7 +396,7 @@ public class Embedded extends AbstractComponent implements Sizeable {
 
 	/**Get height property units.
 	 * Default units are <code>Sizeable.UNITS_PIXELS</code>.
-	 * @see com.enably.tk.terminal.Sizeable#getHeightUnits()
+	 * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
 	 */
 	public int getHeightUnits() {
 		return this.heightUnits;
@@ -404,14 +404,14 @@ public class Embedded extends AbstractComponent implements Sizeable {
 
 	/**Get width property units.
 	 * Default units are <code>Sizeable.UNITS_PIXELS</code>.
-	 * @see com.enably.tk.terminal.Sizeable#getWidthUnits()
+	 * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
 	 */
 	public int getWidthUnits() {
 		return this.widthUnits;
 	}
 
 	/**Set height property units.
-	 * @see com.enably.tk.terminal.Sizeable#setHeightUnits(int)
+	 * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
 	 */
 	public void setHeightUnits(int units) {
 		if (units >= 0 && units <= Sizeable.UNITS_PERCENTAGE && this.heightUnits != units) {
@@ -421,7 +421,7 @@ public class Embedded extends AbstractComponent implements Sizeable {
 	}
 
 	/**Set width property units.
-	 * @see com.enably.tk.terminal.Sizeable#setWidthUnits(int)
+	 * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
 	 */
 	public void setWidthUnits(int units) {
 		if (units >= 0 && units <= Sizeable.UNITS_PERCENTAGE && this.widthUnits != units) {
diff --git a/src/com/enably/tk/ui/Field.java b/src/com/itmill/toolkit/ui/Field.java
index 3bf455e93c..837162bbde 100644
--- a/src/com/enably/tk/ui/Field.java
+++ b/src/com/itmill/toolkit/ui/Field.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.data.BufferedValidatable;
-import com.enably.tk.data.Property;
-import com.enably.tk.ui.Component.Focusable;
+import com.itmill.toolkit.data.BufferedValidatable;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.ui.Component.Focusable;
 
 /**
  * @author Sami Ekblad
diff --git a/src/com/enably/tk/ui/FieldFactory.java b/src/com/itmill/toolkit/ui/FieldFactory.java
index c00aca7fa1..041b2761a8 100644
--- a/src/com/enably/tk/ui/FieldFactory.java
+++ b/src/com/itmill/toolkit/ui/FieldFactory.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
 
 /** Factory for creating new Field-instances based on type,
  *  datasource and/or context.
diff --git a/src/com/enably/tk/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java
index fd1f9e7ca9..b80159683d 100644
--- a/src/com/enably/tk/ui/Form.java
+++ b/src/com/itmill/toolkit/ui/Form.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -34,11 +34,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.enably.tk.data.*;
-import com.enably.tk.data.Validator.InvalidValueException;
-import com.enably.tk.data.util.BeanItem;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.*;
+import com.itmill.toolkit.data.Validator.InvalidValueException;
+import com.itmill.toolkit.data.util.BeanItem;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** Form component provides easy way of creating and managing sets fields.
  * 
@@ -51,7 +51,7 @@ import com.enably.tk.terminal.PaintTarget;
  * </p>
  * 
  * <p>Form provides customizable editor for classes implementing
- * {@link com.enably.tk.data.Item} interface. Also the form itself
+ * {@link com.itmill.toolkit.data.Item} interface. Also the form itself
  * implements this interface for easier connectivity to other items.
  * To use the form as editor for an item, just connect the item to
  * form with {@link Form#setItemDataSource(Item)}. If only a part of the
@@ -59,9 +59,9 @@ import com.enably.tk.terminal.PaintTarget;
  * can be used instead. After the item has been connected to the form,
  * the automatically created fields can be customized and new fields can
  * be added. If you need to connect a class that does not implement
- * {@link com.enably.tk.data.Item} interface, most properties of any
+ * {@link com.itmill.toolkit.data.Item} interface, most properties of any
  * class following bean pattern, can be accessed trough 
- * {@link com.enably.tk.data.util.BeanItem}.</p>
+ * {@link com.itmill.toolkit.data.util.BeanItem}.</p>
  * 
  * @author IT Mill Ltd.
  * @version @VERSION@
@@ -281,7 +281,7 @@ public class Form
 
 	/** Add a new property to form and create corresponding field.
 	 * 
-	 * @see com.enably.tk.data.Item#addItemProperty(Object, Property)
+	 * @see com.itmill.toolkit.data.Item#addItemProperty(Object, Property)
 	 */
 	public boolean addItemProperty(Object id, Property property) {
 
@@ -361,7 +361,7 @@ public class Form
 	 * having no data source,
 	 * the field is returned instead of the data source.</p>
 	 * 
-	 * @see com.enably.tk.data.Item#getItemProperty(Object)
+	 * @see com.itmill.toolkit.data.Item#getItemProperty(Object)
 	 */
 	public Property getItemProperty(Object id) {
 		Field field = (Field) fields.get(id);
@@ -387,7 +387,7 @@ public class Form
 
 	/** Removes the property and corresponding field from the form.
 	 * 
-	 * @see com.enably.tk.data.Item#removeItemProperty(Object)
+	 * @see com.itmill.toolkit.data.Item#removeItemProperty(Object)
 	 */
 	public boolean removeItemProperty(Object id) {
 
@@ -431,7 +431,7 @@ public class Form
 	 * <p>Setting item datasource clears any fields, the form might contain
 	 * and adds all the properties as fields to the form.</p>
 	 * 
-	 * @see com.enably.tk.data.Item.Viewer#setItemDataSource(Item)
+	 * @see com.itmill.toolkit.data.Item.Viewer#setItemDataSource(Item)
 	 */
 	public void setItemDataSource(Item newDataSource) {
 		setItemDataSource(
@@ -446,7 +446,7 @@ public class Form
 	 * and adds the specified the properties as fields to the form, in the
 	 * specified order.</p>
 	 * 
-	 * @see com.enably.tk.data.Item.Viewer#setItemDataSource(Item)
+	 * @see com.itmill.toolkit.data.Item.Viewer#setItemDataSource(Item)
 	 */
 	public void setItemDataSource(Item newDataSource, Collection propertyIds) {
 
@@ -615,7 +615,7 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.ui.Component#attach()
+	 * @see com.itmill.toolkit.ui.Component#attach()
 	 */
 	public void attach() {
 		super.attach();
@@ -623,7 +623,7 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.ui.Component#detach()
+	 * @see com.itmill.toolkit.ui.Component#detach()
 	 */
 	public void detach() {
 		super.detach();
@@ -631,7 +631,7 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.data.Validatable#addValidator(com.enably.tk.data.Validator)
+	 * @see com.itmill.toolkit.data.Validatable#addValidator(com.itmill.toolkit.data.Validator)
 	 */
 	public void addValidator(Validator validator) {
 
@@ -641,7 +641,7 @@ public class Form
 		this.validators.add(validator);
 	}
 	/**
-	 * @see com.enably.tk.data.Validatable#removeValidator(com.enably.tk.data.Validator)
+	 * @see com.itmill.toolkit.data.Validatable#removeValidator(com.itmill.toolkit.data.Validator)
 	 */
 	public void removeValidator(Validator validator) {
 		if (this.validators != null) {
@@ -649,7 +649,7 @@ public class Form
 		}
 	}
 	/**
-	 * @see com.enably.tk.data.Validatable#getValidators()
+	 * @see com.itmill.toolkit.data.Validatable#getValidators()
 	 */
 	public Collection getValidators() {
 		if (this.validators == null) {
@@ -658,7 +658,7 @@ public class Form
 		return null;
 	}
 	/**
-	 * @see com.enably.tk.data.Validatable#isValid()
+	 * @see com.itmill.toolkit.data.Validatable#isValid()
 	 */
 	public boolean isValid() {
 		boolean valid = true;
@@ -667,7 +667,7 @@ public class Form
 		return valid;
 	}
 	/**
-	 * @see com.enably.tk.data.Validatable#validate()
+	 * @see com.itmill.toolkit.data.Validatable#validate()
 	 */
 	public void validate() throws InvalidValueException {
 		for (Iterator i = propertyIds.iterator(); i.hasNext();)
@@ -675,20 +675,20 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.data.Validatable#isInvalidAllowed()
+	 * @see com.itmill.toolkit.data.Validatable#isInvalidAllowed()
 	 */
 	public boolean isInvalidAllowed() {
 		return true;
 	}
 	/**
-	 * @see com.enably.tk.data.Validatable#setInvalidAllowed(boolean)
+	 * @see com.itmill.toolkit.data.Validatable#setInvalidAllowed(boolean)
 	 */
 	public void setInvalidAllowed(boolean invalidValueAllowed)
 		throws UnsupportedOperationException {
 		throw new UnsupportedOperationException();
 	}
 	/**
-	 * @see com.enably.tk.ui.Component#setReadOnly(boolean)
+	 * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean)
 	 */
 	public void setReadOnly(boolean readOnly) {
 		super.setReadOnly(readOnly);
@@ -718,7 +718,7 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.ui.AbstractField#getType()
+	 * @see com.itmill.toolkit.ui.AbstractField#getType()
 	 */
 	public Class getType() {
 		if (getPropertyDataSource() != null)
@@ -729,7 +729,7 @@ public class Form
 	/** Set the internal value.
 	 * 
 	 * This is relevant when the Form is used as Field.
-	 * @see com.enably.tk.ui.AbstractField#setInternalValue(java.lang.Object)
+	 * @see com.itmill.toolkit.ui.AbstractField#setInternalValue(java.lang.Object)
 	 */
 	protected void setInternalValue(Object newValue) {
 		// Store old value
@@ -802,7 +802,7 @@ public class Form
 	}
 
 	/** Focuses the first field in the form.
-	 * @see com.enably.tk.ui.Component.Focusable#focus()
+	 * @see com.itmill.toolkit.ui.Component.Focusable#focus()
 	 */
 	public void focus() {
 		Field f = getFirstField();
@@ -812,7 +812,7 @@ public class Form
 	}
 
 	/**
-	 * @see com.enably.tk.ui.Component.Focusable#setTabIndex(int)
+	 * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int)
 	 */
 	public void setTabIndex(int tabIndex) {
 		super.setTabIndex(tabIndex);
diff --git a/src/com/enably/tk/ui/FrameWindow.java b/src/com/itmill/toolkit/ui/FrameWindow.java
index 790bf34b52..4588f02e17 100644
--- a/src/com/enably/tk/ui/FrameWindow.java
+++ b/src/com/itmill/toolkit/ui/FrameWindow.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.net.URL;
 import java.util.Collections;
@@ -34,10 +34,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
 
 /** <p>An application frame window component. This component implements a
  * window that contains a hierarchical set of frames. Each frame can contain
@@ -94,7 +94,7 @@ public class FrameWindow extends Window {
 	 * @param target A paint target event
 	 * @throws PaintException if the paint operation fails
 	 * 
-	 * @see com.enably.tk.ui.AbstractComponent#paintContent(PaintTarget)
+	 * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(PaintTarget)
 	 */
 	public void paintContent(PaintTarget target) throws PaintException {
 
@@ -416,7 +416,7 @@ public class FrameWindow extends Window {
 
 	/** Setting the application for frame window also sets the application
 	 * for all the frames.
-	 * @see com.enably.tk.ui.Window#setApplication(Application)
+	 * @see com.itmill.toolkit.ui.Window#setApplication(Application)
 	 */
 	public void setApplication(Application application) {
 		Application fromApplication = getApplication();
@@ -434,21 +434,21 @@ public class FrameWindow extends Window {
 
 	/** Frame windows does not support scrolling.
 	 *
-	 * @see com.enably.tk.terminal.Scrollable#setScrollable(boolean)
+	 * @see com.itmill.toolkit.terminal.Scrollable#setScrollable(boolean)
 	 */
 	public void setScrollable(boolean isScrollingEnabled) {
 	}
 
 	/** Frame windows does not support scrolling.
 	 *
-	 * @see com.enably.tk.terminal.Scrollable#setScrollOffsetX(int)
+	 * @see com.itmill.toolkit.terminal.Scrollable#setScrollOffsetX(int)
 	 */
 	public void setScrollOffsetX(int pixelsScrolledLeft) {
 	}
 
 	/** Frame windows does not support scrolling.
 	 *
-	 * @see com.enably.tk.terminal.Scrollable#setScrollOffsetY(int)
+	 * @see com.itmill.toolkit.terminal.Scrollable#setScrollOffsetY(int)
 	 */
 	public void setScrollOffsetY(int pixelsScrolledDown) {
 	}
@@ -458,7 +458,7 @@ public class FrameWindow extends Window {
 	 * <p>To add component to frame window, normal window must be
 	 * first created and then attached to frame window as a frame.</p>
 	 * 
-	 * @see com.enably.tk.ui.ComponentContainer#addComponent(Component)
+	 * @see com.itmill.toolkit.ui.ComponentContainer#addComponent(Component)
 	 * @throws UnsupportedOperationException if invoked.
 	 */
 	public void addComponent(Component c)
diff --git a/src/com/enably/tk/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java
index 709bf3d534..3af8f34ac7 100644
--- a/src/com/enably/tk/ui/GridLayout.java
+++ b/src/com/itmill/toolkit/ui/GridLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,22 +19,22 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** <p>A container that consists of components with certain coordinates on a
  * grid. It also maintains cursor for adding component in left to right,
@@ -451,7 +451,7 @@ public class GridLayout extends AbstractComponentContainer implements Layout {
 	/** Gets the components UIDL tag.
 	 * 
 	 * @return Component UIDL tag as string.
-	 * @see com.enably.tk.ui.AbstractComponent#getTag()
+	 * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
 	 */
 	public String getTag() {
 		return "gridlayout";
@@ -746,7 +746,7 @@ public class GridLayout extends AbstractComponentContainer implements Layout {
 	}
 	
 	/*
-	 * @see com.enably.tk.ui.ComponentContainer#removeAllComponents()
+	 * @see com.itmill.toolkit.ui.ComponentContainer#removeAllComponents()
 	 */
 	public void removeAllComponents() {
 		super.removeAllComponents();
diff --git a/src/com/enably/tk/ui/Label.java b/src/com/itmill/toolkit/ui/Label.java
index 361896cefc..c2897a5652 100644
--- a/src/com/enably/tk/ui/Label.java
+++ b/src/com/itmill/toolkit/ui/Label.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,21 +19,21 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.lang.reflect.Method;
 
-import com.enably.tk.data.Property;
-import com.enably.tk.data.util.ObjectProperty;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.data.util.ObjectProperty;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** Label component for showing non-editable short texts.
  *
@@ -386,7 +386,7 @@ public class Label
 	}
 
 	/** Listen value change events from data source.
-	 * @see com.enably.tk.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+	 * @see com.itmill.toolkit.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
 	 */
 	public void valueChange(Property.ValueChangeEvent event) {
 		fireValueChange();
diff --git a/src/com/enably/tk/ui/Layout.java b/src/com/itmill/toolkit/ui/Layout.java
index eeabd9bca7..e3805f6dd1 100644
--- a/src/com/enably/tk/ui/Layout.java
+++ b/src/com/itmill/toolkit/ui/Layout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 /** Extension to the {@link ComponentContainer} interface which adds the
  * layouting control to the elements in the container. This is
diff --git a/src/com/enably/tk/ui/Link.java b/src/com/itmill/toolkit/ui/Link.java
index 4ba544e18c..c09859dcda 100644
--- a/src/com/enably/tk/ui/Link.java
+++ b/src/com/itmill/toolkit/ui/Link.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,18 +19,18 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
 
 /** Link component.
  *  Link is used to create external or internal URL links.
diff --git a/src/com/enably/tk/ui/OrderedLayout.java b/src/com/itmill/toolkit/ui/OrderedLayout.java
index 0090411701..eacdbac926 100644
--- a/src/com/enably/tk/ui/OrderedLayout.java
+++ b/src/com/itmill/toolkit/ui/OrderedLayout.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,17 +19,17 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/com/enably/tk/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index 8c49582573..08d6482d43 100644
--- a/src/com/enably/tk/ui/Panel.java
+++ b/src/com/itmill/toolkit/ui/Panel.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,22 +19,22 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Scrollable;
-import com.enably.tk.terminal.Sizeable;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Scrollable;
+import com.itmill.toolkit.terminal.Sizeable;
 
 /** Panel - a simple single component container.
  * @author IT Mill Ltd.
@@ -231,7 +231,7 @@ public class Panel
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.VariableOwner#changeVariables(Object, Map)
+	 * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(Object, Map)
 	 */
 	public void changeVariables(Object source, Map variables) {
 		super.changeVariables(source, variables);
@@ -254,14 +254,14 @@ public class Panel
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.Sizeable#getHeightUnits()
+	 * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
 	 */
 	public int getHeightUnits() {
 		return heightUnit;
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.Sizeable#getWidthUnits()
+	 * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
 	 */
 	public int getWidthUnits() {
 		return widthUnit;
@@ -269,7 +269,7 @@ public class Panel
 
 	/** Set height units.
 	 * Panel supports only Sizeable.UNITS_PIXELS and this is ignored.
-	 * @see com.enably.tk.terminal.Sizeable#setHeightUnits(int)
+	 * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
 	 */
 	public void setHeightUnits(int units) {
 		// Ignored
@@ -277,7 +277,7 @@ public class Panel
 
 	/** Set width units.
 	 *  Panel supports only Sizeable.UNITS_PIXELS, and this is ignored.
-	 * @see com.enably.tk.terminal.Sizeable#setWidthUnits(int)
+	 * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
 	 */
 	public void setWidthUnits(int units) {
 		// Ignored
@@ -337,7 +337,7 @@ public class Panel
 	}
 
 	/** Pass the events from underlying layout forwards.
-	 * @see com.enably.tk.ui.ComponentContainer.ComponentAttachListener#componentAttachedToContainer(com.enably.tk.ui.ComponentContainer.ComponentAttachEvent)
+	 * @see com.itmill.toolkit.ui.ComponentContainer.ComponentAttachListener#componentAttachedToContainer(com.itmill.toolkit.ui.ComponentContainer.ComponentAttachEvent)
 	 */
 	public void componentAttachedToContainer(ComponentAttachEvent event) {
 		if (event.getContainer() == layout)
@@ -345,7 +345,7 @@ public class Panel
 	}
 
 	/** Pass the events from underlying layout forwards.
-	 * @see com.enably.tk.ui.ComponentContainer.ComponentDetachListener#componentDetachedFromContainer(com.enably.tk.ui.ComponentContainer.ComponentDetachEvent)
+	 * @see com.itmill.toolkit.ui.ComponentContainer.ComponentDetachListener#componentDetachedFromContainer(com.itmill.toolkit.ui.ComponentContainer.ComponentDetachEvent)
 	 */
 	public void componentDetachedFromContainer(ComponentDetachEvent event) {
 		if (event.getContainer() == layout)
@@ -353,20 +353,20 @@ public class Panel
 	}
 
 	/*
-	 * @see com.enably.tk.ui.Component#attach()
+	 * @see com.itmill.toolkit.ui.Component#attach()
 	 */
 	public void attach() {
 		if (layout != null) layout.attach();
 	}
 
 	/*
-	 * @see com.enably.tk.ui.Component#detach()
+	 * @see com.itmill.toolkit.ui.Component#detach()
 	 */
 	public void detach() {
 		if (layout != null) layout.detach();
 	}	
 	/* 
-	 * @see com.enably.tk.ui.ComponentContainer#removeAllComponents()
+	 * @see com.itmill.toolkit.ui.ComponentContainer#removeAllComponents()
 	 */
 	public void removeAllComponents() {
 		layout.removeAllComponents();
diff --git a/src/com/enably/tk/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 7ac2c4ecbc..be73c31420 100644
--- a/src/com/enably/tk/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -37,19 +37,19 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
-import com.enably.tk.data.util.IndexedContainer;
-import com.enably.tk.terminal.KeyMapper;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.data.util.IndexedContainer;
+import com.itmill.toolkit.terminal.KeyMapper;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
 
 /** <p>A class representing a selection of items the user has selected in a
  * UI. The set of choices is presented as a set of
- * {@link com.enably.tk.data.Item}s in a 
- * {@link com.enably.tk.data.Container}.</p>
+ * {@link com.itmill.toolkit.data.Item}s in a 
+ * {@link com.itmill.toolkit.data.Container}.</p>
  * 
  * <p>A <code>Select</code> component may be in single- or multiselect mode.
  * Multiselect mode means that more than one item can be selected
@@ -81,7 +81,7 @@ public class Select
 
 	/** Item caption mode: Index of the item is used as caption. The
 	 * index mode can only be used with the containers implementing the
-	 * {@link com.enably.tk.data.Container.Indexed} interface.
+	 * {@link com.itmill.toolkit.data.Container.Indexed} interface.
 	 */
 	public static final int ITEM_CAPTION_MODE_INDEX = 2;
 
@@ -488,7 +488,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container#getContainerProperty(Object, Object)
+	 * @see com.itmill.toolkit.data.Container#getContainerProperty(Object, Object)
 	 */
 	public Property getContainerProperty(Object itemId, Object propertyId) {
 		return items.getContainerProperty(itemId, propertyId);
@@ -1053,7 +1053,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.PropertySetChangeListener#containerPropertySetChange(com.enably.tk.data.Container.PropertySetChangeEvent)
+	 * @see com.itmill.toolkit.data.Container.PropertySetChangeListener#containerPropertySetChange(com.itmill.toolkit.data.Container.PropertySetChangeEvent)
 	 */
 	public void containerPropertySetChange(
 		Container.PropertySetChangeEvent event) {
@@ -1061,7 +1061,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.PropertySetChangeNotifier#addListener(com.enably.tk.data.Container.PropertySetChangeListener)
+	 * @see com.itmill.toolkit.data.Container.PropertySetChangeNotifier#addListener(com.itmill.toolkit.data.Container.PropertySetChangeListener)
 	 */
 	public void addListener(Container.PropertySetChangeListener listener) {
 		if (propertySetEventListeners == null)
@@ -1070,7 +1070,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.PropertySetChangeNotifier#removeListener(com.enably.tk.data.Container.PropertySetChangeListener)
+	 * @see com.itmill.toolkit.data.Container.PropertySetChangeNotifier#removeListener(com.itmill.toolkit.data.Container.PropertySetChangeListener)
 	 */
 	public void removeListener(Container.PropertySetChangeListener listener) {
 		if (propertySetEventListeners != null) {
@@ -1081,7 +1081,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.ItemSetChangeNotifier#addListener(com.enably.tk.data.Container.ItemSetChangeListener)
+	 * @see com.itmill.toolkit.data.Container.ItemSetChangeNotifier#addListener(com.itmill.toolkit.data.Container.ItemSetChangeListener)
 	 */
 	public void addListener(Container.ItemSetChangeListener listener) {
 		if (itemSetEventListeners == null)
@@ -1090,7 +1090,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.ItemSetChangeNotifier#removeListener(com.enably.tk.data.Container.ItemSetChangeListener)
+	 * @see com.itmill.toolkit.data.Container.ItemSetChangeNotifier#removeListener(com.itmill.toolkit.data.Container.ItemSetChangeListener)
 	 */
 	public void removeListener(Container.ItemSetChangeListener listener) {
 		if (itemSetEventListeners != null) {
@@ -1101,7 +1101,7 @@ public class Select
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.ItemSetChangeListener#containerItemSetChange(com.enably.tk.data.Container.ItemSetChangeEvent)
+	 * @see com.itmill.toolkit.data.Container.ItemSetChangeListener#containerItemSetChange(com.itmill.toolkit.data.Container.ItemSetChangeEvent)
 	 */
 	public void containerItemSetChange(Container.ItemSetChangeEvent event) {
 		// Clear item id mapping table
@@ -1150,7 +1150,7 @@ public class Select
 	private class ItemSetChangeEvent implements Container.ItemSetChangeEvent {
 
 		/**
-		 * @see com.enably.tk.data.Container.ItemSetChangeEvent#getContainer()
+		 * @see com.itmill.toolkit.data.Container.ItemSetChangeEvent#getContainer()
 		 */
 		public Container getContainer() {
 			return Select.this;
@@ -1163,7 +1163,7 @@ public class Select
 		implements Container.PropertySetChangeEvent {
 
 		/**
-		 * @see com.enably.tk.data.Container.PropertySetChangeEvent#getContainer()
+		 * @see com.itmill.toolkit.data.Container.PropertySetChangeEvent#getContainer()
 		 */
 		public Container getContainer() {
 			return Select.this;
diff --git a/src/com/enably/tk/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java
index de6f8226a4..adadc476e6 100644
--- a/src/com/enably/tk/ui/TabSheet.java
+++ b/src/com/itmill/toolkit/ui/TabSheet.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.lang.reflect.Method;
 import java.util.Hashtable;
@@ -34,7 +34,7 @@ import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.enably.tk.terminal.*;
+import com.itmill.toolkit.terminal.*;
 
 /** Tabsheet component. 
  *
diff --git a/src/com/enably/tk/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index 8fb4ef7270..08f4be3cf1 100644
--- a/src/com/enably/tk/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -38,16 +38,16 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.Item;
-import com.enably.tk.data.Property;
-import com.enably.tk.data.util.ContainerOrderedWrapper;
-import com.enably.tk.data.util.IndexedContainer;
-import com.enably.tk.event.Action;
-import com.enably.tk.terminal.KeyMapper;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.data.util.ContainerOrderedWrapper;
+import com.itmill.toolkit.data.util.IndexedContainer;
+import com.itmill.toolkit.event.Action;
+import com.itmill.toolkit.terminal.KeyMapper;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
 
 /**
  * Table component is used for representing data or components in pageable and
@@ -1110,7 +1110,7 @@ public class Table extends Select implements Action.Container,
     /* Overriding select behavior******************************************** */
 
     /**
-     * @see com.enably.tk.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container)
      */
     public void setContainerDataSource(Container newDataSource) {
 
@@ -1628,7 +1628,7 @@ public class Table extends Select implements Action.Container,
     /* Action container *************************************************** */
 
     /**
-     * @see com.enably.tk.event.Action.Container#addActionHandler(Action.Handler)
+     * @see com.itmill.toolkit.event.Action.Container#addActionHandler(Action.Handler)
      */
     public void addActionHandler(Action.Handler actionHandler) {
 
@@ -1648,7 +1648,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.event.Action.Container#removeActionHandler(Action.Handler)
+     * @see com.itmill.toolkit.event.Action.Container#removeActionHandler(Action.Handler)
      */
     public void removeActionHandler(Action.Handler actionHandler) {
 
@@ -1668,7 +1668,7 @@ public class Table extends Select implements Action.Container,
     /* Property value change listening support **************************** */
 
     /**
-     * @see com.enably.tk.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+     * @see com.itmill.toolkit.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
     public void valueChange(Property.ValueChangeEvent event) {
         super.valueChange(event);
@@ -1676,7 +1676,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.ui.Component#attach()
+     * @see com.itmill.toolkit.ui.Component#attach()
      */
     public void attach() {
         super.attach();
@@ -1687,7 +1687,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.ui.Component#attach()
+     * @see com.itmill.toolkit.ui.Component#attach()
      */
     public void detach() {
         super.detach();
@@ -1698,7 +1698,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.data.Container#removeAllItems()
+     * @see com.itmill.toolkit.data.Container#removeAllItems()
      */
     public boolean removeAllItems() {
         this.currentPageFirstItemId = null;
@@ -1707,7 +1707,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.data.Container#removeItem(Object)
+     * @see com.itmill.toolkit.data.Container#removeItem(Object)
      */
     public boolean removeItem(Object itemId) {
         Object nextItemId = ((Container.Ordered) items).nextItemId(itemId);
@@ -1720,7 +1720,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.data.Container#removeContainerProperty(Object)
+     * @see com.itmill.toolkit.data.Container#removeContainerProperty(Object)
      */
     public boolean removeContainerProperty(Object propertyId)
             throws UnsupportedOperationException {
@@ -1737,7 +1737,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Adds a new property to the table and show it as a visible column.
      * 
-     * @see com.enably.tk.data.Container#addContainerProperty(Object,
+     * @see com.itmill.toolkit.data.Container#addContainerProperty(Object,
      *      Class, Object)
      * 
      * @param propertyId
@@ -1759,7 +1759,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Adds a new property to the table and show it as a visible column.
      * 
-     * @see com.enably.tk.data.Container#addContainerProperty(Object,
+     * @see com.itmill.toolkit.data.Container#addContainerProperty(Object,
      *      Class, Object)
      * 
      * @param propertyId
@@ -1791,7 +1791,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Return list of items on the current page
      * 
-     * @see com.enably.tk.ui.Select#getVisibleItemIds()
+     * @see com.itmill.toolkit.ui.Select#getVisibleItemIds()
      */
     public Collection getVisibleItemIds() {
 
@@ -1808,7 +1808,7 @@ public class Table extends Select implements Action.Container,
      * Container datasource item set change. Table must flush its buffers on
      * change.
      * 
-     * @see com.enably.tk.data.Container.ItemSetChangeListener#containerItemSetChange(com.enably.tk.data.Container.ItemSetChangeEvent)
+     * @see com.itmill.toolkit.data.Container.ItemSetChangeListener#containerItemSetChange(com.itmill.toolkit.data.Container.ItemSetChangeEvent)
      */
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
         pageBuffer = null;
@@ -1820,7 +1820,7 @@ public class Table extends Select implements Action.Container,
      * Container datasource property set change. Table must flush its buffers on
      * change.
      * 
-     * @see com.enably.tk.data.Container.PropertySetChangeListener#containerPropertySetChange(com.enably.tk.data.Container.PropertySetChangeEvent)
+     * @see com.itmill.toolkit.data.Container.PropertySetChangeListener#containerPropertySetChange(com.itmill.toolkit.data.Container.PropertySetChangeEvent)
      */
     public void containerPropertySetChange(
             Container.PropertySetChangeEvent event) {
@@ -1831,7 +1831,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Adding new items is not supported.
      * 
-     * @see com.enably.tk.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.itmill.toolkit.ui.Select#setNewItemsAllowed(boolean)
      * @throws UnsupportedOperationException
      *             if set to true.
      */
@@ -1844,7 +1844,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Focusing to this component is not supported.
      * 
-     * @see com.enably.tk.ui.AbstractField#focus()
+     * @see com.itmill.toolkit.ui.AbstractField#focus()
      * @throws UnsupportedOperationException
      *             if invoked.
      */
@@ -1853,49 +1853,49 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#nextItemId(java.lang.Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#nextItemId(java.lang.Object)
      */
     public Object nextItemId(Object itemId) {
         return ((Container.Ordered) items).nextItemId(itemId);
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#prevItemId(java.lang.Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#prevItemId(java.lang.Object)
      */
     public Object prevItemId(Object itemId) {
         return ((Container.Ordered) items).prevItemId(itemId);
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#firstItemId()
+     * @see com.itmill.toolkit.data.Container.Ordered#firstItemId()
      */
     public Object firstItemId() {
         return ((Container.Ordered) items).firstItemId();
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#lastItemId()
+     * @see com.itmill.toolkit.data.Container.Ordered#lastItemId()
      */
     public Object lastItemId() {
         return ((Container.Ordered) items).lastItemId();
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#isFirstId(java.lang.Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#isFirstId(java.lang.Object)
      */
     public boolean isFirstId(Object itemId) {
         return ((Container.Ordered) items).isFirstId(itemId);
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#isLastId(java.lang.Object)
      */
     public boolean isLastId(Object itemId) {
         return ((Container.Ordered) items).isLastId(itemId);
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
@@ -1903,7 +1903,7 @@ public class Table extends Select implements Action.Container,
     }
 
     /**
-     * @see com.enably.tk.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId)
@@ -1985,7 +1985,7 @@ public class Table extends Select implements Action.Container,
     /**
      * Sort table.
      * 
-     * @see com.enably.tk.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.itmill.toolkit.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      * 
      * @throws UnsupportedOperationException
@@ -2022,7 +2022,7 @@ public class Table extends Select implements Action.Container,
     /*
      * (non-Javadoc)
      * 
-     * @see com.enably.tk.data.Container.Sortable#getSortableContainerPropertyIds()
+     * @see com.itmill.toolkit.data.Container.Sortable#getSortableContainerPropertyIds()
      */
     public Collection getSortableContainerPropertyIds() {
         Container c = getContainerDataSource();
diff --git a/src/com/enably/tk/ui/TextField.java b/src/com/itmill/toolkit/ui/TextField.java
index 2cc0b32a64..86e3f14d50 100644
--- a/src/com/enably/tk/ui/TextField.java
+++ b/src/com/itmill/toolkit/ui/TextField.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,30 +19,30 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.text.Format;
 import java.util.Map;
 
-import com.enably.tk.data.Property;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
+import com.itmill.toolkit.data.Property;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
 
 /** <p>A text editor component that can be bound to any bindable Property.
  * The text editor supports both multiline and single line modes, default
  * is one-line mode.</p>
  *
  * <p>Since <code>TextField</code> extends <code>AbstractField</code> it
- * implements the {@link com.enably.tk.data.Buffered} interface. A
+ * implements the {@link com.itmill.toolkit.data.Buffered} interface. A
  * <code>TextField</code> is in write-through mode by default, so
- * {@link com.enably.tk.ui.AbstractField#setWriteThrough(boolean)}
+ * {@link com.itmill.toolkit.ui.AbstractField#setWriteThrough(boolean)}
  * must be called to enable buffering.</p>
  *
  * @author IT Mill Ltd.
@@ -116,7 +116,7 @@ public class TextField extends AbstractField {
 	/** Constructs a new <code>TextField</code> with the given caption and
 	 * initial text contents. The editor constructed this way will not be
 	 * bound to a Property unless
-	 * {@link com.enably.tk.data.Property.Viewer#setPropertyDataSource(Property)}
+	 * {@link com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)}
 	 * is called to bind it.
 	 * 
 	 * @param caption caption <code>String</code> for the editor
diff --git a/src/com/enably/tk/ui/Tree.java b/src/com/itmill/toolkit/ui/Tree.java
index 736fece5c3..b3371b1aa7 100644
--- a/src/com/enably/tk/ui/Tree.java
+++ b/src/com/itmill/toolkit/ui/Tree.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,14 +19,14 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -39,13 +39,13 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import com.enably.tk.data.Container;
-import com.enably.tk.data.util.ContainerHierarchicalWrapper;
-import com.enably.tk.event.Action;
-import com.enably.tk.terminal.KeyMapper;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.Resource;
+import com.itmill.toolkit.data.Container;
+import com.itmill.toolkit.data.util.ContainerHierarchicalWrapper;
+import com.itmill.toolkit.event.Action;
+import com.itmill.toolkit.terminal.KeyMapper;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.Resource;
 
 /** MenuTree component.
  *  MenuTree can be used to select an item (or multiple items)
@@ -242,14 +242,14 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	/* Component API ****************************************************** */
 
 	/**
-	 * @see com.enably.tk.ui.AbstractComponent#getTag()
+	 * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
 	 */
 	public String getTag() {
 		return "tree";
 	}
 
 	/**
-	 * @see com.enably.tk.terminal.VariableOwner#changeVariables(Object source, Map variables)
+	 * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(Object source, Map variables)
 	 */
 	public void changeVariables(Object source, Map variables) {
 
@@ -299,7 +299,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
 
 	/**
-	 * @see com.enably.tk.ui.AbstractComponent#paintContent(PaintTarget)
+	 * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(PaintTarget)
 	 */
 	public void paintContent(PaintTarget target) throws PaintException {
 
@@ -448,49 +448,49 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	/* Container.Hierarchical API ***************************************** */
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#areChildrenAllowed(Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#areChildrenAllowed(Object)
 	 */
 	public boolean areChildrenAllowed(Object itemId) {
 		return ((Container.Hierarchical) items).areChildrenAllowed(itemId);
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#getChildren(Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#getChildren(Object)
 	 */
 	public Collection getChildren(Object itemId) {
 		return ((Container.Hierarchical) items).getChildren(itemId);
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#getParent(Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#getParent(Object)
 	 */
 	public Object getParent(Object itemId) {
 		return ((Container.Hierarchical) items).getParent(itemId);
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#hasChildren(Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#hasChildren(Object)
 	 */
 	public boolean hasChildren(Object itemId) {
 		return ((Container.Hierarchical) items).hasChildren(itemId);
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#isRoot(Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#isRoot(Object)
 	 */
 	public boolean isRoot(Object itemId) {
 		return ((Container.Hierarchical) items).isRoot(itemId);
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#rootItemIds()
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#rootItemIds()
 	 */
 	public Collection rootItemIds() {
 		return ((Container.Hierarchical) items).rootItemIds();
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#setChildrenAllowed(Object, boolean)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#setChildrenAllowed(Object, boolean)
 	 */
 	public boolean setChildrenAllowed(
 		Object itemId,
@@ -505,7 +505,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
 
 	/**
-	 * @see com.enably.tk.data.Container.Hierarchical#setParent(Object, Object)
+	 * @see com.itmill.toolkit.data.Container.Hierarchical#setParent(Object, Object)
 	 */
 	public boolean setParent(Object itemId, Object newParentId) {
 		boolean success =
@@ -518,7 +518,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	/* Overriding select behavior******************************************** */
 
 	/**
-	 * @see com.enably.tk.data.Container.Viewer#setContainerDataSource(Container)
+	 * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container)
 	 */
 	public void setContainerDataSource(Container newDataSource) {
 
@@ -666,7 +666,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	/* Action container *************************************************** */
 
 	/** Adds an action handler.
-	 * @see com.enably.tk.event.Action.Container#addActionHandler(Action.Handler)
+	 * @see com.itmill.toolkit.event.Action.Container#addActionHandler(Action.Handler)
 	 */
 	public void addActionHandler(Action.Handler actionHandler) {
 
@@ -685,7 +685,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
 
 	/** Removes an action handler.
-	 * @see com.enably.tk.event.Action.Container#removeActionHandler(Action.Handler)
+	 * @see com.itmill.toolkit.event.Action.Container#removeActionHandler(Action.Handler)
 	 */
 	public void removeActionHandler(Action.Handler actionHandler) {
 
@@ -703,7 +703,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
     
 	/**
-	 * @see com.enably.tk.ui.Select#getVisibleItemIds()
+	 * @see com.itmill.toolkit.ui.Select#getVisibleItemIds()
 	 */
 	public Collection getVisibleItemIds() {
 
@@ -743,7 +743,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
 
 	/** Adding new items is not supported. 
-	 * @see com.enably.tk.ui.Select#setNewItemsAllowed(boolean)
+	 * @see com.itmill.toolkit.ui.Select#setNewItemsAllowed(boolean)
 	 * @throws UnsupportedOperationException if set to true.
 	 */
 	public void setNewItemsAllowed(boolean allowNewOptions)
@@ -753,7 +753,7 @@ public class Tree extends Select implements Container.Hierarchical, Action.Conta
 	}
 
 	/** Focusing to this component is not supported.
-	 * @see com.enably.tk.ui.AbstractField#focus()
+	 * @see com.itmill.toolkit.ui.AbstractField#focus()
 	 * @throws UnsupportedOperationException if invoked.
 	 */
 	public void focus() throws UnsupportedOperationException {
diff --git a/src/com/enably/tk/ui/Upload.java b/src/com/itmill/toolkit/ui/Upload.java
index 1df4674c3f..3bcb998352 100644
--- a/src/com/enably/tk/ui/Upload.java
+++ b/src/com/itmill/toolkit/ui/Upload.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,22 +19,22 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.UploadStream;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.UploadStream;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -413,7 +413,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
 		this.receiver = receiver;
 	}
 	/**
-	 * @see com.enably.tk.ui.Component.Focusable#focus()
+	 * @see com.itmill.toolkit.ui.Component.Focusable#focus()
 	 */
 	public void focus() {
 		Window w = getWindow();
@@ -423,21 +423,21 @@ public class Upload extends AbstractComponent implements Component.Focusable {
 	}
 	
 	/**
-	 * @see com.enably.tk.ui.Component.Focusable#getTabIndex()
+	 * @see com.itmill.toolkit.ui.Component.Focusable#getTabIndex()
 	 */
 	public int getTabIndex() {
 		return this.tabIndex;
 	}
 	
 	/**
-	 * @see com.enably.tk.ui.Component.Focusable#setTabIndex(int)
+	 * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int)
 	 */
 	public void setTabIndex(int tabIndex) {
 		this.tabIndex = tabIndex;
 	}
 	
 	/**
-	 * @see com.enably.tk.ui.Component.Focusable#getFocusableId()
+	 * @see com.itmill.toolkit.ui.Component.Focusable#getFocusableId()
 	 */
 	public long getFocusableId() {
 		return this.focusableId;
diff --git a/src/com/enably/tk/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java
index 891ee17402..f74ff710a8 100644
--- a/src/com/enably/tk/ui/Window.java
+++ b/src/com/itmill/toolkit/ui/Window.java
@@ -1,6 +1,6 @@
 /* *************************************************************************
  
-                               Enably Toolkit 
+                               IT Mill Toolkit 
 
                Development of Browser User Intarfaces Made Easy
 
@@ -19,24 +19,24 @@
    
    IT Mill Ltd                           phone: +358 2 4802 7180
    Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@enably.com
-   Finland                               company www: www.enably.com
+   20540, Turku                          email:  info@itmill.com
+   Finland                               company www: www.itmill.com
    
-   Primary source for information and releases: www.enably.com
+   Primary source for information and releases: www.itmill.com
 
    ********************************************************************** */
 
-package com.enably.tk.ui;
+package com.itmill.toolkit.ui;
 
-import com.enably.tk.Application;
-import com.enably.tk.terminal.DownloadStream;
-import com.enably.tk.terminal.PaintException;
-import com.enably.tk.terminal.PaintTarget;
-import com.enably.tk.terminal.ParameterHandler;
-import com.enably.tk.terminal.Resource;
-import com.enably.tk.terminal.Sizeable;
-import com.enably.tk.terminal.Terminal;
-import com.enably.tk.terminal.URIHandler;
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.terminal.DownloadStream;
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.terminal.ParameterHandler;
+import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.Sizeable;
+import com.itmill.toolkit.terminal.Terminal;
+import com.itmill.toolkit.terminal.URIHandler;
 
 import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
@@ -471,9 +471,9 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * 
      * <p>
      * This method should not be invoked directly. Instead the
-     * {@link com.enably.tk.Application#addWindow(Window)} method should be
+     * {@link com.itmill.toolkit.Application#addWindow(Window)} method should be
      * used to add the window to an application and
-     * {@link com.enably.tk.Application#removeWindow(Window)} method for
+     * {@link com.itmill.toolkit.Application#removeWindow(Window)} method for
      * removing the window from the applicion. These methods call this method
      * implicitly.
      * </p>
@@ -556,7 +556,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     /**
      * Window only supports pixels as unit.
      * 
-     * @see com.enably.tk.terminal.Sizeable#getHeightUnits()
+     * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
      */
     public void setHeightUnits(int units) {
         if (units != Sizeable.UNITS_PIXELS)
@@ -566,7 +566,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     /**
      * Window only supports pixels as unit.
      * 
-     * @see com.enably.tk.terminal.Sizeable#getWidthUnits()
+     * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
      */
     public void setWidthUnits(int units) {
         if (units != Sizeable.UNITS_PIXELS)
@@ -620,7 +620,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     }
 
     /**
-     * @see com.enably.tk.terminal.VariableOwner#changeVariables(java.lang.Object,
+     * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     public void changeVariables(Object source, Map variables) {
diff --git a/src/com/enably/tk/ui/doc-files/component_class_hierarchy.gif b/src/com/itmill/toolkit/ui/doc-files/component_class_hierarchy.gif
index 936c220d11..936c220d11 100644
--- a/src/com/enably/tk/ui/doc-files/component_class_hierarchy.gif
+++ b/src/com/itmill/toolkit/ui/doc-files/component_class_hierarchy.gif
diff --git a/src/com/enably/tk/ui/doc-files/component_interfaces.gif b/src/com/itmill/toolkit/ui/doc-files/component_interfaces.gif
index 44c99826bb..44c99826bb 100644
--- a/src/com/enably/tk/ui/doc-files/component_interfaces.gif
+++ b/src/com/itmill/toolkit/ui/doc-files/component_interfaces.gif
diff --git a/src/com/enably/tk/ui/package.html b/src/com/itmill/toolkit/ui/package.html
index b6b17b43d0..b6b17b43d0 100644
--- a/src/com/enably/tk/ui/package.html
+++ b/src/com/itmill/toolkit/ui/package.html