diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml
index 934ec0f02..cf2bb2c62 100644
--- a/findbugs-exclude-filter.xml
+++ b/findbugs-exclude-filter.xml
@@ -25,7 +25,7 @@
 
   <!--  explicit return of a null value for type Boolean is intended -->
   <Match>
-    <Class name="org.apache.commons.collections.MapUtils" />
+    <Class name="org.apache.commons.collections4.MapUtils" />
     <Method name="getBoolean" params="java.util.Map, java.lang.Object" returns="java.lang.Boolean" />
     <Bug pattern="NP_BOOLEAN_RETURN_NULL" />
   </Match>
@@ -45,7 +45,7 @@
 
   <!--  Load first tries ISO_8859_1 encoding, and reverts to the system's default if not available -->
   <Match>
-    <Class name="org.apache.commons.collections.ExtendedProperties" />
+    <Class name="org.apache.commons.collections4.ExtendedProperties" />
     <Method name="load" params="java.io.InputStream, java.lang.String" returns="void" />
     <Bug pattern="DM_DEFAULT_ENCODING" />
   </Match>
@@ -53,15 +53,15 @@
   <!-- TreeBidiMap implements equals by delegating to another method for re-usability -->
   <Match>
     <Or>
-      <Class name="org.apache.commons.collections.bidimap.TreeBidiMap" />
-      <Class name="org.apache.commons.collections.bidimap.TreeBidiMap$Inverse" />
+      <Class name="org.apache.commons.collections4.bidimap.TreeBidiMap" />
+      <Class name="org.apache.commons.collections4.bidimap.TreeBidiMap$Inverse" />
     </Or>
     <Bug pattern="EQ_UNUSUAL" />
   </Match>
 
   <!-- The compare method in ComparatorChain has to handle a corner-case for Integer.MIN_VALUE -->
   <Match>
-    <Class name="org.apache.commons.collections.comparators.ComparatorChain" />
+    <Class name="org.apache.commons.collections4.comparators.ComparatorChain" />
     <Method name="compare" params="java.lang.Object, java.lang.Object" returns="int" />
     <Bug pattern="RV_CHECK_COMPARETO_FOR_SPECIFIC_RETURN_VALUE" />
   </Match>
diff --git a/src/main/java/org/apache/commons/collections/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/ArrayStack.java
rename to src/main/java/org/apache/commons/collections4/ArrayStack.java
index 43ecbeb73..d46fb7917 100644
--- a/src/main/java/org/apache/commons/collections/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.EmptyStackException;
diff --git a/src/main/java/org/apache/commons/collections/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/Bag.java
rename to src/main/java/org/apache/commons/collections4/Bag.java
index 8b528a6a8..5b8c14842 100644
--- a/src/main/java/org/apache/commons/collections/Bag.java
+++ b/src/main/java/org/apache/commons/collections4/Bag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/main/java/org/apache/commons/collections/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/BagUtils.java
rename to src/main/java/org/apache/commons/collections4/BagUtils.java
index 3c4f3c54d..8657e4e04 100644
--- a/src/main/java/org/apache/commons/collections/BagUtils.java
+++ b/src/main/java/org/apache/commons/collections4/BagUtils.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.bag.PredicatedBag;
-import org.apache.commons.collections.bag.PredicatedSortedBag;
-import org.apache.commons.collections.bag.SynchronizedBag;
-import org.apache.commons.collections.bag.SynchronizedSortedBag;
-import org.apache.commons.collections.bag.TransformedBag;
-import org.apache.commons.collections.bag.TransformedSortedBag;
-import org.apache.commons.collections.bag.TreeBag;
-import org.apache.commons.collections.bag.UnmodifiableBag;
-import org.apache.commons.collections.bag.UnmodifiableSortedBag;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.PredicatedBag;
+import org.apache.commons.collections4.bag.PredicatedSortedBag;
+import org.apache.commons.collections4.bag.SynchronizedBag;
+import org.apache.commons.collections4.bag.SynchronizedSortedBag;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.bag.TransformedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.bag.UnmodifiableBag;
+import org.apache.commons.collections4.bag.UnmodifiableSortedBag;
 
 /**
  * Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances.
diff --git a/src/main/java/org/apache/commons/collections/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/BidiMap.java
rename to src/main/java/org/apache/commons/collections4/BidiMap.java
index 6bfe4df45..5c5f0dc58 100644
--- a/src/main/java/org/apache/commons/collections/BidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/BidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a map that allows bidirectional lookup between key and values.
diff --git a/src/main/java/org/apache/commons/collections/BoundedCollection.java b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/BoundedCollection.java
rename to src/main/java/org/apache/commons/collections4/BoundedCollection.java
index 381f1ab38..0853c7377 100644
--- a/src/main/java/org/apache/commons/collections/BoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/apache/commons/collections/BoundedMap.java b/src/main/java/org/apache/commons/collections4/BoundedMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/BoundedMap.java
rename to src/main/java/org/apache/commons/collections4/BoundedMap.java
index 8c4edf36f..597e93c2c 100644
--- a/src/main/java/org/apache/commons/collections/BoundedMap.java
+++ b/src/main/java/org/apache/commons/collections4/BoundedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a map that is bounded in size.
diff --git a/src/main/java/org/apache/commons/collections/Closure.java b/src/main/java/org/apache/commons/collections4/Closure.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Closure.java
rename to src/main/java/org/apache/commons/collections4/Closure.java
index ec5dde43c..046326a26 100644
--- a/src/main/java/org/apache/commons/collections/Closure.java
+++ b/src/main/java/org/apache/commons/collections4/Closure.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a functor interface implemented by classes that do something.
diff --git a/src/main/java/org/apache/commons/collections/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
similarity index 88%
rename from src/main/java/org/apache/commons/collections/ClosureUtils.java
rename to src/main/java/org/apache/commons/collections4/ClosureUtils.java
index b7ca4e8a4..0528b7bf2 100644
--- a/src/main/java/org/apache/commons/collections/ClosureUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.collections.functors.ChainedClosure;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionClosure;
-import org.apache.commons.collections.functors.ForClosure;
-import org.apache.commons.collections.functors.IfClosure;
-import org.apache.commons.collections.functors.InvokerTransformer;
-import org.apache.commons.collections.functors.NOPClosure;
-import org.apache.commons.collections.functors.SwitchClosure;
-import org.apache.commons.collections.functors.TransformerClosure;
-import org.apache.commons.collections.functors.WhileClosure;
+import org.apache.commons.collections4.functors.ChainedClosure;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionClosure;
+import org.apache.commons.collections4.functors.ForClosure;
+import org.apache.commons.collections4.functors.IfClosure;
+import org.apache.commons.collections4.functors.InvokerTransformer;
+import org.apache.commons.collections4.functors.NOPClosure;
+import org.apache.commons.collections4.functors.SwitchClosure;
+import org.apache.commons.collections4.functors.TransformerClosure;
+import org.apache.commons.collections4.functors.WhileClosure;
 
 /**
  * <code>ClosureUtils</code> provides reference implementations and utilities
@@ -61,7 +61,7 @@ public class ClosureUtils {
      * Gets a Closure that always throws an exception.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections.functors.ExceptionClosure
+     * @see org.apache.commons.collections4.functors.ExceptionClosure
      * 
      * @param <E>  the type that the closure acts on
      * @return the closure
@@ -74,7 +74,7 @@ public class ClosureUtils {
      * Gets a Closure that will do nothing.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections.functors.NOPClosure
+     * @see org.apache.commons.collections4.functors.NOPClosure
      *
      * @param <E>  the type that the closure acts on
      * @return the closure
@@ -88,7 +88,7 @@ public class ClosureUtils {
      * The transformer will be called using the closure's input object.
      * The transformer's result will be ignored.
      *
-     * @see org.apache.commons.collections.functors.TransformerClosure
+     * @see org.apache.commons.collections4.functors.TransformerClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param transformer  the transformer to run each time in the closure, null means nop
@@ -103,7 +103,7 @@ public class ClosureUtils {
      * <p>
      * A null closure or zero count returns the <code>NOPClosure</code>.
      *
-     * @see org.apache.commons.collections.functors.ForClosure
+     * @see org.apache.commons.collections4.functors.ForClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param count  the number of times to loop
@@ -118,7 +118,7 @@ public class ClosureUtils {
      * Creates a Closure that will call the closure repeatedly until the 
      * predicate returns false.
      *
-     * @see org.apache.commons.collections.functors.WhileClosure
+     * @see org.apache.commons.collections4.functors.WhileClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to use as an end of loop test, not null
@@ -134,7 +134,7 @@ public class ClosureUtils {
      * Creates a Closure that will call the closure once and then repeatedly
      * until the predicate returns false.
      *
-     * @see org.apache.commons.collections.functors.WhileClosure
+     * @see org.apache.commons.collections4.functors.WhileClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param closure  the closure to call repeatedly, not null
@@ -151,8 +151,8 @@ public class ClosureUtils {
      * Creates a Closure that will invoke a specific method on the closure's
      * input object by reflection.
      *
-     * @see org.apache.commons.collections.functors.InvokerTransformer
-     * @see org.apache.commons.collections.functors.TransformerClosure
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.TransformerClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
@@ -168,8 +168,8 @@ public class ClosureUtils {
      * Creates a Closure that will invoke a specific method on the closure's
      * input object by reflection.
      *
-     * @see org.apache.commons.collections.functors.InvokerTransformer
-     * @see org.apache.commons.collections.functors.TransformerClosure
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.TransformerClosure
      *
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
@@ -189,7 +189,7 @@ public class ClosureUtils {
      * Create a new Closure that calls two Closures, passing the result of
      * the first into the second.
      * 
-     * @see org.apache.commons.collections.functors.ChainedClosure
+     * @see org.apache.commons.collections4.functors.ChainedClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param closure1  the first closure
@@ -205,7 +205,7 @@ public class ClosureUtils {
      * Create a new Closure that calls each closure in turn, passing the 
      * result into the next closure.
      * 
-     * @see org.apache.commons.collections.functors.ChainedClosure
+     * @see org.apache.commons.collections4.functors.ChainedClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param closures  an array of closures to chain
@@ -222,7 +222,7 @@ public class ClosureUtils {
      * result into the next closure. The ordering is that of the iterator()
      * method on the collection.
      * 
-     * @see org.apache.commons.collections.functors.ChainedClosure
+     * @see org.apache.commons.collections4.functors.ChainedClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param closures  a collection of closures to chain
@@ -239,7 +239,7 @@ public class ClosureUtils {
      * Create a new Closure that calls another closure based on the
      * result of the specified predicate.
      * 
-     * @see org.apache.commons.collections.functors.IfClosure
+     * @see org.apache.commons.collections4.functors.IfClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicate  the validating predicate
@@ -258,7 +258,7 @@ public class ClosureUtils {
      * Create a new Closure that calls one of two closures depending 
      * on the specified predicate.
      * 
-     * @see org.apache.commons.collections.functors.IfClosure
+     * @see org.apache.commons.collections4.functors.IfClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to switch on
@@ -282,7 +282,7 @@ public class ClosureUtils {
      * location 0 returned true. Each predicate is evaluated
      * until one returns true.
      * 
-     * @see org.apache.commons.collections.functors.SwitchClosure
+     * @see org.apache.commons.collections4.functors.SwitchClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
@@ -306,7 +306,7 @@ public class ClosureUtils {
      * until one returns true. If no predicates evaluate to true, the default
      * closure is called.
      * 
-     * @see org.apache.commons.collections.functors.SwitchClosure
+     * @see org.apache.commons.collections4.functors.SwitchClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
@@ -334,7 +334,7 @@ public class ClosureUtils {
      * null key. The ordering is that of the iterator() method on the entryset 
      * collection of the map.
      * 
-     * @see org.apache.commons.collections.functors.SwitchClosure
+     * @see org.apache.commons.collections4.functors.SwitchClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param predicatesAndClosures  a map of predicates to closures
@@ -357,7 +357,7 @@ public class ClosureUtils {
      * default closure is called. The default closure is set in the map
      * using a null key.
      * 
-     * @see org.apache.commons.collections.functors.SwitchClosure
+     * @see org.apache.commons.collections4.functors.SwitchClosure
      * 
      * @param <E>  the type that the closure acts on
      * @param objectsAndClosures  a map of objects to closures
diff --git a/src/main/java/org/apache/commons/collections/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/CollectionUtils.java
rename to src/main/java/org/apache/commons/collections4/CollectionUtils.java
index 6053af435..b3a5a12cc 100644
--- a/src/main/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -28,14 +28,14 @@ import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.collection.PredicatedCollection;
-import org.apache.commons.collections.collection.SynchronizedCollection;
-import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.collection.UnmodifiableBoundedCollection;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.functors.Equator;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+import org.apache.commons.collections4.collection.TransformedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.functors.Equator;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Provides utility methods and decorators for {@link Collection} instances.
diff --git a/src/main/java/org/apache/commons/collections/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/ComparatorUtils.java
rename to src/main/java/org/apache/commons/collections4/ComparatorUtils.java
index ab4b30a81..db4ff7b8a 100644
--- a/src/main/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Comparator;
 
-import org.apache.commons.collections.comparators.BooleanComparator;
-import org.apache.commons.collections.comparators.ComparableComparator;
-import org.apache.commons.collections.comparators.ComparatorChain;
-import org.apache.commons.collections.comparators.NullComparator;
-import org.apache.commons.collections.comparators.ReverseComparator;
-import org.apache.commons.collections.comparators.TransformingComparator;
+import org.apache.commons.collections4.comparators.BooleanComparator;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparatorChain;
+import org.apache.commons.collections4.comparators.NullComparator;
+import org.apache.commons.collections4.comparators.ReverseComparator;
+import org.apache.commons.collections4.comparators.TransformingComparator;
 
 /**
  * Provides convenient static utility methods for <Code>Comparator</Code>
diff --git a/src/main/java/org/apache/commons/collections/EnumerationUtils.java b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/EnumerationUtils.java
rename to src/main/java/org/apache/commons/collections4/EnumerationUtils.java
index c2d5f42c7..98d86ec99 100644
--- a/src/main/java/org/apache/commons/collections/EnumerationUtils.java
+++ b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.commons.collections.iterators.EnumerationIterator;
+import org.apache.commons.collections4.iterators.EnumerationIterator;
 
 /**
  * Provides utility methods for {@link Enumeration} instances.
diff --git a/src/main/java/org/apache/commons/collections/Factory.java b/src/main/java/org/apache/commons/collections4/Factory.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Factory.java
rename to src/main/java/org/apache/commons/collections4/Factory.java
index be6ee00fe..b11202440 100644
--- a/src/main/java/org/apache/commons/collections/Factory.java
+++ b/src/main/java/org/apache/commons/collections4/Factory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a functor interface implemented by classes that create objects.
diff --git a/src/main/java/org/apache/commons/collections/FactoryUtils.java b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
similarity index 87%
rename from src/main/java/org/apache/commons/collections/FactoryUtils.java
rename to src/main/java/org/apache/commons/collections4/FactoryUtils.java
index a0fddaade..1c8acc0b8 100644
--- a/src/main/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
-import org.apache.commons.collections.functors.ConstantFactory;
-import org.apache.commons.collections.functors.InstantiateFactory;
-import org.apache.commons.collections.functors.ExceptionFactory;
-import org.apache.commons.collections.functors.PrototypeFactory;
+import org.apache.commons.collections4.functors.ConstantFactory;
+import org.apache.commons.collections4.functors.ExceptionFactory;
+import org.apache.commons.collections4.functors.InstantiateFactory;
+import org.apache.commons.collections4.functors.PrototypeFactory;
 
 /**
  * <code>FactoryUtils</code> provides reference implementations and utilities
@@ -47,7 +47,7 @@ public class FactoryUtils {
      * Gets a Factory that always throws an exception.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections.functors.ExceptionFactory
+     * @see org.apache.commons.collections4.functors.ExceptionFactory
      * 
      * @param <T> the type that the factory creates
      * @return the factory
@@ -60,7 +60,7 @@ public class FactoryUtils {
      * Gets a Factory that will return null each time the factory is used.
      * This could be useful during testing as a placeholder.
      *
-     * @see org.apache.commons.collections.functors.ConstantFactory
+     * @see org.apache.commons.collections4.functors.ConstantFactory
      * @param <T> the "type" of null object the factory should return.
      * @return the factory
      */
@@ -74,7 +74,7 @@ public class FactoryUtils {
      * immutable objects should use the constant factory. Mutable objects should
      * use the prototype factory.
      *
-     * @see org.apache.commons.collections.functors.ConstantFactory
+     * @see org.apache.commons.collections4.functors.ConstantFactory
      * 
      * @param <T> the type that the factory creates
      * @param constantToReturn  the constant object to return each time in the factory
@@ -94,7 +94,7 @@ public class FactoryUtils {
      * <li>serialization clone
      * <ul>
      *
-     * @see org.apache.commons.collections.functors.PrototypeFactory
+     * @see org.apache.commons.collections4.functors.PrototypeFactory
      * 
      * @param <T> the type that the factory creates
      * @param prototype  the object to clone each time in the factory
@@ -110,7 +110,7 @@ public class FactoryUtils {
      * Creates a Factory that can create objects of a specific type using
      * a no-args constructor.
      *
-     * @see org.apache.commons.collections.functors.InstantiateFactory
+     * @see org.apache.commons.collections4.functors.InstantiateFactory
      * 
      * @param <T> the type that the factory creates
      * @param classToInstantiate  the Class to instantiate each time in the factory
@@ -125,7 +125,7 @@ public class FactoryUtils {
      * Creates a Factory that can create objects of a specific type using
      * the arguments specified to this method.
      *
-     * @see org.apache.commons.collections.functors.InstantiateFactory
+     * @see org.apache.commons.collections4.functors.InstantiateFactory
      * 
      * @param <T> the type that the factory creates
      * @param classToInstantiate  the Class to instantiate each time in the factory
diff --git a/src/main/java/org/apache/commons/collections/FunctorException.java b/src/main/java/org/apache/commons/collections4/FunctorException.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/FunctorException.java
rename to src/main/java/org/apache/commons/collections4/FunctorException.java
index 8f01657d5..d3c32fcd0 100644
--- a/src/main/java/org/apache/commons/collections/FunctorException.java
+++ b/src/main/java/org/apache/commons/collections4/FunctorException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Runtime exception thrown from functors.
diff --git a/src/main/java/org/apache/commons/collections/Get.java b/src/main/java/org/apache/commons/collections4/Get.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Get.java
rename to src/main/java/org/apache/commons/collections4/Get.java
index cad8fe9c9..8af5a74e7 100644
--- a/src/main/java/org/apache/commons/collections/Get.java
+++ b/src/main/java/org/apache/commons/collections4/Get.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/src/main/java/org/apache/commons/collections/IterableGet.java b/src/main/java/org/apache/commons/collections4/IterableGet.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/IterableGet.java
rename to src/main/java/org/apache/commons/collections4/IterableGet.java
index 6ca4e58fc..9f018e57c 100644
--- a/src/main/java/org/apache/commons/collections/IterableGet.java
+++ b/src/main/java/org/apache/commons/collections4/IterableGet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * The "read" subset of the {@link java.util.Map} interface.
diff --git a/src/main/java/org/apache/commons/collections/IterableMap.java b/src/main/java/org/apache/commons/collections4/IterableMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/IterableMap.java
rename to src/main/java/org/apache/commons/collections4/IterableMap.java
index c0818c259..9169561b0 100644
--- a/src/main/java/org/apache/commons/collections/IterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/apache/commons/collections/IterableSortedMap.java b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/IterableSortedMap.java
rename to src/main/java/org/apache/commons/collections4/IterableSortedMap.java
index 4fc162b01..460bfd235 100644
--- a/src/main/java/org/apache/commons/collections/IterableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.SortedMap;
 
diff --git a/src/main/java/org/apache/commons/collections/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/IteratorUtils.java
rename to src/main/java/org/apache/commons/collections4/IteratorUtils.java
index d6d908450..676d406c7 100644
--- a/src/main/java/org/apache/commons/collections/IteratorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -29,33 +29,33 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.apache.commons.collections.iterators.ArrayIterator;
-import org.apache.commons.collections.iterators.ArrayListIterator;
-import org.apache.commons.collections.iterators.CollatingIterator;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.EmptyListIterator;
-import org.apache.commons.collections.iterators.EmptyMapIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
-import org.apache.commons.collections.iterators.EnumerationIterator;
-import org.apache.commons.collections.iterators.FilterIterator;
-import org.apache.commons.collections.iterators.FilterListIterator;
-import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.commons.collections.iterators.IteratorEnumeration;
-import org.apache.commons.collections.iterators.IteratorIterable;
-import org.apache.commons.collections.iterators.ListIteratorWrapper;
-import org.apache.commons.collections.iterators.LoopingIterator;
-import org.apache.commons.collections.iterators.LoopingListIterator;
-import org.apache.commons.collections.iterators.NodeListIterator;
-import org.apache.commons.collections.iterators.ObjectArrayIterator;
-import org.apache.commons.collections.iterators.ObjectArrayListIterator;
-import org.apache.commons.collections.iterators.ObjectGraphIterator;
-import org.apache.commons.collections.iterators.SingletonIterator;
-import org.apache.commons.collections.iterators.SingletonListIterator;
-import org.apache.commons.collections.iterators.TransformIterator;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
-import org.apache.commons.collections.iterators.UnmodifiableListIterator;
-import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+import org.apache.commons.collections4.iterators.ArrayListIterator;
+import org.apache.commons.collections4.iterators.CollatingIterator;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.EmptyListIterator;
+import org.apache.commons.collections4.iterators.EmptyMapIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.iterators.EnumerationIterator;
+import org.apache.commons.collections4.iterators.FilterIterator;
+import org.apache.commons.collections4.iterators.FilterListIterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.commons.collections4.iterators.IteratorEnumeration;
+import org.apache.commons.collections4.iterators.IteratorIterable;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
+import org.apache.commons.collections4.iterators.LoopingIterator;
+import org.apache.commons.collections4.iterators.LoopingListIterator;
+import org.apache.commons.collections4.iterators.NodeListIterator;
+import org.apache.commons.collections4.iterators.ObjectArrayIterator;
+import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
+import org.apache.commons.collections4.iterators.ObjectGraphIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
+import org.apache.commons.collections4.iterators.SingletonListIterator;
+import org.apache.commons.collections4.iterators.TransformIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
diff --git a/src/main/java/org/apache/commons/collections/KeyValue.java b/src/main/java/org/apache/commons/collections4/KeyValue.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/KeyValue.java
rename to src/main/java/org/apache/commons/collections4/KeyValue.java
index 7b6ad0965..d2728f290 100644
--- a/src/main/java/org/apache/commons/collections/KeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/KeyValue.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a simple key value pair.
diff --git a/src/main/java/org/apache/commons/collections/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/ListUtils.java
rename to src/main/java/org/apache/commons/collections4/ListUtils.java
index c82b69160..96de85e8e 100644
--- a/src/main/java/org/apache/commons/collections/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -24,12 +24,12 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.list.FixedSizeList;
-import org.apache.commons.collections.list.LazyList;
-import org.apache.commons.collections.list.PredicatedList;
-import org.apache.commons.collections.list.TransformedList;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.list.FixedSizeList;
+import org.apache.commons.collections4.list.LazyList;
+import org.apache.commons.collections4.list.PredicatedList;
+import org.apache.commons.collections4.list.TransformedList;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Provides utility methods and decorators for {@link List} instances.
diff --git a/src/main/java/org/apache/commons/collections/MapIterator.java b/src/main/java/org/apache/commons/collections4/MapIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/MapIterator.java
rename to src/main/java/org/apache/commons/collections4/MapIterator.java
index 4a2fa2a74..6c6d36f6b 100644
--- a/src/main/java/org/apache/commons/collections/MapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/MapIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/MapUtils.java
rename to src/main/java/org/apache/commons/collections4/MapUtils.java
index e88b2fe88..3eb507890 100644
--- a/src/main/java/org/apache/commons/collections/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.io.PrintStream;
 import java.text.NumberFormat;
@@ -31,20 +31,20 @@ import java.util.ResourceBundle;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.map.AbstractMapDecorator;
-import org.apache.commons.collections.map.AbstractSortedMapDecorator;
-import org.apache.commons.collections.map.FixedSizeMap;
-import org.apache.commons.collections.map.FixedSizeSortedMap;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.collections.map.LazySortedMap;
-import org.apache.commons.collections.map.ListOrderedMap;
-import org.apache.commons.collections.map.MultiValueMap;
-import org.apache.commons.collections.map.PredicatedMap;
-import org.apache.commons.collections.map.PredicatedSortedMap;
-import org.apache.commons.collections.map.TransformedMap;
-import org.apache.commons.collections.map.TransformedSortedMap;
-import org.apache.commons.collections.map.UnmodifiableMap;
-import org.apache.commons.collections.map.UnmodifiableSortedMap;
+import org.apache.commons.collections4.map.AbstractMapDecorator;
+import org.apache.commons.collections4.map.AbstractSortedMapDecorator;
+import org.apache.commons.collections4.map.FixedSizeMap;
+import org.apache.commons.collections4.map.FixedSizeSortedMap;
+import org.apache.commons.collections4.map.LazyMap;
+import org.apache.commons.collections4.map.LazySortedMap;
+import org.apache.commons.collections4.map.ListOrderedMap;
+import org.apache.commons.collections4.map.MultiValueMap;
+import org.apache.commons.collections4.map.PredicatedMap;
+import org.apache.commons.collections4.map.PredicatedSortedMap;
+import org.apache.commons.collections4.map.TransformedMap;
+import org.apache.commons.collections4.map.TransformedSortedMap;
+import org.apache.commons.collections4.map.UnmodifiableMap;
+import org.apache.commons.collections4.map.UnmodifiableSortedMap;
 
 /**
  * Provides utility methods and decorators for
diff --git a/src/main/java/org/apache/commons/collections/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/MultiMap.java
rename to src/main/java/org/apache/commons/collections4/MultiMap.java
index 3cfd2a967..fb7e2da61 100644
--- a/src/main/java/org/apache/commons/collections/MultiMap.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/OrderedBidiMap.java
rename to src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
index 8b90fb801..c9266342c 100644
--- a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a map that allows bidirectional lookup between key and values
diff --git a/src/main/java/org/apache/commons/collections/OrderedIterator.java b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/OrderedIterator.java
rename to src/main/java/org/apache/commons/collections4/OrderedIterator.java
index d6339aa1c..64890236e 100644
--- a/src/main/java/org/apache/commons/collections/OrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/OrderedMap.java
rename to src/main/java/org/apache/commons/collections4/OrderedMap.java
index 71b6c6ea9..f73a35eec 100644
--- a/src/main/java/org/apache/commons/collections/OrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a map that maintains order and allows both forward and backward
diff --git a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/OrderedMapIterator.java
rename to src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
index 24de17137..5f22f5d41 100644
--- a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines an iterator that operates over an ordered <code>Map</code>.
diff --git a/src/main/java/org/apache/commons/collections/Predicate.java b/src/main/java/org/apache/commons/collections4/Predicate.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Predicate.java
rename to src/main/java/org/apache/commons/collections4/Predicate.java
index c0baf7250..983d78bd3 100644
--- a/src/main/java/org/apache/commons/collections/Predicate.java
+++ b/src/main/java/org/apache/commons/collections4/Predicate.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a functor interface implemented by classes that perform a predicate
diff --git a/src/main/java/org/apache/commons/collections/PredicateUtils.java b/src/main/java/org/apache/commons/collections4/PredicateUtils.java
similarity index 85%
rename from src/main/java/org/apache/commons/collections/PredicateUtils.java
rename to src/main/java/org/apache/commons/collections4/PredicateUtils.java
index 19beaa554..bab7e4e42 100644
--- a/src/main/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/main/java/org/apache/commons/collections4/PredicateUtils.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 
-import org.apache.commons.collections.functors.AllPredicate;
-import org.apache.commons.collections.functors.AndPredicate;
-import org.apache.commons.collections.functors.AnyPredicate;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionPredicate;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.IdentityPredicate;
-import org.apache.commons.collections.functors.InstanceofPredicate;
-import org.apache.commons.collections.functors.InvokerTransformer;
-import org.apache.commons.collections.functors.NonePredicate;
-import org.apache.commons.collections.functors.NotNullPredicate;
-import org.apache.commons.collections.functors.NotPredicate;
-import org.apache.commons.collections.functors.NullIsExceptionPredicate;
-import org.apache.commons.collections.functors.NullIsFalsePredicate;
-import org.apache.commons.collections.functors.NullIsTruePredicate;
-import org.apache.commons.collections.functors.NullPredicate;
-import org.apache.commons.collections.functors.OnePredicate;
-import org.apache.commons.collections.functors.OrPredicate;
-import org.apache.commons.collections.functors.TransformedPredicate;
-import org.apache.commons.collections.functors.TransformerPredicate;
-import org.apache.commons.collections.functors.TruePredicate;
-import org.apache.commons.collections.functors.UniquePredicate;
+import org.apache.commons.collections4.functors.AllPredicate;
+import org.apache.commons.collections4.functors.AndPredicate;
+import org.apache.commons.collections4.functors.AnyPredicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionPredicate;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.IdentityPredicate;
+import org.apache.commons.collections4.functors.InstanceofPredicate;
+import org.apache.commons.collections4.functors.InvokerTransformer;
+import org.apache.commons.collections4.functors.NonePredicate;
+import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.collections4.functors.NotPredicate;
+import org.apache.commons.collections4.functors.NullIsExceptionPredicate;
+import org.apache.commons.collections4.functors.NullIsFalsePredicate;
+import org.apache.commons.collections4.functors.NullIsTruePredicate;
+import org.apache.commons.collections4.functors.NullPredicate;
+import org.apache.commons.collections4.functors.OnePredicate;
+import org.apache.commons.collections4.functors.OrPredicate;
+import org.apache.commons.collections4.functors.TransformedPredicate;
+import org.apache.commons.collections4.functors.TransformerPredicate;
+import org.apache.commons.collections4.functors.TruePredicate;
+import org.apache.commons.collections4.functors.UniquePredicate;
 
 /**
  * <code>PredicateUtils</code> provides reference implementations and utilities
@@ -85,7 +85,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.ExceptionPredicate
+     * @see org.apache.commons.collections4.functors.ExceptionPredicate
      */
     public static <T> Predicate<T> exceptionPredicate() {
         return ExceptionPredicate.<T>exceptionPredicate();
@@ -96,7 +96,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.TruePredicate
+     * @see org.apache.commons.collections4.functors.TruePredicate
      */
     public static <T> Predicate<T> truePredicate() {
         return TruePredicate.truePredicate();
@@ -107,7 +107,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.FalsePredicate
+     * @see org.apache.commons.collections4.functors.FalsePredicate
      */
     public static <T> Predicate<T> falsePredicate() {
         return FalsePredicate.<T> falsePredicate();
@@ -118,7 +118,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.NullPredicate
+     * @see org.apache.commons.collections4.functors.NullPredicate
      */
     public static <T> Predicate<T> nullPredicate() {
         return NullPredicate.nullPredicate();
@@ -129,7 +129,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.NotNullPredicate
+     * @see org.apache.commons.collections4.functors.NotNullPredicate
      */
     public static <T> Predicate<T> notNullPredicate() {
         return NotNullPredicate.<T>notNullPredicate();
@@ -142,7 +142,7 @@ public class PredicateUtils {
      * @param <T>  the type that the predicate queries
      * @param value  the value to compare against
      * @return the predicate
-     * @see org.apache.commons.collections.functors.EqualPredicate
+     * @see org.apache.commons.collections4.functors.EqualPredicate
      */
     public static <T> Predicate<T> equalPredicate(final T value) {
         return EqualPredicate.equalPredicate(value);
@@ -155,7 +155,7 @@ public class PredicateUtils {
      * @param <T>  the type that the predicate queries
      * @param value  the value to compare against
      * @return the predicate
-     * @see org.apache.commons.collections.functors.IdentityPredicate
+     * @see org.apache.commons.collections4.functors.IdentityPredicate
      */
     public static <T> Predicate<T> identityPredicate(final T value) {
         return IdentityPredicate.<T>identityPredicate(value);
@@ -169,7 +169,7 @@ public class PredicateUtils {
      * @param type  the type to check for, may not be null
      * @return the predicate
      * @throws IllegalArgumentException if the class is null
-     * @see org.apache.commons.collections.functors.InstanceofPredicate
+     * @see org.apache.commons.collections4.functors.InstanceofPredicate
      */
     public static Predicate<Object> instanceofPredicate(final Class<?> type) {
         return InstanceofPredicate.instanceOfPredicate(type);
@@ -184,7 +184,7 @@ public class PredicateUtils {
      *
      * @param <T>  the type that the predicate queries
      * @return the predicate
-     * @see org.apache.commons.collections.functors.UniquePredicate
+     * @see org.apache.commons.collections4.functors.UniquePredicate
      */
     public static <T> Predicate<T> uniquePredicate() {
         // must return new instance each time
@@ -205,8 +205,8 @@ public class PredicateUtils {
      * @param methodName  the method name to call on the input object, may not be null
      * @return the predicate
      * @throws IllegalArgumentException if the methodName is null.
-     * @see org.apache.commons.collections.functors.InvokerTransformer
-     * @see org.apache.commons.collections.functors.TransformerPredicate
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.TransformerPredicate
      */
     public static <T> Predicate<T> invokerPredicate(final String methodName) {
         // reuse transformer as it has caching - this is lazy really, should have inner class here
@@ -230,8 +230,8 @@ public class PredicateUtils {
      * @return the predicate
      * @throws IllegalArgumentException if the method name is null
      * @throws IllegalArgumentException if the paramTypes and args don't match
-     * @see org.apache.commons.collections.functors.InvokerTransformer
-     * @see org.apache.commons.collections.functors.TransformerPredicate
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.TransformerPredicate
      */
     public static <T> Predicate<T> invokerPredicate(final String methodName, final Class<?>[] paramTypes,
                                                     final Object[] args) {
@@ -251,7 +251,7 @@ public class PredicateUtils {
      * @param predicate2  the second predicate, may not be null
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
-     * @see org.apache.commons.collections.functors.AndPredicate
+     * @see org.apache.commons.collections4.functors.AndPredicate
      */
     public static <T> Predicate<T> andPredicate(final Predicate<? super T> predicate1,
                                                 final Predicate<? super T> predicate2) {
@@ -268,7 +268,7 @@ public class PredicateUtils {
      * @return the <code>all</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
-     * @see org.apache.commons.collections.functors.AllPredicate
+     * @see org.apache.commons.collections4.functors.AllPredicate
      */
     public static <T> Predicate<T> allPredicate(final Predicate<? super T>... predicates) {
         return AllPredicate.allPredicate(predicates);
@@ -284,7 +284,7 @@ public class PredicateUtils {
      * @return the <code>all</code> predicate
      * @throws IllegalArgumentException if the predicates collection is null
      * @throws IllegalArgumentException if any predicate in the collection is null
-     * @see org.apache.commons.collections.functors.AllPredicate
+     * @see org.apache.commons.collections4.functors.AllPredicate
      */
     public static <T> Predicate<T> allPredicate(final Collection<? extends Predicate<T>> predicates) {
         return AllPredicate.allPredicate(predicates);
@@ -299,7 +299,7 @@ public class PredicateUtils {
      * @param predicate2  the second predicate, may not be null
      * @return the <code>or</code> predicate
      * @throws IllegalArgumentException if either predicate is null
-     * @see org.apache.commons.collections.functors.OrPredicate
+     * @see org.apache.commons.collections4.functors.OrPredicate
      */
     public static <T> Predicate<T> orPredicate(final Predicate<? super T> predicate1,
                                                final Predicate<? super T> predicate2) {
@@ -316,7 +316,7 @@ public class PredicateUtils {
      * @return the <code>any</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
-     * @see org.apache.commons.collections.functors.AnyPredicate
+     * @see org.apache.commons.collections4.functors.AnyPredicate
      */
     public static <T> Predicate<T> anyPredicate(final Predicate<? super T>... predicates) {
         return AnyPredicate.anyPredicate(predicates);
@@ -332,7 +332,7 @@ public class PredicateUtils {
      * @return the <code>any</code> predicate
      * @throws IllegalArgumentException if the predicates collection is null
      * @throws IllegalArgumentException if any predicate in the collection is null
-     * @see org.apache.commons.collections.functors.AnyPredicate
+     * @see org.apache.commons.collections4.functors.AnyPredicate
      */
     public static <T> Predicate<T> anyPredicate(final Collection<? extends Predicate<T>> predicates) {
         return AnyPredicate.anyPredicate(predicates);
@@ -347,7 +347,7 @@ public class PredicateUtils {
      * @param predicate2  the second predicate, may not be null
      * @return the <code>either</code> predicate
      * @throws IllegalArgumentException if either predicate is null
-     * @see org.apache.commons.collections.functors.OnePredicate
+     * @see org.apache.commons.collections4.functors.OnePredicate
      */
     public static <T> Predicate<T> eitherPredicate(final Predicate<? super T> predicate1,
                                                    final Predicate<? super T> predicate2) {
@@ -366,7 +366,7 @@ public class PredicateUtils {
      * @return the <code>one</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
-     * @see org.apache.commons.collections.functors.OnePredicate
+     * @see org.apache.commons.collections4.functors.OnePredicate
      */
     public static <T> Predicate<T> onePredicate(final Predicate<? super T>... predicates) {
         return OnePredicate.onePredicate(predicates);
@@ -382,7 +382,7 @@ public class PredicateUtils {
      * @return the <code>one</code> predicate
      * @throws IllegalArgumentException if the predicates collection is null
      * @throws IllegalArgumentException if any predicate in the collection is null
-     * @see org.apache.commons.collections.functors.OnePredicate
+     * @see org.apache.commons.collections4.functors.OnePredicate
      */
     public static <T> Predicate<T> onePredicate(final Collection<Predicate<T>> predicates) {
         return OnePredicate.onePredicate(predicates);
@@ -397,7 +397,7 @@ public class PredicateUtils {
      * @param predicate2  the second predicate, may not be null
      * @return the <code>neither</code> predicate
      * @throws IllegalArgumentException if either predicate is null
-     * @see org.apache.commons.collections.functors.NonePredicate
+     * @see org.apache.commons.collections4.functors.NonePredicate
      */
     public static <T> Predicate<T> neitherPredicate(final Predicate<? super T> predicate1,
                                                     final Predicate<? super T> predicate2) {
@@ -416,7 +416,7 @@ public class PredicateUtils {
      * @return the <code>none</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
-     * @see org.apache.commons.collections.functors.NonePredicate
+     * @see org.apache.commons.collections4.functors.NonePredicate
      */
     public static <T> Predicate<T> nonePredicate(final Predicate<? super T>... predicates) {
         return NonePredicate.nonePredicate(predicates);
@@ -432,7 +432,7 @@ public class PredicateUtils {
      * @return the <code>none</code> predicate
      * @throws IllegalArgumentException if the predicates collection is null
      * @throws IllegalArgumentException if any predicate in the collection is null
-     * @see org.apache.commons.collections.functors.NonePredicate
+     * @see org.apache.commons.collections4.functors.NonePredicate
      */
     public static <T> Predicate<T> nonePredicate(final Collection<? extends Predicate<T>> predicates) {
         return NonePredicate.nonePredicate(predicates);
@@ -446,7 +446,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to not
      * @return the <code>not</code> predicate
      * @throws IllegalArgumentException if the predicate is null
-     * @see org.apache.commons.collections.functors.NotPredicate
+     * @see org.apache.commons.collections4.functors.NotPredicate
      */
     public static <T> Predicate<T> notPredicate(final Predicate<? super T> predicate) {
         return NotPredicate.notPredicate(predicate);
@@ -464,7 +464,7 @@ public class PredicateUtils {
      * @param transformer  the transformer to wrap, may not be null
      * @return the transformer wrapping predicate
      * @throws IllegalArgumentException if the transformer is null
-     * @see org.apache.commons.collections.functors.TransformerPredicate
+     * @see org.apache.commons.collections4.functors.TransformerPredicate
      */
     public static <T> Predicate<T> asPredicate(final Transformer<? super T, Boolean> transformer) {
         return TransformerPredicate.transformerPredicate(transformer);
@@ -482,7 +482,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to wrap, may not be null
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null.
-     * @see org.apache.commons.collections.functors.NullIsExceptionPredicate
+     * @see org.apache.commons.collections4.functors.NullIsExceptionPredicate
      */
     public static <T> Predicate<T> nullIsExceptionPredicate(final Predicate<? super T> predicate){
         return NullIsExceptionPredicate.nullIsExceptionPredicate(predicate);
@@ -497,7 +497,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to wrap, may not be null
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null.
-     * @see org.apache.commons.collections.functors.NullIsFalsePredicate
+     * @see org.apache.commons.collections4.functors.NullIsFalsePredicate
      */
     public static <T> Predicate<T> nullIsFalsePredicate(final Predicate<? super T> predicate){
         return NullIsFalsePredicate.nullIsFalsePredicate(predicate);
@@ -512,7 +512,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to wrap, may not be null
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null.
-     * @see org.apache.commons.collections.functors.NullIsTruePredicate
+     * @see org.apache.commons.collections4.functors.NullIsTruePredicate
      */
     public static <T> Predicate<T> nullIsTruePredicate(final Predicate<? super T> predicate){
         return NullIsTruePredicate.nullIsTruePredicate(predicate);
@@ -529,7 +529,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to call with the result of the transform
      * @return the predicate
      * @throws IllegalArgumentException if the transformer or the predicate is null
-     * @see org.apache.commons.collections.functors.TransformedPredicate
+     * @see org.apache.commons.collections4.functors.TransformedPredicate
      * @since 3.1
      */
     public static <T> Predicate<T> transformedPredicate(
diff --git a/src/main/java/org/apache/commons/collections/Put.java b/src/main/java/org/apache/commons/collections4/Put.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/Put.java
rename to src/main/java/org/apache/commons/collections4/Put.java
index cf9ff78b1..59cb1bbe5 100644
--- a/src/main/java/org/apache/commons/collections/Put.java
+++ b/src/main/java/org/apache/commons/collections4/Put.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/apache/commons/collections/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/QueueUtils.java
rename to src/main/java/org/apache/commons/collections4/QueueUtils.java
index e48db4246..99b9635c3 100644
--- a/src/main/java/org/apache/commons/collections/QueueUtils.java
+++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.commons.collections.queue.PredicatedQueue;
-import org.apache.commons.collections.queue.TransformedQueue;
-import org.apache.commons.collections.queue.UnmodifiableQueue;
+import org.apache.commons.collections4.queue.PredicatedQueue;
+import org.apache.commons.collections4.queue.TransformedQueue;
+import org.apache.commons.collections4.queue.UnmodifiableQueue;
 
 /**
  * Provides utility methods and decorators for {@link Queue} instances.
diff --git a/src/main/java/org/apache/commons/collections/ResettableIterator.java b/src/main/java/org/apache/commons/collections4/ResettableIterator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/ResettableIterator.java
rename to src/main/java/org/apache/commons/collections4/ResettableIterator.java
index 0c68da89d..85a888768 100644
--- a/src/main/java/org/apache/commons/collections/ResettableIterator.java
+++ b/src/main/java/org/apache/commons/collections4/ResettableIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/ResettableListIterator.java b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/ResettableListIterator.java
rename to src/main/java/org/apache/commons/collections4/ResettableListIterator.java
index 511b71810..1dd7939df 100644
--- a/src/main/java/org/apache/commons/collections/ResettableListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ListIterator;
 
diff --git a/src/main/java/org/apache/commons/collections/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/SetUtils.java
rename to src/main/java/org/apache/commons/collections4/SetUtils.java
index eb59d721f..067582df5 100644
--- a/src/main/java/org/apache/commons/collections/SetUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SetUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,13 +22,13 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.commons.collections.set.ListOrderedSet;
-import org.apache.commons.collections.set.PredicatedSet;
-import org.apache.commons.collections.set.PredicatedSortedSet;
-import org.apache.commons.collections.set.TransformedSet;
-import org.apache.commons.collections.set.TransformedSortedSet;
-import org.apache.commons.collections.set.UnmodifiableSet;
-import org.apache.commons.collections.set.UnmodifiableSortedSet;
+import org.apache.commons.collections4.set.ListOrderedSet;
+import org.apache.commons.collections4.set.PredicatedSet;
+import org.apache.commons.collections4.set.PredicatedSortedSet;
+import org.apache.commons.collections4.set.TransformedSet;
+import org.apache.commons.collections4.set.TransformedSortedSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSortedSet;
 
 /**
  * Provides utility methods and decorators for
diff --git a/src/main/java/org/apache/commons/collections/SortedBag.java b/src/main/java/org/apache/commons/collections4/SortedBag.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/SortedBag.java
rename to src/main/java/org/apache/commons/collections4/SortedBag.java
index 2c503de81..1051ed3db 100644
--- a/src/main/java/org/apache/commons/collections/SortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/SortedBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/org/apache/commons/collections/SortedBidiMap.java b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/SortedBidiMap.java
rename to src/main/java/org/apache/commons/collections4/SortedBidiMap.java
index 32c80cfe0..8e768b7db 100644
--- a/src/main/java/org/apache/commons/collections/SortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Comparator;
 import java.util.SortedMap;
diff --git a/src/main/java/org/apache/commons/collections/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/SplitMapUtils.java
rename to src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index f079147c1..b8f5ec81d 100644
--- a/src/main/java/org/apache/commons/collections/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
-import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
-import org.apache.commons.collections.map.UnmodifiableEntrySet;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
+import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
+import org.apache.commons.collections4.map.UnmodifiableEntrySet;
 
 /**
  * Utilities for working with "split maps:" objects that implement {@link Put}
diff --git a/src/main/java/org/apache/commons/collections/Transformer.java b/src/main/java/org/apache/commons/collections4/Transformer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Transformer.java
rename to src/main/java/org/apache/commons/collections4/Transformer.java
index c599422de..cf4637f14 100644
--- a/src/main/java/org/apache/commons/collections/Transformer.java
+++ b/src/main/java/org/apache/commons/collections4/Transformer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Defines a functor interface implemented by classes that transform one
diff --git a/src/main/java/org/apache/commons/collections/TransformerUtils.java b/src/main/java/org/apache/commons/collections4/TransformerUtils.java
similarity index 87%
rename from src/main/java/org/apache/commons/collections/TransformerUtils.java
rename to src/main/java/org/apache/commons/collections4/TransformerUtils.java
index bc61c8c75..623570c5c 100644
--- a/src/main/java/org/apache/commons/collections/TransformerUtils.java
+++ b/src/main/java/org/apache/commons/collections4/TransformerUtils.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.collections.functors.ChainedTransformer;
-import org.apache.commons.collections.functors.CloneTransformer;
-import org.apache.commons.collections.functors.ClosureTransformer;
-import org.apache.commons.collections.functors.ConstantTransformer;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionTransformer;
-import org.apache.commons.collections.functors.FactoryTransformer;
-import org.apache.commons.collections.functors.InstantiateTransformer;
-import org.apache.commons.collections.functors.InvokerTransformer;
-import org.apache.commons.collections.functors.MapTransformer;
-import org.apache.commons.collections.functors.NOPTransformer;
-import org.apache.commons.collections.functors.PredicateTransformer;
-import org.apache.commons.collections.functors.StringValueTransformer;
-import org.apache.commons.collections.functors.SwitchTransformer;
+import org.apache.commons.collections4.functors.ChainedTransformer;
+import org.apache.commons.collections4.functors.CloneTransformer;
+import org.apache.commons.collections4.functors.ClosureTransformer;
+import org.apache.commons.collections4.functors.ConstantTransformer;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionTransformer;
+import org.apache.commons.collections4.functors.FactoryTransformer;
+import org.apache.commons.collections4.functors.InstantiateTransformer;
+import org.apache.commons.collections4.functors.InvokerTransformer;
+import org.apache.commons.collections4.functors.MapTransformer;
+import org.apache.commons.collections4.functors.NOPTransformer;
+import org.apache.commons.collections4.functors.PredicateTransformer;
+import org.apache.commons.collections4.functors.StringValueTransformer;
+import org.apache.commons.collections4.functors.SwitchTransformer;
 
 /**
  * <code>TransformerUtils</code> provides reference implementations and 
@@ -73,7 +73,7 @@ public class TransformerUtils {
      * @param <I>  the input type
      * @param <O>  the output type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.ExceptionTransformer
+     * @see org.apache.commons.collections4.functors.ExceptionTransformer
      */
     public static <I, O> Transformer<I, O> exceptionTransformer() {
         return ExceptionTransformer.<I, O>exceptionTransformer();
@@ -85,7 +85,7 @@ public class TransformerUtils {
      * @param <I>  the input type
      * @param <O>  the output type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.ConstantTransformer
+     * @see org.apache.commons.collections4.functors.ConstantTransformer
      */
     public static <I, O> Transformer<I, O> nullTransformer() {
         return ConstantTransformer.<I, O>nullTransformer();
@@ -98,7 +98,7 @@ public class TransformerUtils {
      * 
      * @param <T>  the input/output type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.NOPTransformer
+     * @see org.apache.commons.collections4.functors.NOPTransformer
      */
     public static <T> Transformer<T, T> nopTransformer() {
         return NOPTransformer.<T>nopTransformer();
@@ -116,7 +116,7 @@ public class TransformerUtils {
      * 
      * @param <T>  the input/output type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.CloneTransformer
+     * @see org.apache.commons.collections4.functors.CloneTransformer
      */
     public static <T> Transformer<T, T> cloneTransformer() {
         return CloneTransformer.<T>cloneTransformer();
@@ -130,7 +130,7 @@ public class TransformerUtils {
      * @param <O>  the output type
      * @param constantToReturn  the constant object to return each time in the transformer
      * @return the transformer.
-     * @see org.apache.commons.collections.functors.ConstantTransformer
+     * @see org.apache.commons.collections4.functors.ConstantTransformer
      */
     public static <I, O> Transformer<I, O> constantTransformer(final O constantToReturn) {
         return ConstantTransformer.constantTransformer(constantToReturn);
@@ -144,7 +144,7 @@ public class TransformerUtils {
      * @param closure  the closure to run each time in the transformer, not null
      * @return the transformer
      * @throws IllegalArgumentException if the closure is null
-     * @see org.apache.commons.collections.functors.ClosureTransformer
+     * @see org.apache.commons.collections4.functors.ClosureTransformer
      */
     public static <T> Transformer<T, T> asTransformer(final Closure<? super T> closure) {
         return ClosureTransformer.closureTransformer(closure);
@@ -158,7 +158,7 @@ public class TransformerUtils {
      * @param predicate  the predicate to run each time in the transformer, not null
      * @return the transformer
      * @throws IllegalArgumentException if the predicate is null
-     * @see org.apache.commons.collections.functors.PredicateTransformer
+     * @see org.apache.commons.collections4.functors.PredicateTransformer
      */
     public static <T> Transformer<T, Boolean> asTransformer(final Predicate<? super T> predicate) {
         return PredicateTransformer.predicateTransformer(predicate);
@@ -173,7 +173,7 @@ public class TransformerUtils {
      * @param factory  the factory to run each time in the transformer, not null
      * @return the transformer
      * @throws IllegalArgumentException if the factory is null
-     * @see org.apache.commons.collections.functors.FactoryTransformer
+     * @see org.apache.commons.collections4.functors.FactoryTransformer
      */
     public static <I, O> Transformer<I, O> asTransformer(final Factory<? extends O> factory) {
         return FactoryTransformer.factoryTransformer(factory);
@@ -188,7 +188,7 @@ public class TransformerUtils {
      * @param transformer2  the second transformer
      * @return the transformer
      * @throws IllegalArgumentException if either transformer is null
-     * @see org.apache.commons.collections.functors.ChainedTransformer
+     * @see org.apache.commons.collections4.functors.ChainedTransformer
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, T> chainedTransformer(
@@ -205,7 +205,7 @@ public class TransformerUtils {
      * @param transformers  an array of transformers to chain
      * @return the transformer
      * @throws IllegalArgumentException if the transformers array or any of the transformers is null
-     * @see org.apache.commons.collections.functors.ChainedTransformer
+     * @see org.apache.commons.collections4.functors.ChainedTransformer
      */
     public static <T> Transformer<T, T> chainedTransformer(final Transformer<? super T, ? extends T>[] transformers) {
         return ChainedTransformer.chainedTransformer(transformers);
@@ -220,7 +220,7 @@ public class TransformerUtils {
      * @param transformers  a collection of transformers to chain
      * @return the transformer
      * @throws IllegalArgumentException if the transformers collection or any of the transformers is null
-     * @see org.apache.commons.collections.functors.ChainedTransformer
+     * @see org.apache.commons.collections4.functors.ChainedTransformer
      */
     public static <T> Transformer<T, T> chainedTransformer(
             final Collection<? extends Transformer<T, T>> transformers) {
@@ -238,7 +238,7 @@ public class TransformerUtils {
      * @param falseTransformer  the transformer called if the predicate is false
      * @return the transformer
      * @throws IllegalArgumentException if either the predicate or transformer is null
-     * @see org.apache.commons.collections.functors.SwitchTransformer
+     * @see org.apache.commons.collections4.functors.SwitchTransformer
      */
     @SuppressWarnings("unchecked")
     public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I> predicate,
@@ -262,7 +262,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the either array is null or empty
      * @throws IllegalArgumentException if any element in the arrays is null
      * @throws IllegalArgumentException if the arrays are different sizes
-     * @see org.apache.commons.collections.functors.SwitchTransformer
+     * @see org.apache.commons.collections4.functors.SwitchTransformer
      */
     public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates,
             final Transformer<? super I, ? extends O>[] transformers) {
@@ -285,7 +285,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the either array is null or empty
      * @throws IllegalArgumentException if any element in the arrays is null
      * @throws IllegalArgumentException if the arrays are different sizes
-     * @see org.apache.commons.collections.functors.SwitchTransformer
+     * @see org.apache.commons.collections4.functors.SwitchTransformer
      */
     public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates,
             final Transformer<? super I, ? extends O>[] transformers,
@@ -312,7 +312,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the map is null or empty
      * @throws IllegalArgumentException if any transformer in the map is null
      * @throws ClassCastException  if the map elements are of the wrong type
-     * @see org.apache.commons.collections.functors.SwitchTransformer
+     * @see org.apache.commons.collections4.functors.SwitchTransformer
      */
     public static <I, O> Transformer<I, O> switchTransformer(
             final Map<Predicate<I>, Transformer<I, O>> predicatesAndTransformers) {
@@ -334,7 +334,7 @@ public class TransformerUtils {
      * @return the transformer
      * @throws IllegalArgumentException if the map is null or empty
      * @throws IllegalArgumentException if any transformer in the map is null
-     * @see org.apache.commons.collections.functors.SwitchTransformer
+     * @see org.apache.commons.collections4.functors.SwitchTransformer
      */
     @SuppressWarnings("unchecked")
     public static <I, O> Transformer<I, O> switchMapTransformer(
@@ -360,7 +360,7 @@ public class TransformerUtils {
      * 
      * @param <T>  the output type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.InstantiateTransformer
+     * @see org.apache.commons.collections4.functors.InstantiateTransformer
      */
     public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
         return InstantiateTransformer.<T>instantiateTransformer();
@@ -376,7 +376,7 @@ public class TransformerUtils {
      * @param args  the arguments to pass to the constructor, can be null
      * @return the transformer
      * @throws IllegalArgumentException if the paramTypes and args don't match
-     * @see org.apache.commons.collections.functors.InstantiateTransformer
+     * @see org.apache.commons.collections4.functors.InstantiateTransformer
      */
     public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(
             final Class<?>[] paramTypes, final Object[] args) {
@@ -391,7 +391,7 @@ public class TransformerUtils {
      * @param <O>  the output type
      * @param map  the map to use to transform the objects
      * @return the transformer, or a {@link ConstantTransformer#NULL_INSTANCE} if the {@code map} is {@code null}
-     * @see org.apache.commons.collections.functors.MapTransformer
+     * @see org.apache.commons.collections4.functors.MapTransformer
      */
     public static <I, O> Transformer<I, O> mapTransformer(final Map<? super I, ? extends O> map) {
         return MapTransformer.mapTransformer(map);
@@ -411,7 +411,7 @@ public class TransformerUtils {
      * @param methodName  the method name to call on the input object, may not be null
      * @return the transformer
      * @throws IllegalArgumentException if the methodName is null.
-     * @see org.apache.commons.collections.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
      */
     public static <I, O> Transformer<I, O> invokerTransformer(final String methodName) {
         return InvokerTransformer.<I, O>invokerTransformer(methodName, null, null);
@@ -429,7 +429,7 @@ public class TransformerUtils {
      * @param args  the arguments
      * @return the transformer
      * @throws IllegalArgumentException if the method name is null or the paramTypes and args don't match
-     * @see org.apache.commons.collections.functors.InvokerTransformer
+     * @see org.apache.commons.collections4.functors.InvokerTransformer
      */
     public static <I, O> Transformer<I, O> invokerTransformer(final String methodName, final Class<?>[] paramTypes,
                                                               final Object[] args) {
@@ -443,7 +443,7 @@ public class TransformerUtils {
      * 
      * @param <T>  the input type
      * @return the transformer
-     * @see org.apache.commons.collections.functors.StringValueTransformer
+     * @see org.apache.commons.collections4.functors.StringValueTransformer
      */
     public static <T> Transformer<T, String> stringValueTransformer() {
         return StringValueTransformer.<T>stringValueTransformer();
diff --git a/src/main/java/org/apache/commons/collections/Trie.java b/src/main/java/org/apache/commons/collections4/Trie.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/Trie.java
rename to src/main/java/org/apache/commons/collections4/Trie.java
index 58e4ea8c8..eb0cc8a7d 100644
--- a/src/main/java/org/apache/commons/collections/Trie.java
+++ b/src/main/java/org/apache/commons/collections4/Trie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Map;
 import java.util.SortedMap;
diff --git a/src/main/java/org/apache/commons/collections/TrieUtils.java b/src/main/java/org/apache/commons/collections4/TrieUtils.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/TrieUtils.java
rename to src/main/java/org/apache/commons/collections4/TrieUtils.java
index 2132e4095..a8a99741a 100644
--- a/src/main/java/org/apache/commons/collections/TrieUtils.java
+++ b/src/main/java/org/apache/commons/collections4/TrieUtils.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
-import org.apache.commons.collections.trie.SynchronizedTrie;
-import org.apache.commons.collections.trie.UnmodifiableTrie;
+import org.apache.commons.collections4.trie.SynchronizedTrie;
+import org.apache.commons.collections4.trie.UnmodifiableTrie;
 
 /**
  * A collection of {@link Trie} utilities.
diff --git a/src/main/java/org/apache/commons/collections/Unmodifiable.java b/src/main/java/org/apache/commons/collections4/Unmodifiable.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/Unmodifiable.java
rename to src/main/java/org/apache/commons/collections4/Unmodifiable.java
index ea18ede28..388c6f2d1 100644
--- a/src/main/java/org/apache/commons/collections/Unmodifiable.java
+++ b/src/main/java/org/apache/commons/collections4/Unmodifiable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 /**
  * Marker interface for collections, maps and iterators that are unmodifiable.
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
rename to src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
index 72b0e3021..a81a5b400 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
 
 /**
  * Decorates another <code>Bag</code> to provide additional behaviour.
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
rename to src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
index 0e20fbbea..ef10ed74b 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.Bag;
 
 /**
  * Abstract implementation of the {@link Bag} interface to simplify the creation
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
rename to src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
index 8727d7b31..5f83373cd 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Comparator;
 
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.SortedBag;
 
 /**
  * Decorates another <code>SortedBag</code> to provide additional behaviour.
diff --git a/src/main/java/org/apache/commons/collections/bag/HashBag.java b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bag/HashBag.java
rename to src/main/java/org/apache/commons/collections4/bag/HashBag.java
index d7ff7e5d9..f974d02be 100644
--- a/src/main/java/org/apache/commons/collections/bag/HashBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;
 
-import org.apache.commons.collections.Bag;
+import org.apache.commons.collections4.Bag;
 
 /**
  * Implements {@link Bag}, using a {@link HashMap} to provide the
diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/bag/PredicatedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
index 780970c07..d99778ef1 100644
--- a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.collection.PredicatedCollection;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollection;
 
 /**
  * Decorates another {@link Bag} to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
index d99dd5a5e..8fe8d6d87 100644
--- a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Comparator;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.SortedBag;
 
 /**
  * Decorates another {@link SortedBag} to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
index ef89b9474..eec71e1f0 100644
--- a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.collection.SynchronizedCollection;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
 
 /**
  * Decorates another {@link Bag} to synchronize its behaviour
diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
index e9fb09e41..ec98cd8cf 100644
--- a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Comparator;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.SortedBag;
 
 /**
  * Decorates another {@link SortedBag} to synchronize its behaviour
diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/bag/TransformedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
index 8dac05866..760b4dcca 100644
--- a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.set.TransformedSet;
+import org.apache.commons.collections4.set.TransformedSet;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollection;
 
 /**
  * Decorates another {@link Bag} to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
index 88f21b20d..7d1db12b7 100644
--- a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Comparator;
 
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another {@link SortedBag} to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/bag/TreeBag.java b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/bag/TreeBag.java
rename to src/main/java/org/apache/commons/collections4/bag/TreeBag.java
index 743dcfe44..4d9c3276f 100644
--- a/src/main/java/org/apache/commons/collections/bag/TreeBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -25,7 +25,7 @@ import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.SortedBag;
 
 /**
  * Implements {@link SortedBag}, using a {@link TreeMap} to provide
@@ -34,7 +34,7 @@ import org.apache.commons.collections.SortedBag;
  * Order will be maintained among the bag members and can be viewed through the
  * iterator.
  * <p>
- * A {@link org.apache.commons.collections.Bag Bag} stores each object in the collection together with a count
+ * A {@link org.apache.commons.collections4.Bag Bag} stores each object in the collection together with a count
  * of occurrences. Extra methods on the interface allow multiple copies of an
  * object to be added or removed at once. It is important to read the interface
  * javadoc carefully as several methods violate the {@link Collection}
diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
index fb12a6edb..a9d4e79ce 100644
--- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,10 +24,10 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another {@link Bag} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
index 594d9e877..87ccec6fd 100644
--- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,10 +24,10 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another {@link SortedBag} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/bag/package-info.java b/src/main/java/org/apache/commons/collections4/bag/package-info.java
similarity index 91%
rename from src/main/java/org/apache/commons/collections/bag/package-info.java
rename to src/main/java/org/apache/commons/collections4/bag/package-info.java
index 7fb455ad2..6f20378ce 100644
--- a/src/main/java/org/apache/commons/collections/bag/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/bag/package-info.java
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 /**
- * This package contains implementations of the {@link org.apache.commons.collections.Bag Bag} and 
- * {@link org.apache.commons.collections.SortedBag SortedBag} interfaces.
+ * This package contains implementations of the {@link org.apache.commons.collections4.Bag Bag} and 
+ * {@link org.apache.commons.collections4.SortedBag SortedBag} interfaces.
  * A bag stores an object and a count of the number of occurrences of the object.
  * <p>
  * The following implementations are provided in the package:
@@ -35,4 +35,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
index 061c8a8c4..aefeb48c9 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.map.AbstractMapDecorator;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.map.AbstractMapDecorator;
 
 /** 
  * Provides a base decorator that enables additional functionality to be added
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
index 0d27ea29a..9915fb6a1 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.collection.AbstractCollectionDecorator;
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
 
 /**
  * Abstract {@link BidiMap} implemented using two maps.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
index 0624c5e3e..c7c9d6f39 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedMapIterator;
 
 /** 
  * Provides a base decorator that enables additional functionality to be added
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
index 9f6348540..6d9993cc0 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Comparator;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.SortedBidiMap;
+import org.apache.commons.collections4.SortedBidiMap;
 
 /** 
  * Provides a base decorator that enables additional functionality to be added
diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
index 28bc76178..adea1fc47 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.BidiMap;
+import org.apache.commons.collections4.BidiMap;
 
 /**
  * Implementation of {@link BidiMap} that uses two {@link HashMap} instances.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
index 48e437fff..bb08210f1 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
-import org.apache.commons.collections.BidiMap;
+import org.apache.commons.collections4.BidiMap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
index aafd23875..b3c0edbed 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,13 +28,13 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.map.AbstractSortedMapDecorator;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.map.AbstractSortedMapDecorator;
 
 /**
  * Implementation of {@link BidiMap} that uses two {@link TreeMap} instances.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index c3a4fc30e..0c1486502 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -24,16 +24,16 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.OrderedIterator;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
-import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
 
-import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.KEY;
-import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VALUE;
+import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
+import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
 
 /**
  * Red-Black tree-based implementation of BidiMap where all objects added
@@ -69,6 +69,8 @@ import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VAL
  * not allow setValue() and will throw an
  * UnsupportedOperationException on attempts to call that method.
  *
+ * TODO: serialization does not work anymore
+ *
  * @since 3.0 (previously DoubleOrderedMap v2.0)
  * @version $Id$
  */
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
similarity index 89%
rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
index ef3e51a05..2366636b0 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
-import org.apache.commons.collections.map.UnmodifiableEntrySet;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
+import org.apache.commons.collections4.map.UnmodifiableEntrySet;
 
 /**
  * Decorates another {@link BidiMap} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
similarity index 89%
rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
index 4fffa0489..a0fafd707 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator;
-import org.apache.commons.collections.map.UnmodifiableEntrySet;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
+import org.apache.commons.collections4.map.UnmodifiableEntrySet;
 
 /**
  * Decorates another {@link OrderedBidiMap} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
similarity index 89%
rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
index 12b5d8d48..1938e5f31 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator;
-import org.apache.commons.collections.map.UnmodifiableEntrySet;
-import org.apache.commons.collections.map.UnmodifiableSortedMap;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
+import org.apache.commons.collections4.map.UnmodifiableEntrySet;
+import org.apache.commons.collections4.map.UnmodifiableSortedMap;
 
 /**
  * Decorates another {@link SortedBidiMap} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/bidimap/package-info.java b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
similarity index 85%
rename from src/main/java/org/apache/commons/collections/bidimap/package-info.java
rename to src/main/java/org/apache/commons/collections4/bidimap/package-info.java
index 745e1f459..831b91a81 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
@@ -16,9 +16,9 @@
  */
 /**
  * This package contains implementations of the
- * {@link org.apache.commons.collections.BidiMap BidiMap},
- * {@link org.apache.commons.collections.OrderedBidiMap OrderedBidiMap} and 
- * {@link org.apache.commons.collections.SortedBidiMap SortedBidiMap} interfaces.
+ * {@link org.apache.commons.collections4.BidiMap BidiMap},
+ * {@link org.apache.commons.collections4.OrderedBidiMap OrderedBidiMap} and 
+ * {@link org.apache.commons.collections4.SortedBidiMap SortedBidiMap} interfaces.
  * A BidiMap is an extension to Map that allows keys and values to be looked up with equal ease.
  * One example usage is a system communicating to a legacy datasource that must convert codes
  * from the new format to the old format and vice versa.
@@ -38,4 +38,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
rename to src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
index 188189f25..7c3558344 100644
--- a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
rename to src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java
index 7c0adbdf8..38dcb53e4 100644
--- a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
index 100d9d2eb..8230b7c05 100644
--- a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
@@ -24,9 +24,9 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Decorates a collection of other collections to provide a single unified view.
diff --git a/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
index 9dca3ff48..60e31b8a4 100644
--- a/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.Collection;
 import java.util.HashMap;
 
-import org.apache.commons.collections.MultiMap;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections4.MultiMap;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.map.MultiValueMap;
 
 /**
  * An IndexedCollection is a Map-like view onto a Collection. It accepts a
diff --git a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
index 7a917780c..e9d20ff83 100644
--- a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another {@link Collection} to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
index b340cc2c1..b696a6a0a 100644
--- a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
index 8b263822a..1e751eb5e 100644
--- a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another {@link Collection} to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
index 667a25ae3..e3b426c3d 100644
--- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections.BoundedCollection;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.BoundedCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * {@link UnmodifiableBoundedCollection} decorates another
diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
index 3c35cff63..523ab1c6b 100644
--- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another {@link Collection} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/collection/package-info.java b/src/main/java/org/apache/commons/collections4/collection/package-info.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/collection/package-info.java
rename to src/main/java/org/apache/commons/collections4/collection/package-info.java
index bbc908b76..42674bf04 100644
--- a/src/main/java/org/apache/commons/collections/collection/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/collection/package-info.java
@@ -33,4 +33,4 @@
  * 
  * @version $Id$
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
diff --git a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
index d020566ea..0040340bb 100644
--- a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
index 9a7a7a283..8d9605f15 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
rename to src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
index 3bf09f086..1fb7b66ec 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
index 300d48b39..e42a00b46 100644
--- a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/NullComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
index c7a5ebe61..1be98fecf 100644
--- a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.collections.ComparatorUtils;
+import org.apache.commons.collections4.ComparatorUtils;
 
 /**
  * A Comparator that will compare nulls to be either lower or higher than
diff --git a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
index f50311f30..86ac58838 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.collections.ComparatorUtils;
+import org.apache.commons.collections4.ComparatorUtils;
 
 /**
  * Reverses the order of another comparator by reversing the arguments
diff --git a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
index 1d7e9007a..7a2f9b8b7 100644
--- a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.collections.ComparatorUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.ComparatorUtils;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another Comparator with transformation behavior. That is, the
@@ -32,8 +32,8 @@ import org.apache.commons.collections.Transformer;
  * @since 2.1
  * @version $Id$
  *
- * @see org.apache.commons.collections.Transformer
- * @see org.apache.commons.collections.comparators.ComparableComparator
+ * @see org.apache.commons.collections4.Transformer
+ * @see org.apache.commons.collections4.comparators.ComparableComparator
  */
 public class TransformingComparator<I, O> implements Comparator<I>, Serializable {
     
diff --git a/src/main/java/org/apache/commons/collections/comparators/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/package-info.java
similarity index 89%
rename from src/main/java/org/apache/commons/collections/comparators/package-info.java
rename to src/main/java/org/apache/commons/collections4/comparators/package-info.java
index 55de9929d..1d237c42e 100644
--- a/src/main/java/org/apache/commons/collections/comparators/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/package-info.java
@@ -19,10 +19,10 @@
  * {@link java.util.Comparator Comparator} interface.
  * <p>
  * You may also consider using 
- * {@link org.apache.commons.collections.ComparatorUtils ComparatorUtils},
+ * {@link org.apache.commons.collections4.ComparatorUtils ComparatorUtils},
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  * 
  * @version $Id$
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java
index 02ec65d76..33079d3fa 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /** 
  * This interface should be implemented by user object to walk
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java
index cf1fa6da4..6bcf286dd 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /**
  * Command representing the deletion of one object of the first sequence.
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java
index eb4654f78..0582fc7ca 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /**
  * Abstract base class for all commands used to transform an objects sequence
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java
index ebb3faa48..6e93cb98d 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java
index 906c59375..317f09deb 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /**
  * Command representing the insertion of one object of the second sequence.
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java
index 03db72e99..bc747c3e6 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /**
  * Command representing the keeping of one object present in both sequences.
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java
index 7bb707137..073ad6de3 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java
index 501f61fc2..a357f59c3 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 import java.util.List;
 
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java
index e03a5c088..2fd6e1937 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 import java.util.List;
 
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java
index be59bca9e..2589a580d 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 /**
  * This class is a simple placeholder to hold the end part of a path
diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java
rename to src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java
index 48d88441c..1afcb54c7 100644
--- a/src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java
@@ -78,4 +78,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
diff --git a/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
index ec63decf2..3d840a43b 100644
--- a/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Abstract base class for quantification predicates, e.g. All, Any, None.
diff --git a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/functors/AllPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
index 8d5c8f18f..6620bee61 100644
--- a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import static org.apache.commons.collections.functors.FunctorUtils.coerce;
-import static org.apache.commons.collections.functors.FunctorUtils.validate;
-import static org.apache.commons.collections.functors.TruePredicate.truePredicate;
+import static org.apache.commons.collections4.functors.FunctorUtils.coerce;
+import static org.apache.commons.collections4.functors.FunctorUtils.validate;
+import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if all the
diff --git a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/AndPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
index 2f7539cd7..702a7eaae 100644
--- a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if both the predicates return true.
diff --git a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
index bd17ca2a2..8520d4733 100644
--- a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if any of the
diff --git a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
index 2363efe83..8b10b3a02 100644
--- a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.FunctorException;
 
 /**
  * {@link Closure} that catches any checked exception and re-throws it as a
diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
index 8d2e7871c..a349e7f4e 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
 
 /**
  * Closure implementation that chains the specified closures together.
diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
index 7a14a7fe3..53b1b6807 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that chains the specified transformers together.
diff --git a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
index 175c018ad..66a071841 100644
--- a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that returns a clone of the input object.
diff --git a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
index f2bf920b0..c435107ee 100644
--- a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that calls a Closure using the input object
diff --git a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
index 231a41ebc..49ddb7301 100644
--- a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate that compares the input object with the one stored in the predicate using a comparator.
@@ -155,7 +155,7 @@ public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
      *     <li><code>comparator.compare(object, input) <= 0 && criterion == LESS_OR_EQUAL</code></li>
      * </ul>
      *
-     * @see org.apache.commons.collections.Predicate#evaluate(java.lang.Object)
+     * @see org.apache.commons.collections4.Predicate#evaluate(java.lang.Object)
      * @see java.util.Comparator#compare(java.lang.Object first, java.lang.Object second)
      * 
      * @param target  the target object to compare to
diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
rename to src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
index b992167af..02851b712 100644
--- a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Factory;
+import org.apache.commons.collections4.Factory;
 
 /**
  * Factory implementation that returns the same constant each time.
diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
index db6f7f99c..d35e650e4 100644
--- a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that returns the same constant each time.
diff --git a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
rename to src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
index c03b3df15..4cbc9bb41 100644
--- a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 /**
  * Default {@link Equator} implementation.
diff --git a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
index 70a703c67..a34297cd1 100644
--- a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is the same object
diff --git a/src/main/java/org/apache/commons/collections/functors/Equator.java b/src/main/java/org/apache/commons/collections4/functors/Equator.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/functors/Equator.java
rename to src/main/java/org/apache/commons/collections4/functors/Equator.java
index 5efb0a07d..4a721b7ed 100644
--- a/src/main/java/org/apache/commons/collections/functors/Equator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/Equator.java
@@ -8,7 +8,7 @@
  * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
  * for the specific language governing permissions and limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 /**
  * <p>
@@ -37,7 +37,7 @@ public interface Equator<T> {
      * Calculates the hash for the object, based on the method of equality used in the equate
      * method. This is used for classes that delegate their {@link Object#equals(Object) equals(Object)} method to an
      * Equator (and so must also delegate their {@link Object#hashCode() hashCode()} method), or for implementations
-     * of {@link org.apache.commons.collections.map.HashedMap} that use an Equator for the key objects.
+     * of {@link org.apache.commons.collections4.map.HashedMap} that use an Equator for the key objects.
      * 
      * @param o the object to calculate the hash for.
      * @return the hash of the object.
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
index abd1c260d..5703dcc33 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.FunctorException;
 
 /**
  * Closure implementation that always throws an exception.
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
rename to src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
index 02509961b..6071158de 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FunctorException;
 
 /**
  * Factory implementation that always throws an exception.
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
index 1bb16bdec..f1b47b909 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that always throws an exception.
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
index 2047610c7..88c185a26 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that always throws an exception.
diff --git a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
index 9a75ed7aa..2f133b3db 100644
--- a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that calls a Factory and returns the result.
diff --git a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
index ada10fc58..cd2f8c9c8 100644
--- a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that always returns false.
diff --git a/src/main/java/org/apache/commons/collections/functors/ForClosure.java b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/ForClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/ForClosure.java
index 2a53d4b7f..dadaa2974 100644
--- a/src/main/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
 
 /**
  * Closure implementation that calls another closure n times, like a for loop.
diff --git a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
rename to src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
index 674411210..cc1fac4e8 100644
--- a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.util.Collection;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Internal utilities for functors.
diff --git a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
index f2b593409..5d7e71ca4 100644
--- a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is the same object
diff --git a/src/main/java/org/apache/commons/collections/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/IfClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/IfClosure.java
index f26702b92..7ae30a20e 100644
--- a/src/main/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Closure implementation acts as an if statement calling one or other closure
diff --git a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
index fae1a4b4e..e1a33ab1b 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is an instanceof
diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
rename to src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
index dfc4e3650..7490ead9f 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FunctorException;
 
 /**
  * Factory implementation that creates a new object instance by reflection.
diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
index b7140e42d..25a8234b4 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that creates a new object instance by reflection.
diff --git a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
index 62a1da52c..1bb459672 100644
--- a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that creates a new object instance by reflection.
diff --git a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/MapTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
index eabce4d5e..770017f54 100644
--- a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that returns the value held in a specified map
diff --git a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/NOPClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
index 3ad398ceb..4a7055842 100644
--- a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
 
 /**
  * Closure implementation that does nothing.
diff --git a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
index 81151d3cd..63ad6cad2 100644
--- a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that does nothing.
diff --git a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/NonePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
index 7f3a615ba..3e820db28 100644
--- a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if none of the
diff --git a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
index c766417ab..f7a1d5214 100644
--- a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is not null.
diff --git a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/NotPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
index fd634326f..a61c084f5 100644
--- a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns the opposite of the decorated predicate.
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
index 78028f29b..6618b64d6 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that throws an exception if the input is null.
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
index 3bd5ff604..39b07a75b 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns false if the input is null.
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
index b1d7c1137..e8de95659 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is null.
diff --git a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/NullPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
index a25fc2c4d..3609a0faf 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if the input is null.
diff --git a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/OnePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
index c03a8ab28..3306db09d 100644
--- a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if only one of the
diff --git a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/OrPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
index 4018270db..7a880b96c 100644
--- a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true if either of the predicates return true.
diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
rename to src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
index 446aa2cf5..8f6d06772 100644
--- a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Defines a predicate that decorates one or more other predicates.
diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
index 61ce3589c..0257c468c 100644
--- a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that calls a Predicate using the input object
diff --git a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
rename to src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
index 079d00086..6e66944dd 100644
--- a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,8 +25,8 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FunctorException;
 
 /**
  * Factory implementation that creates a new instance each time based on a prototype.
diff --git a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
index 53b91b4bc..f9462efec 100644
--- a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation that returns the result of calling
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
index 36abf8d95..c6a52646e 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Closure implementation calls the closure whose predicate returns true,
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
rename to src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
index 64502d50c..dfff0bcd4 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Transformer implementation calls the transformer whose predicate returns true,
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
index a7f3a3c48..652c084fe 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Predicate implementation that transforms the given object before invoking
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
index 811ecf3ce..b47b45416 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Closure implementation that calls a Transformer using the input object
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
index 9cd09def9..ce6418806 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Predicate implementation that returns the result of a transformer.
diff --git a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/TruePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
index b91fdc82b..466dcd03b 100644
--- a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that always returns true.
diff --git a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
rename to src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
index 591223025..d75141346 100644
--- a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Predicate implementation that returns true the first time an object is
diff --git a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/functors/WhileClosure.java
rename to src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
index ada484034..939b025f1 100644
--- a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Closure implementation that executes a closure repeatedly until a condition is met,
diff --git a/src/main/java/org/apache/commons/collections/functors/package-info.java b/src/main/java/org/apache/commons/collections4/functors/package-info.java
similarity index 74%
rename from src/main/java/org/apache/commons/collections/functors/package-info.java
rename to src/main/java/org/apache/commons/collections4/functors/package-info.java
index fd2dd64a6..321edd43f 100644
--- a/src/main/java/org/apache/commons/collections/functors/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/functors/package-info.java
@@ -16,12 +16,12 @@
  */
 /**
  * This package contains implementations of the
- * {@link org.apache.commons.collections.Closure Closure},
- * {@link org.apache.commons.collections.Predicate Predicate},
- * {@link org.apache.commons.collections.Transformer Transformer} and
- * {@link org.apache.commons.collections.Factory Factory} interfaces.
+ * {@link org.apache.commons.collections4.Closure Closure},
+ * {@link org.apache.commons.collections4.Predicate Predicate},
+ * {@link org.apache.commons.collections4.Transformer Transformer} and
+ * {@link org.apache.commons.collections4.Factory Factory} interfaces.
  * These provide simple callbacks for processing with collections.
  * 
  * @version $Id$
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
index 99992b697..017464d12 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.NoSuchElementException;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
index af333fd54..5672cff12 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 /** 
  * Provides an implementation of an empty map iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
index 3ee502790..ddfc4fbfa 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
index fc10f15ad..bdb120e44 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
index e9d604edd..d65c7772f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.MapIterator;
+import org.apache.commons.collections4.MapIterator;
 
 /**
  * Provides basic behaviour for decorating a map iterator with extra functionality.
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
index 69bc46741..f215036f6 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
 
 /**
  * Provides basic behaviour for decorating an ordered map iterator with extra functionality.
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
rename to src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
index 182a2f46d..29762e17b 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
index 9e6f699ac..dbf882536 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.lang.reflect.Array;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * Implements an {@link java.util.Iterator Iterator} over any array.
  * <p>
  * The array can be either an array of object or of primitives. If you know 
  * that you have an object array, the 
- * {@link org.apache.commons.collections.iterators.ObjectArrayIterator ObjectArrayIterator}
+ * {@link org.apache.commons.collections4.iterators.ObjectArrayIterator ObjectArrayIterator}
  * class is a better choice, as it will perform better.
  * <p>
  * The iterator implements a {@link #reset} method, allowing the reset of 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index 2c37bf152..35201ba6c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.lang.reflect.Array;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * Implements a {@link ListIterator} over an array. 
@@ -33,7 +33,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * This iterator does not support {@link #add(Object)} or {@link #remove()}, as the array 
  * cannot be changed in size. The {@link #set(Object)} method is supported however.
  *
- * @see org.apache.commons.collections.iterators.ArrayIterator
+ * @see org.apache.commons.collections4.iterators.ArrayIterator
  * @see java.util.Iterator
  * @see java.util.ListIterator
  *
diff --git a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
index a495617f8..bf372ad97 100644
--- a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -24,7 +24,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 
 /**
@@ -216,7 +216,7 @@ public class CollatingIterator<E> implements Iterator<E> {
      * would like to use the natural sort order (or, in other words,
      * if the elements in the iterators are implementing the
      * {@link java.lang.Comparable} interface), then use the
-     * {@link org.apache.commons.collections.comparators.ComparableComparator}.
+     * {@link org.apache.commons.collections4.comparators.ComparableComparator}.
      * 
      * @param comp the {@link Comparator} to set
      * @throws IllegalStateException if iteration has started
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
index e163219eb..e4ce7e290 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * Provides an implementation of an empty iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
index a1841aa3c..18d71040a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * Provides an implementation of an empty list iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
index de32971ff..68f93bc32 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * Provides an implementation of an empty map iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
index ffeff4306..efd52dd66 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.OrderedIterator;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * Provides an implementation of an empty ordered iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
index 758c4c5fb..8e4532d9c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * Provides an implementation of an empty ordered map iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
index 8cdd57d2c..b7f8c4999 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /**
  * Implements a <code>MapIterator</code> using a Map entrySet.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
index 3d9274bf9..800f42583 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Collection;
 import java.util.Enumeration;
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
index 5b96dc53c..146b08a0e 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /** 
  * Decorates another {@link Iterator} using a predicate to filter elements.
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
index de7552b66..685cb08f6 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /** 
  * Decorates another {@link ListIterator} using a predicate to filter elements.
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
rename to src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
index 648f04160..d65a79b65 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * An IteratorChain is an Iterator that wraps a number of Iterators.
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
rename to src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
index 52a55108c..ed0c7822e 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Enumeration;
 import java.util.Iterator;
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
rename to src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
index b0844348d..3fafa8f1c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
@@ -11,11 +11,11 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /**
  * Adapter to make an {@link Iterator Iterator} instance appear to be an
diff --git a/src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java
rename to src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
index 2c8b92111..0b5449660 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
rename to src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
index 0c1a869f8..ba5295d58 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -23,13 +23,13 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * Converts an {@link Iterator} into a {@link ResettableListIterator}.
  * For plain <code>Iterator</code>s this is accomplished by caching the returned
  * elements.  This class can also be used to simply add 
- * {@link org.apache.commons.collections.ResettableIterator ResettableIterator}
+ * {@link org.apache.commons.collections4.ResettableIterator ResettableIterator}
  * functionality to a given {@link ListIterator}.
  * <p>
  * The <code>ListIterator</code> interface has additional useful methods
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
index 870a74be7..eb722a34d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /**
  * An Iterator that restarts when it reaches the end.
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
index 4b33405d0..b67201ce3 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * A ListIterator that restarts when it reaches the end or when it
diff --git a/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
index 5200951f0..b33377c7a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
index a5237f30f..02ecb3c89 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * An {@link Iterator} over an array of objects.
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index a973c61fc..873631712 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * Implements a {@link ListIterator} over an array of objects.
@@ -30,7 +30,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * The iterator implements a {@link #reset} method, allowing the reset of the iterator
  * back to the start if required.
  *
- * @see org.apache.commons.collections.iterators.ObjectArrayIterator
+ * @see org.apache.commons.collections4.iterators.ObjectArrayIterator
  * @see java.util.Iterator
  * @see java.util.ListIterator
  *
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
index 95b737eb6..6da45fa96 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.ArrayStack;
+import org.apache.commons.collections4.ArrayStack;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * An Iterator that can traverse multiple iterators down an object graph.
diff --git a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
index 754b3e873..cf7b0d4d5 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * Iterates backwards through a List, starting with the last element
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
index f4b4835e9..c6fc1518d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /** 
  * <code>SingletonIterator</code> is an {@link Iterator} over a single 
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
index 979ef0631..9ba29878d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
 
 /**
  * <code>SingletonIterator</code> is an {@link ListIterator} over a single 
diff --git a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
index d09cf9f8f..688b9681c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /** 
  * Decorates an iterator such that each element returned is transformed.
diff --git a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
index 9e73625a4..e357da2a4 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
-import org.apache.commons.collections.functors.UniquePredicate;
+import org.apache.commons.collections4.functors.UniquePredicate;
 
 /**
  * A FilterIterator which only returns "unique" Objects.  Internally,
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
index 7cb28ed63..2261eaf4f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
 
 /** 
  * Decorates an iterator such that it cannot be modified.
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
index f57e94aa3..19ad6db1f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
 
 /** 
  * Decorates a list iterator such that it cannot be modified.
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
index bcd321b0d..9ddde36cd 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Unmodifiable;
 
 /** 
  * Decorates a map iterator such that it cannot be modified.
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
index 745da0f05..7e6679e82 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.Unmodifiable;
 
 /**
  * Decorates an ordered map iterator such that it cannot be modified.
diff --git a/src/main/java/org/apache/commons/collections/iterators/package-info.java b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
similarity index 89%
rename from src/main/java/org/apache/commons/collections/iterators/package-info.java
rename to src/main/java/org/apache/commons/collections4/iterators/package-info.java
index 1f3561005..01584fc45 100644
--- a/src/main/java/org/apache/commons/collections/iterators/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
@@ -19,10 +19,10 @@
  * {@link java.util.Iterator Iterator} interface.
  * <p>
  * You may also consider using 
- * {@link org.apache.commons.collections.IteratorUtils IteratorUtils},
+ * {@link org.apache.commons.collections4.IteratorUtils IteratorUtils},
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
  * @version $Id$
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
index d6aeb8312..a852eb707 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * Abstract pair class to assist with creating <code>KeyValue</code>
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
index 80725a5a3..518f76aa8 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
index 7aa21efd4..57013e1bf 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * Provides a base decorator that allows additional functionality to be
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
index b4197043c..545720fb2 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * A mutable <code>KeyValue</code> pair that does not implement
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
index aa9807521..d120405b6 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * A restricted implementation of {@link java.util.Map.Entry Map.Entry} that prevents
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 5fff95ed9..37bd86c5a 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
index 80e371dfb..a1290ab31 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * A {@link java.util.Map.Entry Map.Entry} tied to a map underneath.
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
index 385693d76..bb7901c54 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.Unmodifiable;
 
 /**
  * A {@link java.util.Map.Entry Map.Entry} that throws
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/package-info.java b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/keyvalue/package-info.java
rename to src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
index 7b877b6cc..2e20d639b 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
@@ -27,4 +27,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
rename to src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 34dc3e5b8..b99f7e6ea 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.OrderedIterator;
+import org.apache.commons.collections4.OrderedIterator;
 
 /**
  * An abstract implementation of a linked list which provides numerous points for
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
rename to src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
index 27cbfabac..5a3b70faa 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
 
 /**
  * Decorates another {@link List} to provide additional behaviour.
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
rename to src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
index 54f40c737..2b4cd8d3b 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java
rename to src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index fa7c89c83..c5c06f8f7 100644
--- a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/list/FixedSizeList.java
rename to src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
index b2e9cef87..144f324e8 100644
--- a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.BoundedCollection;
-import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.BoundedCollection;
+import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another <code>List</code> to fix the size preventing add/remove.
diff --git a/src/main/java/org/apache/commons/collections/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/list/GrowthList.java
rename to src/main/java/org/apache/commons/collections4/list/GrowthList.java
index ab8567bc2..a1b438c4d 100644
--- a/src/main/java/org/apache/commons/collections/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/list/LazyList.java
rename to src/main/java/org/apache/commons/collections4/list/LazyList.java
index d9ad4bd80..0ce31e548 100644
--- a/src/main/java/org/apache/commons/collections/list/LazyList.java
+++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.List;
 
-import org.apache.commons.collections.Factory;
+import org.apache.commons.collections4.Factory;
 
 /**
  * Decorates another <code>List</code> to create objects in the list on demand.
diff --git a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
rename to src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
index fd8f8729e..83d40e777 100644
--- a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/list/PredicatedList.java
rename to src/main/java/org/apache/commons/collections4/list/PredicatedList.java
index 16ce35180..31062b040 100644
--- a/src/main/java/org/apache/commons/collections/list/PredicatedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.collection.PredicatedCollection;
-import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/list/SetUniqueList.java
rename to src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index 4443a3f8c..f151a341f 100644
--- a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
 
 /**
  * Decorates a <code>List</code> to ensure that no duplicates are present much
diff --git a/src/main/java/org/apache/commons/collections/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/list/TransformedList.java
rename to src/main/java/org/apache/commons/collections4/list/TransformedList.java
index 2b3c752f1..927c4c915 100644
--- a/src/main/java/org/apache/commons/collections/list/TransformedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollection;
+import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
 
 /**
  * Decorates another <code>List</code> to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/list/TreeList.java
rename to src/main/java/org/apache/commons/collections4/list/TreeList.java
index 9e0f89143..e47fd6294 100644
--- a/src/main/java/org/apache/commons/collections/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.AbstractList;
 import java.util.Collection;
@@ -23,7 +23,7 @@ import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.OrderedIterator;
+import org.apache.commons.collections4.OrderedIterator;
 
 /**
  * A <code>List</code> implementation that is optimised for fast insertions and
diff --git a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/list/UnmodifiableList.java
rename to src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
index 92f1f225b..b7e0de17b 100644
--- a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java
+++ b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
-import org.apache.commons.collections.iterators.UnmodifiableListIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
 
 /**
  * Decorates another <code>List</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/list/package-info.java b/src/main/java/org/apache/commons/collections4/list/package-info.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/list/package-info.java
rename to src/main/java/org/apache/commons/collections4/list/package-info.java
index 092822316..7ac1cae0d 100644
--- a/src/main/java/org/apache/commons/collections/list/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/list/package-info.java
@@ -37,4 +37,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
index 2f8e7cd40..3824c223c 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -29,11 +29,11 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.EmptyMapIterator;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.EmptyMapIterator;
 
 /**
  * An abstract implementation of a hash-based map which provides numerous points for
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
index 448aed4d4..8e7dbbf81 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.lang.reflect.Array;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
-import org.apache.commons.collections.set.AbstractSetDecorator;
+import org.apache.commons.collections4.set.AbstractSetDecorator;
+import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
 
 /**
  * An abstract base class that simplifies the task of creating map decorators.
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
similarity index 88%
rename from src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
index 679bfdaf9..104b4ba0d 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
 
 /**
  * Provide a basic {@link IterableMap} implementation.
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
index 35fdecb76..775bd7dd4 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.OrderedIterator;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
 
 /**
  * An abstract implementation of a hash-based map that links entries to create an
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
index 509ff4d8f..f58b4ea00 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
index 9bf78daca..0667680d7 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
 
 /** 
  * Provides a base decorator that enables additional functionality to be added
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index 0cd69faa0..bbd67c03e 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -32,8 +32,8 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.keyvalue.DefaultMapEntry;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
 
 /**
  * An abstract implementation of a hash-based map that allows the entries to
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
index 24ec5bff9..cd6b82989 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Comparator;
 import java.util.Iterator;
@@ -23,9 +23,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.IterableSortedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.iterators.ListIteratorWrapper;
+import org.apache.commons.collections4.IterableSortedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
 
 /** 
  * Provides a base decorator that enables additional functionality to be added
diff --git a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
rename to src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
index 67a6e82f3..c107ddb81 100644
--- a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/CompositeMap.java
rename to src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index feadf9bbb..cbb39ed48 100644
--- a/src/main/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.Serializable;
 
@@ -22,9 +22,9 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.collection.CompositeCollection;
-import org.apache.commons.collections.set.CompositeSet;
+import org.apache.commons.collections4.set.CompositeSet;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.collection.CompositeCollection;
 
 /**
  * Decorates a map of other maps to provide a single unified view.
diff --git a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/map/DefaultedMap.java
rename to src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index 3e0f40a9e..7951d74e2 100644
--- a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,10 +23,10 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.functors.ConstantTransformer;
-import org.apache.commons.collections.functors.FactoryTransformer;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.ConstantTransformer;
+import org.apache.commons.collections4.functors.FactoryTransformer;
 
 /**
  * Decorates another <code>Map</code> returning a default value if the map
diff --git a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java
rename to src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
index ba7203c1d..e0b917dee 100644
--- a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java
+++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.ResettableIterator;
 
 /**
  * Adapts a Map entrySet to the MapIterator interface.
diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/map/FixedSizeMap.java
rename to src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
index c8b3c9c2a..8289e8f63 100644
--- a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,9 +24,9 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.BoundedMap;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.BoundedMap;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
 
 /**
  * Decorates another <code>Map</code> to fix the size, preventing add/remove.
diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
rename to src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
index f3de1eaee..31b329823 100644
--- a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -25,10 +25,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.BoundedMap;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.BoundedMap;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
 
 /**
  * Decorates another <code>SortedMap</code> to fix the size blocking add/remove.
diff --git a/src/main/java/org/apache/commons/collections/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/Flat3Map.java
rename to src/main/java/org/apache/commons/collections4/map/Flat3Map.java
index b137ccf79..3578d36ae 100644
--- a/src/main/java/org/apache/commons/collections/map/Flat3Map.java
+++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,11 +28,11 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.EmptyMapIterator;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.EmptyMapIterator;
 
 /**
  * A <code>Map</code> implementation that stores data in simple fields until
diff --git a/src/main/java/org/apache/commons/collections/map/HashedMap.java b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/map/HashedMap.java
rename to src/main/java/org/apache/commons/collections4/map/HashedMap.java
index 485f4f85e..5eab2893c 100644
--- a/src/main/java/org/apache/commons/collections/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,7 +27,7 @@ import java.util.Map;
  * to <code>HashMap</code>.
  * <p>
  * This implementation improves on the JDK1.4 HashMap by adding the
- * {@link org.apache.commons.collections.MapIterator MapIterator}
+ * {@link org.apache.commons.collections4.MapIterator MapIterator}
  * functionality and many methods for subclassing.
  * <p>
  * <strong>Note that HashedMap is not synchronized and is not thread-safe.</strong>
diff --git a/src/main/java/org/apache/commons/collections/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/LRUMap.java
rename to src/main/java/org/apache/commons/collections4/map/LRUMap.java
index 109b25c15..4c2c6e68d 100644
--- a/src/main/java/org/apache/commons/collections/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,7 +22,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.BoundedMap;
+import org.apache.commons.collections4.BoundedMap;
 
 /**
  * A <code>Map</code> implementation with a fixed maximum size which removes
@@ -38,7 +38,7 @@ import org.apache.commons.collections.BoundedMap;
  * of modifying the map's iteration order and thus invalidating any
  * iterators currently in use.  It is therefore suggested that iterations
  * over an {@link LRUMap} instance access entry values only through a
- * {@link org.apache.commons.collections.MapIterator MapIterator} or {@link #entrySet()} iterator.
+ * {@link org.apache.commons.collections4.MapIterator MapIterator} or {@link #entrySet()} iterator.
  * <p>
  * The map implements <code>OrderedMap</code> and entries may be queried using
  * the bidirectional <code>OrderedMapIterator</code>. The order returned is
diff --git a/src/main/java/org/apache/commons/collections/map/LazyMap.java b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/map/LazyMap.java
rename to src/main/java/org/apache/commons/collections4/map/LazyMap.java
index 5ef621bf6..ea9070431 100644
--- a/src/main/java/org/apache/commons/collections/map/LazyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,9 +22,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.functors.FactoryTransformer;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.FactoryTransformer;
 
 /**
  * Decorates another <code>Map</code> to create objects in the map on demand.
diff --git a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/map/LazySortedMap.java
rename to src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
index 05ed96fe9..7b874bdfd 100644
--- a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Comparator;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another <code>SortedMap</code> to create objects in the map on demand.
diff --git a/src/main/java/org/apache/commons/collections/map/LinkedMap.java b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/map/LinkedMap.java
rename to src/main/java/org/apache/commons/collections4/map/LinkedMap.java
index e69359182..eb5b44f3a 100644
--- a/src/main/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,16 +27,16 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
-import org.apache.commons.collections.iterators.UnmodifiableListIterator;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * A <code>Map</code> implementation that maintains the order of the entries.
  * In this implementation order is maintained by original insertion.
  * <p>
  * This implementation improves on the JDK1.4 LinkedHashMap by adding the 
- * {@link org.apache.commons.collections.MapIterator MapIterator}
+ * {@link org.apache.commons.collections4.MapIterator MapIterator}
  * functionality, additional convenience methods and allowing
  * bidirectional iteration. It also implements <code>OrderedMap</code>.
  * In addition, non-interface methods are provided to access the map by index.
diff --git a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/ListOrderedMap.java
rename to src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
index 337175c85..e3e48731b 100644
--- a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -32,12 +32,12 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.iterators.AbstractUntypedIteratorDecorator;
-import org.apache.commons.collections.keyvalue.AbstractMapEntry;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.AbstractUntypedIteratorDecorator;
+import org.apache.commons.collections4.keyvalue.AbstractMapEntry;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Decorates a <code>Map</code> to ensure that the order of addition is retained
diff --git a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/MultiKeyMap.java
rename to src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
index 8f558233d..48f7f9e77 100644
--- a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,9 +22,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.keyvalue.MultiKey;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.keyvalue.MultiKey;
 
 /**
  * A <code>Map</code> implementation that uses multiple keys to map the value.
diff --git a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/map/MultiValueMap.java
rename to src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
index 132fa3c37..ac0bdfe92 100644
--- a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -29,12 +29,12 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FunctorException;
-import org.apache.commons.collections.MultiMap;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.IteratorChain;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.MultiMap;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
 
 /**
  * A MultiValueMap decorates another map, allowing it to have
diff --git a/src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java
rename to src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index 56d5f4fb0..706c083bf 100644
--- a/src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -65,7 +65,7 @@ public class PassiveExpiringMap<K, V>
     implements Serializable {
 
     /**
-     * A {@link org.apache.commons.collections.map.PassiveExpiringMap.ExpirationPolicy ExpirationPolicy}
+     * A {@link org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy ExpirationPolicy}
      * that returns a expiration time that is a
      * constant about of time in the future from the current time.
      * 
diff --git a/src/main/java/org/apache/commons/collections/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/PredicatedMap.java
rename to src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
index 5129f317f..d717ace4e 100644
--- a/src/main/java/org/apache/commons/collections/map/PredicatedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another <code>Map</code> to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java
rename to src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
index 0fd44e7e6..e847bde4c 100644
--- a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Comparator;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another <code>SortedMap </code> to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
rename to src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
index d1582f652..d8978f597 100644
--- a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -40,7 +40,7 @@ import java.lang.ref.Reference;
  * memory-sensitive cache.
  * <p>
  * This map is similar to
- * {@link org.apache.commons.collections.map.ReferenceMap ReferenceMap}.
+ * {@link org.apache.commons.collections4.map.ReferenceMap ReferenceMap}.
  * It differs in that keys and values in this class are compared using <code>==</code>.
  * <p>
  * This map will violate the detail of various Map and map view contracts.
diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/ReferenceMap.java
rename to src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
index c23007ff8..f229c570b 100644
--- a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -41,7 +41,7 @@ import java.io.Serializable;
  * hard keys and soft values, providing a memory-sensitive cache.
  * <p>
  * This map is similar to
- * {@link org.apache.commons.collections.map.ReferenceIdentityMap ReferenceIdentityMap}.
+ * {@link org.apache.commons.collections4.map.ReferenceIdentityMap ReferenceIdentityMap}.
  * It differs in that keys and values in this class are compared using <code>equals()</code>.
  * <p>
  * This {@link java.util.Map Map} implementation does <i>not</i> allow null elements.
diff --git a/src/main/java/org/apache/commons/collections/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/map/SingletonMap.java
rename to src/main/java/org/apache/commons/collections4/map/SingletonMap.java
index a1ee216aa..554aee4d7 100644
--- a/src/main/java/org/apache/commons/collections/map/SingletonMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.Serializable;
 import java.util.AbstractSet;
@@ -25,13 +25,13 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.BoundedMap;
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.iterators.SingletonIterator;
-import org.apache.commons.collections.keyvalue.TiedMapEntry;
+import org.apache.commons.collections4.BoundedMap;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
+import org.apache.commons.collections4.keyvalue.TiedMapEntry;
 
 /**
  * A <code>Map</code> implementation that holds a single item and is fixed size.
diff --git a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/map/StaticBucketMap.java
rename to src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index f47d986b0..f2d989935 100644
--- a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.AbstractCollection;
 import java.util.AbstractSet;
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
 
 /**
  * A StaticBucketMap is an efficient, thread-safe implementation of
diff --git a/src/main/java/org/apache/commons/collections/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/TransformedMap.java
rename to src/main/java/org/apache/commons/collections4/map/TransformedMap.java
index 23df66175..8d3725e22 100644
--- a/src/main/java/org/apache/commons/collections/map/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,7 +22,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another <code>Map</code> to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java
rename to src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
index 07ec45bb7..d42eecd29 100644
--- a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Comparator;
 import java.util.Map;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another <code>SortedMap </code> to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
index fb242c8a2..9355f4077 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -22,10 +22,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
-import org.apache.commons.collections.set.AbstractSetDecorator;
+import org.apache.commons.collections4.set.AbstractSetDecorator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
 
 /**
  * Decorates a map entry <code>Set</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java
rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
index 07f432fc6..e29d2bb4e 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,13 +24,13 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.EntrySetMapIterator;
-import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.EntrySetMapIterator;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
 
 /**
  * Decorates another <code>Map</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
similarity index 91%
rename from src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
index 43fa0ac37..ea7a6c889 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,12 +24,12 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
 
 /**
  * Decorates another <code>OrderedMap</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
index 6889e3274..af6b14668 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -26,9 +26,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.set.UnmodifiableSet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
 
 /**
  * Decorates another <code>SortedMap</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/map/package-info.java b/src/main/java/org/apache/commons/collections4/map/package-info.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/map/package-info.java
rename to src/main/java/org/apache/commons/collections4/map/package-info.java
index 30f4cc8dc..7407697ab 100644
--- a/src/main/java/org/apache/commons/collections/map/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/map/package-info.java
@@ -16,8 +16,8 @@
  */
 /**
  * This package contains implementations of the {@link java.util.Map Map},
- * {@link org.apache.commons.collections.IterableMap IterableMap},
- * {@link org.apache.commons.collections.OrderedMap OrderedMap} and
+ * {@link org.apache.commons.collections4.IterableMap IterableMap},
+ * {@link org.apache.commons.collections4.OrderedMap OrderedMap} and
  * {@link java.util.SortedMap SortedMap} interfaces.
  * A Map provides a lookup from a key to a value.
  * A number of implementations also support the new MapIterator interface that enables
@@ -51,5 +51,5 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
diff --git a/src/main/java/org/apache/commons/collections/overview.html b/src/main/java/org/apache/commons/collections4/overview.html
similarity index 100%
rename from src/main/java/org/apache/commons/collections/overview.html
rename to src/main/java/org/apache/commons/collections4/overview.html
diff --git a/src/main/java/org/apache/commons/collections/package-info.java b/src/main/java/org/apache/commons/collections4/package-info.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/package-info.java
rename to src/main/java/org/apache/commons/collections4/package-info.java
index 0718841fe..d7229f522 100644
--- a/src/main/java/org/apache/commons/collections/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/package-info.java
@@ -24,4 +24,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
diff --git a/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java
rename to src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
index 244406a46..065595e49 100644
--- a/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Queue;
 
-import org.apache.commons.collections.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
 
 /**
  * Decorates another {@link Queue} to provide additional behaviour.
diff --git a/src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java
rename to src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
index 6d22ac230..d80bb67d1 100644
--- a/src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Queue;
 
-import org.apache.commons.collections.BoundedCollection;
+import org.apache.commons.collections4.BoundedCollection;
 
 /**
  * CircularFifoQueue is a first-in first-out queue with a fixed size that
diff --git a/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java
rename to src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
index df888af05..b4913c29a 100644
--- a/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Queue;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.collection.PredicatedCollection;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollection;
 
 /**
  * Decorates another {@link Queue} to validate that additions
diff --git a/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/queue/TransformedQueue.java
rename to src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
index 2aab02536..ec934ffe8 100644
--- a/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Queue;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollection;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollection;
 
 /**
  * Decorates another {@link Queue} to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java
rename to src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
index 2f9471df6..253787665 100644
--- a/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,8 +24,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Queue;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another {@link Queue} to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/queue/package-info.java b/src/main/java/org/apache/commons/collections4/queue/package-info.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/queue/package-info.java
rename to src/main/java/org/apache/commons/collections4/queue/package-info.java
index dd885add4..a351299e3 100644
--- a/src/main/java/org/apache/commons/collections/queue/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/queue/package-info.java
@@ -31,4 +31,4 @@
  * 
  * @version $Id$
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
rename to src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
index b286da8e2..b002381cd 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
similarity index 93%
rename from src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java
rename to src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
index 55d56ae3f..b12e627da 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
 
 /**
  * Decorates another <code>Set</code> to provide additional behaviour.
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
rename to src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
index e549331b5..7ef623374 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.Set;
diff --git a/src/main/java/org/apache/commons/collections/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/set/CompositeSet.java
rename to src/main/java/org/apache/commons/collections4/set/CompositeSet.java
index 2444d62f6..499ca0440 100644
--- a/src/main/java/org/apache/commons/collections/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
@@ -26,10 +26,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Decorates a set of other sets to provide a single unified view.
@@ -39,7 +39,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * If no strategy is provided then add is unsupported.
  * <p>
  * From version 4.0, this class does not extend
- * {@link org.apache.commons.collections.collection.CompositeCollection CompositeCollection}
+ * {@link org.apache.commons.collections4.collection.CompositeCollection CompositeCollection}
  * anymore due to its input restrictions (only accepts Sets).
  * See <a href="https://issues.apache.org/jira/browse/COLLECTIONS-424">COLLECTIONS-424</a>
  * for more details.
diff --git a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/set/ListOrderedSet.java
rename to src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
index 72109c7ec..0d00c4fde 100644
--- a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
-import org.apache.commons.collections.OrderedIterator;
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
+import org.apache.commons.collections4.list.UnmodifiableList;
 
 /**
  * Decorates another <code>Set</code> to ensure that the order of addition is
diff --git a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/set/MapBackedSet.java
rename to src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
index 7a22e5868..a7ff712c1 100644
--- a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/set/PredicatedSet.java
rename to src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
index a64b4d53d..e175b7002 100644
--- a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.collection.PredicatedCollection;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollection;
 
 /**
  * Decorates another <code>Set</code> to validate that all additions
diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java
rename to src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
index 13be8b2d8..53f8eed27 100644
--- a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.SortedSet;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 /**
  * Decorates another <code>SortedSet</code> to validate that all additions
diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
similarity index 95%
rename from src/main/java/org/apache/commons/collections/set/TransformedSet.java
rename to src/main/java/org/apache/commons/collections4/set/TransformedSet.java
index 92099cc53..1f8330d94 100644
--- a/src/main/java/org/apache/commons/collections/set/TransformedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollection;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollection;
 
 /**
  * Decorates another <code>Set</code> to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java
rename to src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
index 62f2ed94b..380200b81 100644
--- a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Comparator;
 import java.util.SortedSet;
 
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Transformer;
 
 /**
  * Decorates another <code>SortedSet</code> to transform objects that are added.
diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java
rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
index e9a537d83..603740dc0 100644
--- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another <code>Set</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
similarity index 96%
rename from src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
index a399a2cb5..67573cb89 100644
--- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -24,8 +24,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.SortedSet;
 
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Decorates another <code>SortedSet</code> to ensure it can't be altered.
diff --git a/src/main/java/org/apache/commons/collections/set/package-info.java b/src/main/java/org/apache/commons/collections4/set/package-info.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/set/package-info.java
rename to src/main/java/org/apache/commons/collections4/set/package-info.java
index 56d7698b6..0eb0975a6 100644
--- a/src/main/java/org/apache/commons/collections/set/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/set/package-info.java
@@ -37,4 +37,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
diff --git a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
similarity index 90%
rename from src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
rename to src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
index ba12e6ef8..c9f4f52a0 100644
--- a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.splitmap;
+package org.apache.commons.collections4.splitmap;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.IterableGet;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
+import org.apache.commons.collections4.IterableGet;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
 
 /**
  * {@link IterableGet} that uses a {@link Map}<K, V> for the
- * {@link org.apache.commons.collections.Get Get}<K, V> implementation.
+ * {@link org.apache.commons.collections4.Get Get}<K, V> implementation.
  *
  * @since 4.0
  * @version $Id$
diff --git a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java
similarity index 94%
rename from src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
rename to src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java
index 4b87aeb34..7c7f3f99f 100644
--- a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.splitmap;
+package org.apache.commons.collections4.splitmap;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,9 +22,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.collections.Put;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.map.LinkedMap;
+import org.apache.commons.collections4.Put;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.map.LinkedMap;
 
 /**
  * Decorates another {@link Map} to transform objects that are added.
@@ -42,7 +42,7 @@ import org.apache.commons.collections.map.LinkedMap;
  * synchronization.
  * <p>
  * The "put" and "get" type constraints of this class are mutually independent;
- * contrast with {@link org.apache.commons.collections.map.TransformedMap} which,
+ * contrast with {@link org.apache.commons.collections4.map.TransformedMap} which,
  * by virtue of its implementing {@link Map}&lt;K, V&gt;, must be constructed in such
  * a way that its read and write parameters are generalized to a common (super-)type.
  * In practice this would often mean <code>&gt;Object, Object&gt;</code>, defeating
@@ -50,13 +50,13 @@ import org.apache.commons.collections.map.LinkedMap;
  * <p>
  * On the downside, this class is not drop-in compatible with {@link java.util.Map}
  * but is intended to be worked with either directly or by {@link Put} and
- * {@link org.apache.commons.collections.Get Get} generalizations.
+ * {@link org.apache.commons.collections4.Get Get} generalizations.
  *
  * @since 4.0
  * @version $Id$
  *
- * @see org.apache.commons.collections.SplitMapUtils#readableMap(Get)
- * @see org.apache.commons.collections.SplitMapUtils#writableMap(Put)
+ * @see org.apache.commons.collections4.SplitMapUtils#readableMap(Get)
+ * @see org.apache.commons.collections4.SplitMapUtils#writableMap(Put)
  */
 public class TransformedMap<J, K, U, V> extends AbstractIterableGetMapDecorator<K, V>
         implements Put<J, U>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/splitmap/package-info.java b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
similarity index 83%
rename from src/main/java/org/apache/commons/collections/splitmap/package-info.java
rename to src/main/java/org/apache/commons/collections4/splitmap/package-info.java
index 1f4e85a9e..b4de18080 100644
--- a/src/main/java/org/apache/commons/collections/splitmap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
@@ -16,8 +16,8 @@
  */
 /**
  * The "split map" concept is that of an object that implements
- * the {@link org.apache.commons.collections.Put Put} and
- * {@link org.apache.commons.collections.Get Get} interfaces,
+ * the {@link org.apache.commons.collections4.Put Put} and
+ * {@link org.apache.commons.collections4.Get Get} interfaces,
  * with <i>differing</i> generic types. This is like a pre-generics
  * {@link java.util.Map Map} whose input key/value constraints are
  * different than its output key/value constraints.  While it would
@@ -25,8 +25,8 @@
  * key/value constraints, this would be a {@link java.util.Map Map}
  * and would therefore make little sense (any Commons Collections
  * {@link java.util.Map Map} implementation will also implement
- * {@link org.apache.commons.collections.Put Put} and
- * {@link org.apache.commons.collections.Get Get} with matching
+ * {@link org.apache.commons.collections4.Put Put} and
+ * {@link org.apache.commons.collections4.Get Get} with matching
  * generic parameters).
  * <p>
  * The following decorators are provided:
@@ -36,4 +36,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.splitmap;
+package org.apache.commons.collections4.splitmap;
diff --git a/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java
index 37f369204..9d02fc974 100644
--- a/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * TODO: add javadoc
diff --git a/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
rename to src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java
index 451bc9b21..2e508e619 100644
--- a/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.apache.commons.collections.Trie;
+import org.apache.commons.collections4.Trie;
 
 /**
  * This class provides some basic {@link Trie} functionality and 
diff --git a/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java
index f9227fa7c..0dce8aa1b 100644
--- a/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for byte[]s.
diff --git a/src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java
index 5f4f0efff..1541fdca2 100644
--- a/src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for {@link Byte}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java
index 712937b5c..23c4d8d01 100644
--- a/src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * An {@link KeyAnalyzer} for {@code char[]}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java
index f666e99af..10e2a3b52 100644
--- a/src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for {@link Character}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java
index ad0db207b..6fb29ba40 100644
--- a/src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for {@link Integer}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
index 8d16a16c3..5c3a7cbbd 100644
--- a/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
 /** 
- * Defines the interface to analyze {@link org.apache.commons.collections.Trie Trie} keys on a bit level. 
+ * Defines the interface to analyze {@link org.apache.commons.collections4.Trie Trie} keys on a bit level. 
  * {@link KeyAnalyzer}'s methods return the length of the key in bits, 
  * whether or not a bit is set, and bits per element in the key. 
  * <p>
diff --git a/src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java
index 03b26a32e..b79569a6b 100644
--- a/src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for {@link Long}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java
rename to src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
index bfd230f96..9bcf72fd4 100644
--- a/src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Trie;
+import org.apache.commons.collections4.Trie;
 
 /**
  * <h3>PATRICIA {@link Trie}</h3>
diff --git a/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java
rename to src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java
index 491f0e639..3e7341179 100644
--- a/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java
+++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.util.AbstractCollection;
 import java.util.AbstractSet;
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.Trie.Cursor.Decision;
+import org.apache.commons.collections4.Trie.Cursor.Decision;
 
 /**
  * This class implements the base PATRICIA algorithm and everything that
@@ -69,8 +69,8 @@ abstract class PatriciaTrieBase<K, V> extends AbstractTrie<K, V> {
     }
     
     /**
-     * Constructs a new {@link org.apache.commons.collections.Trie Trie} using the given {@link KeyAnalyzer} 
-     * and initializes the {@link org.apache.commons.collections.Trie Trie} with the values from the 
+     * Constructs a new {@link org.apache.commons.collections4.Trie Trie} using the given {@link KeyAnalyzer} 
+     * and initializes the {@link org.apache.commons.collections4.Trie Trie} with the values from the 
      * provided {@link Map}.
      */
     public PatriciaTrieBase(final KeyAnalyzer<? super K> keyAnalyzer, 
diff --git a/src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java
similarity index 98%
rename from src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java
index f936b7447..b2debe10d 100644
--- a/src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * A {@link KeyAnalyzer} for {@link Short}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java
similarity index 99%
rename from src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java
rename to src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java
index 78317234a..eac7a12b4 100644
--- a/src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 /**
  * An {@link KeyAnalyzer} for {@link String}s.
diff --git a/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java b/src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java
rename to src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java
index 2b01b93f5..7394f768c 100644
--- a/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Trie;
-import org.apache.commons.collections.collection.SynchronizedCollection;
+import org.apache.commons.collections4.Trie;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
 
 /**
  * A synchronized {@link Trie}.
diff --git a/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
similarity index 97%
rename from src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java
rename to src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
index b27dcac14..992e35e5e 100644
--- a/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 
-import org.apache.commons.collections.Trie;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Trie;
+import org.apache.commons.collections4.Unmodifiable;
 
 /**
  * An unmodifiable {@link Trie}.
diff --git a/src/main/java/org/apache/commons/collections/trie/package-info.java b/src/main/java/org/apache/commons/collections4/trie/package-info.java
similarity index 92%
rename from src/main/java/org/apache/commons/collections/trie/package-info.java
rename to src/main/java/org/apache/commons/collections4/trie/package-info.java
index 60479b605..5eeb55c55 100644
--- a/src/main/java/org/apache/commons/collections/trie/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/trie/package-info.java
@@ -16,7 +16,7 @@
  */
 /**
  * This package contains implementations of the
- * {@link org.apache.commons.collections.Trie Trie} interface.
+ * {@link org.apache.commons.collections4.Trie Trie} interface.
  * <p>
  * The implementations are in the form of direct implementations and decorators.
  * A decorator wraps another implementation of the interface to add some
@@ -35,4 +35,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
diff --git a/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/AbstractArrayListTest.java
rename to src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
index 837d1f4e8..933c7dbca 100644
--- a/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 
-import org.apache.commons.collections.list.AbstractListTest;
+import org.apache.commons.collections4.list.AbstractListTest;
 
 /**
  * Abstract test class for ArrayList.
diff --git a/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java
rename to src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
index 64d6f6791..003d918af 100644
--- a/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.list.AbstractListTest;
+import org.apache.commons.collections4.list.AbstractListTest;
 
 /**
  * Tests base {@link java.util.LinkedList} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/AbstractObjectTest.java
rename to src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
index 8b298e946..603d5ab3e 100644
--- a/src/test/java/org/apache/commons/collections/AbstractObjectTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -43,7 +43,7 @@ import java.io.Serializable;
 public abstract class AbstractObjectTest extends BulkTest {
 
     /** Current major release for Collections */
-    public static final int COLLECTIONS_MAJOR_VERSION = 3;
+    public static final int COLLECTIONS_MAJOR_VERSION = 4;
     
     /**
      * JUnit constructor.
@@ -209,9 +209,8 @@ public abstract class AbstractObjectTest extends BulkTest {
     //-----------------------------------------------------------------------
     /**
      * Get the version of Collections that this object tries to
-     * maintain serialization compatibility with. Defaults to 1, the
-     * earliest Collections version. (Note: some collections did not
-     * even exist in this version).
+     * maintain serialization compatibility with. Defaults to 4, due to
+     * the package change to collections4 introduced in version 4.
      * 
      * This constant makes it possible for TestMap (and other subclasses,
      * if necessary) to automatically check SVN for a versionX copy of a
@@ -224,7 +223,7 @@ public abstract class AbstractObjectTest extends BulkTest {
      * tested for compatibility with previous versions.
      */
     public String getCompatibilityVersion() {
-        return "1";
+        return "4";
     }
 
     protected String getCanonicalEmptyCollectionName(final Object object) {
diff --git a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java
rename to src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
index 76967808c..8a9ec1606 100644
--- a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.TreeMap;
 
-import org.apache.commons.collections.map.AbstractMapTest;
+import org.apache.commons.collections4.map.AbstractMapTest;
 
 /**
  * Tests TreeMap.
diff --git a/src/test/java/org/apache/commons/collections/ArrayStackTest.java b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/ArrayStackTest.java
rename to src/test/java/org/apache/commons/collections4/ArrayStackTest.java
index 0b71ea601..a52875be6 100644
--- a/src/test/java/org/apache/commons/collections/ArrayStackTest.java
+++ b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.EmptyStackException;
 
+import org.apache.commons.collections4.ArrayStack;
+
 import junit.framework.Test;
 
 /**
@@ -107,5 +109,17 @@ public class ArrayStackTest<E> extends AbstractArrayListTest<E> {
                      -1, stack.search("Missing Item"));
 
     }
+    
+    @Override
+    public String getCompatibilityVersion() {
+        return "4";
+    }
+
+//    public void testCreate() throws Exception {
+//        resetEmpty();
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj");
+//        resetFull();
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ArrayStack.fullCollection.version4.obj");
+//    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/BagUtilsTest.java b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/BagUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/BagUtilsTest.java
index d73d17525..6728ce481 100644
--- a/src/test/java/org/apache/commons/collections/BagUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
@@ -14,21 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.bag.PredicatedBag;
-import org.apache.commons.collections.bag.PredicatedSortedBag;
-import org.apache.commons.collections.bag.SynchronizedBag;
-import org.apache.commons.collections.bag.SynchronizedSortedBag;
-import org.apache.commons.collections.bag.TransformedBag;
-import org.apache.commons.collections.bag.TransformedSortedBag;
-import org.apache.commons.collections.bag.TreeBag;
-import org.apache.commons.collections.bag.UnmodifiableBag;
-import org.apache.commons.collections.bag.UnmodifiableSortedBag;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.BagUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.PredicatedBag;
+import org.apache.commons.collections4.bag.PredicatedSortedBag;
+import org.apache.commons.collections4.bag.SynchronizedBag;
+import org.apache.commons.collections4.bag.SynchronizedSortedBag;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.bag.TransformedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.bag.UnmodifiableBag;
+import org.apache.commons.collections4.bag.UnmodifiableSortedBag;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Tests for BagUtils factory methods.
diff --git a/src/test/java/org/apache/commons/collections/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/BulkTest.java
rename to src/test/java/org/apache/commons/collections4/BulkTest.java
index 40105ff13..ef3332f9f 100644
--- a/src/test/java/org/apache/commons/collections/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/ClosureUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
index a24b6fe37..52037e2e8 100644
--- a/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,11 +24,17 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionClosure;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NOPClosure;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionClosure;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NOPClosure;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Tests the ClosureUtils class.
diff --git a/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index a72f91c51..1fa623ad0 100644
--- a/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
-import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate;
+import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -26,14 +26,23 @@ import static org.junit.Assert.fail;
 
 import java.util.*;
 
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.collection.PredicatedCollection;
-import org.apache.commons.collections.collection.SynchronizedCollection;
-import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.functors.DefaultEquator;
-import org.apache.commons.collections.functors.Equator;
-import org.apache.commons.collections.queue.CircularFifoQueue;
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+import org.apache.commons.collections4.collection.TransformedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.functors.DefaultEquator;
+import org.apache.commons.collections4.functors.Equator;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
index 81f9b54b6..bf1e02ef3 100644
--- a/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.apache.commons.collections4.EnumerationUtils;
+
 import junit.framework.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/FactoryUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
index ce0084c65..890344a55 100644
--- a/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,8 +26,11 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.apache.commons.collections.functors.ConstantFactory;
-import org.apache.commons.collections.functors.ExceptionFactory;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.functors.ConstantFactory;
+import org.apache.commons.collections4.functors.ExceptionFactory;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/IteratorUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
index 3ec297e54..29b3d25a7 100644
--- a/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,11 +25,17 @@ import java.util.NoSuchElementException;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.EmptyListIterator;
-import org.apache.commons.collections.iterators.EmptyMapIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.EmptyListIterator;
+import org.apache.commons.collections4.iterators.EmptyMapIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
diff --git a/src/test/java/org/apache/commons/collections/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/ListUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index f3ad7da82..08e8a8559 100644
--- a/src/test/java/org/apache/commons/collections/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,12 @@ import java.util.List;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.list.PredicatedList;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.list.PredicatedList;
 
 /**
  * Tests for ListUtils.
diff --git a/src/test/java/org/apache/commons/collections/MapPerformance.java b/src/test/java/org/apache/commons/collections4/MapPerformance.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/MapPerformance.java
rename to src/test/java/org/apache/commons/collections4/MapPerformance.java
index f73bb563c..c52b8e741 100644
--- a/src/test/java/org/apache/commons/collections/MapPerformance.java
+++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Collection;
 //import java.util.Collections;
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 //import java.util.TreeMap;
 
-import org.apache.commons.collections.map.Flat3Map;
+import org.apache.commons.collections4.map.Flat3Map;
 
 /** 
  * <code>MapPerformanceTest</code> is designed to perform basic Map performance tests.
diff --git a/src/test/java/org/apache/commons/collections/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/MapUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index fa9ff9029..4633eab6f 100644
--- a/src/test/java/org/apache/commons/collections/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -31,12 +31,20 @@ import java.util.ArrayList;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.keyvalue.DefaultKeyValue;
-import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.collections.map.PredicatedMap;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.IterableSortedMap;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.collections4.map.LazyMap;
+import org.apache.commons.collections4.map.PredicatedMap;
 
 /**
  * Tests for MapUtils.
diff --git a/src/test/java/org/apache/commons/collections/MockTestCase.java b/src/test/java/org/apache/commons/collections4/MockTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/MockTestCase.java
rename to src/test/java/org/apache/commons/collections4/MockTestCase.java
index bb6d42bea..ff290ffda 100644
--- a/src/test/java/org/apache/commons/collections/MockTestCase.java
+++ b/src/test/java/org/apache/commons/collections4/MockTestCase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/PredicateUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
index d8f26743d..417f19124 100644
--- a/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
-import static org.apache.commons.collections.functors.TruePredicate.truePredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
@@ -30,14 +30,19 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.functors.AllPredicate;
-import org.apache.commons.collections.functors.AbstractPredicateTest;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionPredicate;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NotNullPredicate;
-import org.apache.commons.collections.functors.NullPredicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.functors.AbstractPredicateTest;
+import org.apache.commons.collections4.functors.AllPredicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionPredicate;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.collections4.functors.NullPredicate;
+import org.apache.commons.collections4.functors.TruePredicate;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/SetUtilsTest.java b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/SetUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/SetUtilsTest.java
index 4fb480115..eee543eae 100644
--- a/src/test/java/org/apache/commons/collections/SetUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,7 +23,9 @@ import java.util.Set;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.set.PredicatedSet;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.SetUtils;
+import org.apache.commons.collections4.set.PredicatedSet;
 
 /**
  * Tests for SetUtils.
diff --git a/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
index 8308bb187..8e02e5b08 100644
--- a/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
@@ -14,14 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.functors.NOPTransformer;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.collections.splitmap.TransformedMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Put;
+import org.apache.commons.collections4.SplitMapUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.functors.NOPTransformer;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.collections4.splitmap.TransformedMap;
 
 /**
  * Tests for {@link TransformedMap}
diff --git a/src/test/java/org/apache/commons/collections/TestUtils.java b/src/test/java/org/apache/commons/collections4/TestUtils.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/TestUtils.java
rename to src/test/java/org/apache/commons/collections4/TestUtils.java
index 54828dedb..9c1412467 100644
--- a/src/test/java/org/apache/commons/collections/TestUtils.java
+++ b/src/test/java/org/apache/commons/collections4/TestUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import static org.junit.Assert.assertSame;
 
diff --git a/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/TransformerUtilsTest.java
rename to src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
index 5ad979eec..5b6af5fcc 100644
--- a/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,14 +24,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.functors.CloneTransformer;
-import org.apache.commons.collections.functors.ConstantTransformer;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionTransformer;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NOPTransformer;
-import org.apache.commons.collections.functors.StringValueTransformer;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.functors.CloneTransformer;
+import org.apache.commons.collections4.functors.ConstantTransformer;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionTransformer;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NOPTransformer;
+import org.apache.commons.collections4.functors.StringValueTransformer;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Tests the TransformerUtils class.
diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
index 67fd1844f..e03661c80 100644
--- a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -24,11 +24,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.AbstractObjectTest;
-import org.apache.commons.collections.Bag;
+import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.bag.HashBag;
 
 /**
- * Abstract test class for {@link org.apache.commons.collections.Bag Bag} methods and contracts.
+ * Abstract test class for {@link org.apache.commons.collections4.Bag Bag} methods and contracts.
  * <p>
  * To use, simply extend this class, and implement
  * the {@link #makeObject} method.
diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
index daf762b38..8f0900b55 100644
--- a/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.SortedBag;
 
 /**
  * Abstract test class for
- * {@link org.apache.commons.collections.SortedBag SortedBag}
+ * {@link org.apache.commons.collections4.SortedBag SortedBag}
  * methods and contracts.
  *
  * @since 3.0
diff --git a/src/test/java/org/apache/commons/collections/bag/HashBagTest.java b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
similarity index 74%
rename from src/test/java/org/apache/commons/collections/bag/HashBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
index 172ba0e37..7e093a85a 100644
--- a/src/test/java/org/apache/commons/collections/bag/HashBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
-import org.apache.commons.collections.Bag;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.bag.HashBag;
 
 /**
  * Extension of {@link AbstractBagTest} for exercising the {@link HashBag}
@@ -37,18 +38,18 @@ public class HashBagTest<T> extends AbstractBagTest<T> {
     
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
     
 //    public void testCreate() throws Exception {
-//        Bag bag = makeBag();
-//        writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.emptyCollection.version3.obj");
-//        bag = makeBag();
+//        Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.emptyCollection.version4.obj");
+//        bag = makeObject();
 //        bag.add("A");
 //        bag.add("A");
 //        bag.add("B");
 //        bag.add("B");
 //        bag.add("C");
-//        writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
index b7c62c949..37e32c0b9 100644
--- a/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Set;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.PredicatedBag;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Extension of {@link AbstractBagTest} for exercising the {@link PredicatedBag}
@@ -109,7 +111,7 @@ public class PredicatedBagTest<T> extends AbstractBagTest<T> {
         }
         try {
             decorateBag(new HashBag<T>(), null);
-            fail("Expectiing IllegalArgumentException for null predicate.");
+            fail("Expecting IllegalArgumentException for null predicate.");
         } catch (final IllegalArgumentException e) {
             // expected
         }
@@ -117,19 +119,19 @@ public class PredicatedBagTest<T> extends AbstractBagTest<T> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
-//        Bag bag = makeBag();
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.emptyCollection.version3.1.obj");
-//        bag = makeBag();
+//        Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj");
+//        bag = makeObject();
 //        bag.add("A");
 //        bag.add("A");
 //        bag.add("B");
 //        bag.add("B");
 //        bag.add("C");
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
similarity index 82%
rename from src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
index 98b499b71..e40a254c3 100644
--- a/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
 import java.util.Comparator;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.bag.PredicatedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Extension of {@link AbstractSortedBagTest} for exercising the {@link PredicatedSortedBag}
@@ -94,19 +96,19 @@ public class PredicatedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
-//        Bag bag = makeBag();
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj");
-//        bag = makeBag();
+//        org.apache.commons.collections4.Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj");
+//        bag = makeObject();
 //        bag.add("A");
 //        bag.add("A");
 //        bag.add("B");
 //        bag.add("B");
 //        bag.add("C");
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
similarity index 82%
rename from src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
index 5b13633a8..72fe3b895 100644
--- a/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
 
 /**
  * Extension of {@link AbstractBagTest} for exercising the {@link TransformedBag}
@@ -79,19 +81,19 @@ public class TransformedBagTest<T> extends AbstractBagTest<T> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
-//        Bag bag = makeBag();
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.emptyCollection.version3.1.obj");
-//        bag = makeBag();
+//        Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj");
+//        bag = makeObject();
 //        bag.add("A");
 //        bag.add("A");
 //        bag.add("B");
 //        bag.add("B");
 //        bag.add("C");
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
similarity index 78%
rename from src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
index c31574dcc..c80c6ede9 100644
--- a/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
@@ -14,12 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.bag.TransformedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
 
 /**
  * Extension of {@link AbstractSortedBagTest} for exercising the {@link TransformedSortedBag}
@@ -72,19 +75,19 @@ public class TransformedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
-//        Bag bag = makeBag();
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.emptyCollection.version3.1.obj");
-//        bag = makeBag();
+//        Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj");
+//        bag = makeObject();
 //        bag.add("A");
 //        bag.add("A");
 //        bag.add("B");
 //        bag.add("B");
 //        bag.add("C");
-//        writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
similarity index 76%
rename from src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
rename to src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
index 607749fed..926917d1c 100644
--- a/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
 
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
 
 /**
  * Extension of {@link AbstractBagTest} for exercising the {@link TreeBag}
@@ -68,18 +69,18 @@ public class TreeBagTest<T> extends AbstractSortedBagTest<T> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
-    //   public void testCreate() throws Exception {
-    //       Bag bag = makeBag();
-    //       writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.emptyCollection.version3.obj");
-    //       bag = makeBag();
-    //       bag.add("A");
-    //       bag.add("A");
-    //       bag.add("B");
-    //       bag.add("B");
-    //       bag.add("C");
-    //       writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.fullCollection.version3.obj");
-    //   }
+//    public void testCreate() throws Exception {
+//        Bag bag = makeObject();
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.emptyCollection.version4.obj");
+//        bag = makeObject();
+//        bag.add("A");
+//        bag.add("A");
+//        bag.add("B");
+//        bag.add("B");
+//        bag.add("C");
+//        writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.fullCollection.version4.obj");
+//    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
index 6a0723c0c..6f02fad8d 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -22,11 +22,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
-import org.apache.commons.collections.map.AbstractIterableMapTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.map.AbstractIterableMapTest;
 
 /**
  * Abstract test class for {@link BidiMap} methods and contracts.
@@ -73,7 +73,7 @@ public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<
      */
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     // BidiPut
diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
index 8e8dca20e..d30d63f3c 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.bidimap.AbstractOrderedBidiMapDecorator;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
 
 /**
  * Test class for AbstractOrderedBidiMapDecorator.
diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
index 1fc57e831..20443cbea 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,10 +23,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
 
 /**
  * Abstract test class for {@link OrderedBidiMap} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
index 2fd954b93..953334a3b 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,9 +27,9 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.map.AbstractSortedMapTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.map.AbstractSortedMapTest;
 
 /**
  * Abstract test class for {@link SortedBidiMap} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
similarity index 78%
rename from src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
index 2b45b9ea1..e64df27ed 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
 
 /**
  * JUnit tests.
@@ -52,8 +54,8 @@ public class DualHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
     
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
similarity index 79%
rename from src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
index 4e487103a..f8eb4db37 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualLinkedHashBidiMap;
 
 /**
  * JUnit tests.
@@ -57,8 +59,8 @@ public class DualLinkedHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
     
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
rename to src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
index ad3288a0f..9634e28a7 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,10 +28,12 @@ import java.util.List;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.comparators.ComparableComparator;
-import org.apache.commons.collections.comparators.ReverseComparator;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ReverseComparator;
 
 /**
  * JUnit tests.
@@ -144,7 +146,7 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V extends Comparable<
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.Test2";
+        return "4.Test2";
     }
 
     /**
@@ -157,8 +159,8 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V extends Comparable<
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
similarity index 79%
rename from src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
index 465a2d78d..e0546cdde 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
 
 /**
  * JUnit tests.
@@ -52,8 +54,8 @@ public class DualTreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V
     
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/TreeBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
similarity index 80%
rename from src/test/java/org/apache/commons/collections/bidimap/TreeBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
index c4a3006fc..a20cd684a 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/TreeBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.TreeBidiMap;
 
 /**
  * JUnit tests.
@@ -72,14 +73,14 @@ public class TreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> e
     
     @Override
     public String getCompatibilityVersion() {
-        return "3.3";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.emptyCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.fullCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
index bb531a748..45ec1941b 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableBidiMap;
 
 /**
  * JUnit tests.
diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
index d55fbb9db..8fb2e548c 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.Map;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.OrderedBidiMap;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.bidimap.TreeBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableOrderedBidiMap;
 
 /**
  * JUnit tests.
diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java
rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
index d8383c473..879c952a6 100644
--- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
@@ -14,14 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableSortedBidiMap;
 
 /**
  * JUnit tests.
diff --git a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index d1d93c523..b1a3b9c40 100644
--- a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
 
 /**
  * Abstract test class for {@link java.util.Collection} methods and contracts.
@@ -90,7 +90,7 @@ import org.apache.commons.collections.AbstractObjectTest;
  * {@link #confirmed}, the {@link #verify()} method is invoked to compare
  * the results.  You may want to override {@link #verify()} to perform
  * additional verifications.  For instance, when testing the collection
- * views of a map, {@link org.apache.commons.collections.map.AbstractMapTest AbstractTestMap} 
+ * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest AbstractTestMap} 
  * would override {@link #verify()} to make
  * sure the map is changed after the collection view is changed.
  * <p>
@@ -104,9 +104,9 @@ import org.apache.commons.collections.AbstractObjectTest;
  * Those methods should provide a confirmed collection implementation
  * that's compatible with your collection implementation.
  * <p>
- * If you're extending {@link org.apache.commons.collections.list.AbstractListTest AbstractListTest},
- * {@link org.apache.commons.collections.set.AbstractSetTest AbstractTestSet},
- * or {@link org.apache.commons.collections.bag.AbstractBagTest AbstractBagTest}, 
+ * If you're extending {@link org.apache.commons.collections4.list.AbstractListTest AbstractListTest},
+ * {@link org.apache.commons.collections4.set.AbstractSetTest AbstractTestSet},
+ * or {@link org.apache.commons.collections4.bag.AbstractBagTest AbstractBagTest}, 
  * you probably don't have to worry about the
  * above methods, because those three classes already override the methods
  * to provide standard JDK confirmed collections.<P>
diff --git a/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
index 4508b27cc..d41f052d9 100644
--- a/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,6 +23,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.collections4.collection.CompositeCollection;
+
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link CompositeCollection} implementation.
@@ -371,14 +373,14 @@ public class CompositeCollectionTest<E> extends AbstractCollectionTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.3";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.emptyCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.fullCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
index 4e71f636b..7653f261b 100644
--- a/src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import static java.util.Arrays.asList;
 
@@ -24,8 +24,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.IndexedCollection;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.IndexedCollection;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the 
diff --git a/src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
index 07051f54d..c4face208 100644
--- a/src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the 
@@ -123,14 +124,14 @@ public class PredicatedCollectionTest<E> extends AbstractCollectionTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedCollection.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedCollection.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
similarity index 80%
rename from src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
index 8c29d69da..1974daf00 100644
--- a/src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link SynchronizedCollection} implementation.
@@ -53,14 +55,14 @@ public class SynchronizedCollectionTest<E> extends AbstractCollectionTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SynchronizedCollection.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SynchronizedCollection.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
index bdb85c8f1..85448ca68 100644
--- a/src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollection;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the {@link TransformedCollection}
@@ -116,14 +117,14 @@ public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedCollection.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedCollection.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
index ca150a44e..4f3acb4ff 100644
--- a/src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.collections.BoundedCollection;
-import org.apache.commons.collections.list.FixedSizeList;
+import org.apache.commons.collections4.BoundedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection;
+import org.apache.commons.collections4.list.FixedSizeList;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
@@ -78,6 +79,6 @@ public class UnmodifiableBoundedCollectionTest<E> extends AbstractCollectionTest
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 }
diff --git a/src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
similarity index 83%
rename from src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java
rename to src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
index 5ac6226c1..e5077baa9 100644
--- a/src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.collection;
+package org.apache.commons.collections4.collection;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableCollection} implementation.
@@ -71,14 +73,14 @@ public class UnmodifiableCollectionTest<E> extends AbstractCollectionTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableCollection.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
index e39cbb881..1cafd5a8f 100644
--- a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -24,7 +24,7 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
 import org.junit.Test;
 
 /**
@@ -78,15 +78,6 @@ public abstract class AbstractComparatorTest<T> extends AbstractObjectTest {
         return false;
     }
 
-    /**
-     * Overrides superclass to set the compatability to version 2
-     * as there were no Comparators in version 1.x.
-     */
-    @Override
-    public String getCompatibilityVersion() {
-        return "2";
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Reverse the list.
diff --git a/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
similarity index 81%
rename from src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
index 3047c2202..c2c5a4102 100644
--- a/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.collections4.comparators.NullComparator;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -71,6 +73,16 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest<
         public String getCanonicalComparatorName(final Object object) {
             return super.getCanonicalComparatorName(object) + "1";
         }
+        
+        @Override
+        public String getCompatibilityVersion() {
+            return "4";
+        }
+
+//        public void testCreate() throws Exception {
+//            writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj1");
+//        }
+        
     }
 
     /**
@@ -103,5 +115,15 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest<
         public String getCanonicalComparatorName(final Object object) {
             return super.getCanonicalComparatorName(object) + "2";
         }
+        
+        @Override
+        public String getCompatibilityVersion() {
+            return "4";
+        }
+
+//        public void testCreate() throws Exception {
+//            writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj2");
+//        }
+        
     }
 }
diff --git a/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
index ecba85c19..df129f13d 100644
--- a/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.commons.collections4.comparators.BooleanComparator;
 import org.junit.Test;
 
 /**
@@ -59,9 +60,13 @@ public class BooleanComparatorTest extends AbstractComparatorTest<Boolean> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/BooleanComparator.version4.obj");
+//    }
+
     // tests
     // ------------------------------------------------------------------------
 
diff --git a/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
similarity index 78%
rename from src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
index 8cc2f19cf..094428c50 100644
--- a/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.collections4.comparators.ComparableComparator;
+
 /**
  * Tests for ComparableComparator.
  *
@@ -49,4 +51,13 @@ public class ComparableComparatorTest extends AbstractComparatorTest<Integer> {
         return list;
     }
 
+    @Override
+    public String getCompatibilityVersion() {
+        return "4";
+    }
+
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ComparableComparator.version4.obj");
+//    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
index 51c2e4e01..ed0e8afd0 100644
--- a/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparatorChain;
 import org.junit.Test;
 
 /**
@@ -42,6 +44,15 @@ public class ComparatorChainTest extends AbstractComparatorTest<ComparatorChainT
         return chain;
     }
 
+    @Override
+    public String getCompatibilityVersion() {
+        return "4";
+    }
+
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ComparatorChain.version4.obj");
+//    }
+    
     @Test
     public void testNoopComparatorChain() {
         final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
@@ -128,7 +139,6 @@ public class ComparatorChainTest extends AbstractComparatorTest<ComparatorChainT
         return list;
     }
 
-    @SuppressWarnings("serial")
     public static class PseudoRow implements Serializable {
 
         /**
diff --git a/src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index a8081cdc0..14688811b 100644
--- a/src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -22,6 +22,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
+import org.apache.commons.collections4.comparators.FixedOrderComparator;
 import org.junit.Test;
 
 /**
@@ -75,6 +76,10 @@ public class FixedOrderComparatorTest extends AbstractComparatorTest<String> {
         return "4";
     }
 
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/FixedOrderComparator.version4.obj");
+//    }
+    
     //
     // The tests
     //
diff --git a/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
index 6e247c652..eb73147ad 100644
--- a/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,6 +25,8 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ReverseComparator;
 import org.junit.Test;
 
 /**
@@ -53,6 +55,15 @@ public class ReverseComparatorTest extends AbstractComparatorTest<Integer> {
         return new ReverseComparator<Integer>(Collections.<Integer>reverseOrder());
     }
 
+    @Override
+    public String getCompatibilityVersion() {
+        return "4";
+    }
+
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ReverseComparator.version4.obj");
+//    }
+    
     @Override
     public List<Integer> getComparableObjectsOrdered() {
         final List<Integer> list = new LinkedList<Integer>();
@@ -67,7 +78,7 @@ public class ReverseComparatorTest extends AbstractComparatorTest<Integer> {
     /**
      * Override this inherited test since Collections.reverseOrder
      * doesn't adhere to the "soft" Comparator contract, and we've
-     * already "cannonized" the comparator returned by makeComparator.
+     * already "canonized" the comparator returned by makeComparator.
      */
     @Override
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
similarity index 81%
rename from src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
index e3b61db07..2d447b2fa 100644
--- a/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
 
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.collections.ComparatorUtils;
-import org.apache.commons.collections.TransformerUtils;
+import org.apache.commons.collections4.ComparatorUtils;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.comparators.ComparableComparator;
 
 /**
  * Test class for TransformingComparator.
@@ -64,6 +65,10 @@ public class TransformingComparatorTest extends AbstractComparatorTest<Integer>
         return "4";
     }
 
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/TransformingComparator.version4.obj");
+//    }
+
     //
     // The tests
     //
diff --git a/src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java
rename to src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java
index dba8b163f..c7da7b1f1 100644
--- a/src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
+import org.apache.commons.collections4.comparators.sequence.CommandVisitor;
+import org.apache.commons.collections4.comparators.sequence.SequencesComparator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
index a98b8504f..ac9765bc5 100644
--- a/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
@@ -14,9 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
+
+import org.apache.commons.collections4.Predicate;
 
-import org.apache.commons.collections.Predicate;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java
index a2010c270..d540127cf 100644
--- a/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
index 64094e6a8..d5947cb21 100644
--- a/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
index d7e43849c..daa7ed191 100644
--- a/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import static org.easymock.EasyMock.verify;
 import static org.easymock.EasyMock.replay;
 import org.junit.Before;
 import org.junit.After;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 import org.easymock.EasyMock;
 
 import java.util.ArrayList;
diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java
index 7a2156730..fd5a88bd4 100644
--- a/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
index b97b986ab..f2cb1e5af 100644
--- a/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.AllPredicate;
 
-import static org.apache.commons.collections.functors.AllPredicate.allPredicate;
+import static org.apache.commons.collections4.functors.AllPredicate.allPredicate;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java
rename to src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
index d17127605..111f76e54 100644
--- a/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
 import java.io.IOException;
 
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.functors.CatchAndRethrowClosure;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
index a9476b641..12d541e24 100644
--- a/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
+
+import static org.apache.commons.collections4.functors.ComparatorPredicate.*;
 
-import static org.apache.commons.collections.functors.ComparatorPredicate.*;
 import java.util.Comparator;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java
index 13e2069b5..4dd024ade 100644
--- a/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate;
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
 import static org.junit.Assert.assertSame;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java
similarity index 85%
rename from src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java
rename to src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java
index ceb338969..d0cacf601 100644
--- a/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
 
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
 import static org.junit.Assert.assertSame;
 
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NullPredicate;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
index b9095c946..4d9b5a030 100644
--- a/src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
 
 /**
  * Abstract class for testing the Iterator interface.
diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
index 6a20aa757..b7db7242b 100644
--- a/src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.ListIterator;
diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
index b0010cf0a..1cdfde002 100644
--- a/src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.MapIterator;
+import org.apache.commons.collections4.MapIterator;
 
 /**
  * Abstract class for testing the MapIterator interface.
diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
index cd7990495..f33c364c3 100644
--- a/src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
 
 /**
  * Abstract class for testing the OrderedMapIterator interface.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java
rename to src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
index ca57eeec7..cafe66da6 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.ArrayIterator;
+
 /**
  * Tests the ArrayIterator with primitive type arrays.
  *
diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
index e2b557b9d..0ed3014bc 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.ArrayIterator;
+
 /**
  * Tests the ArrayIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java
rename to src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
index 99c96cadb..5af64251c 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
+
+import org.apache.commons.collections4.iterators.ArrayListIterator;
 
 /**
  * Test the ArrayListIterator class with primitives.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
index 6a886c897..5fa2df571 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.ArrayListIterator;
+
 /**
  * Test the ArrayListIterator class.
  *
diff --git a/src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
index 3bc82b01e..e6f83a803 100644
--- a/src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.commons.collections.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.iterators.CollatingIterator;
 
 /**
  * Unit test suite for {@link CollatingIterator}.
diff --git a/src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
index 39d2c4fe3..0afd12560 100644
--- a/src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
-import static org.apache.commons.collections.functors.TruePredicate.truePredicate;
+import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.NotNullPredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+import org.apache.commons.collections4.iterators.FilterIterator;
 
 /**
  * Test the filter iterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
index eeb072a54..2389667c1 100644
--- a/src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,9 +23,10 @@ import java.util.ListIterator;
 import java.util.Random;
 
 import junit.framework.TestCase;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.PredicateUtils;
-import org.apache.commons.collections.list.GrowthList;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.iterators.FilterListIterator;
+import org.apache.commons.collections4.list.GrowthList;
 import org.junit.Assert;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
index fd8605562..9d0eada4e 100644
--- a/src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.iterators.IteratorChain;
 
 /**
  * Tests the IteratorChain class.
diff --git a/src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
index 87e1709bc..8040bbe4a 100644
--- a/src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -19,7 +19,8 @@ import java.util.List;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.iterators.IteratorIterable;
 
 /**
  * Tests for IteratorIterable.
diff --git a/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
index b362955ed..ff0d03088 100644
--- a/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.iterators.LazyIteratorChain;
 
 /**
  * Tests the LazyIteratorChain class.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java
rename to src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
index ded75441d..951900865 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
 
 /**
  * Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
index 5efb97542..c6e175ce9 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
 
 /**
  * Tests the ListIteratorWrapper to insure that it simulates
diff --git a/src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
index fc1599440..3dbaa9925 100644
--- a/src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.LoopingIterator;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
index bb0969be4..6e8411f47 100644
--- a/src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.LoopingListIterator;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
index 51031363e..4c206a1e8 100644
--- a/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
+
+import org.apache.commons.collections4.iterators.NodeListIterator;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
index d8395887b..b3c6b9812 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.ObjectArrayIterator;
+
 /**
  * Tests the ObjectArrayIterator.
  *
diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java
rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
index 458bebbc0..7c61dddbc 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
+
+import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
 
 /**
  * Tests the ObjectArrayListIterator class.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
index a05c1ad68..92c9336b9 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
+
 /**
  * Tests the ObjectArrayListIterator class.
  *
diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
index b52d73190..a3068910d 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.iterators.ObjectGraphIterator;
 
 /**
  * Testcase.
diff --git a/src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
index 993fde7f9..ccb9c7ada 100644
--- a/src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ReverseListIterator;
 
 /**
  * Tests the ReverseListIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java
rename to src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
index 366fb615f..45ca9223c 100644
--- a/src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
 
 /**
  * Tests the SingletonIterator to ensure that the next() method will actually
diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
index c051204c8..3214a3b76 100644
--- a/src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
 
 /**
  * Tests the SingletonIterator to ensure that the next() method will actually
diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
index 7f38b7d46..3c4f2fde4 100644
--- a/src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.SingletonListIterator;
 
 /**
  * Tests the SingletonListIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
index 552c803ed..9ba4ce46a 100644
--- a/src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.collections4.iterators.UniqueFilterIterator;
+
 /**
  * Tests the UniqueFilterIterator class.
  *
diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
index 1a5703b9c..1e4c04494 100644
--- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
 
 /**
  * Tests the UnmodifiableIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
index a73a1574c..b4e3ef4bf 100644
--- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
 
 /**
  * Tests the UnmodifiableListIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
index eeb04c717..9097b37be 100644
--- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
 
 /**
  * Tests the UnmodifiableMapIterator.
diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java
rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
index 8a8ba2c42..e5cc61b0a 100644
--- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
+import org.apache.commons.collections4.map.ListOrderedMap;
 
 /**
  * Tests the UnmodifiableOrderedMapIterator.
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
index dddf91d37..423bf8da6 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
index 051521b3c..5a1ba5a70 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
index 237c927f3..77a53cebc 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
 
 /**
  * Test the DefaultMapEntry class.
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
index 600a68f19..f9d49bd6e 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,10 +26,12 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.collections4.keyvalue.MultiKey;
+
 import junit.framework.TestCase;
 
 /**
- * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}.
+ * Unit tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}.
  *
  * @version $Id$
  */
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
index 6e26eab76..31f166f30 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.collections4.keyvalue.TiedMapEntry;
+
 /**
  * Test the TiedMapEntry class.
  *
diff --git a/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java
rename to src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
index 79b7a83d5..7b90f7fdf 100644
--- a/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
 
 import java.util.Map;
 
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
 
 /**
  * Test the UnmodifiableMapEntry class.
diff --git a/src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java
rename to src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
index f05db4bc2..83b55d131 100644
--- a/src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
@@ -14,18 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Arrays;
 
+import org.apache.commons.collections4.list.AbstractLinkedList;
+
 /**
  * Test case for {@link AbstractLinkedList}.
  *
- * @version $Revision$
- *
- * @author Rich Dougherty
+ * @version $Id$
  * @author David Hay
- * @author Phil Steitz
  */
 public abstract class AbstractLinkedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/list/AbstractListTest.java
rename to src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index b53c90d3f..8aea7b773 100644
--- a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -31,9 +31,9 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.collection.AbstractCollectionTest;
-import org.apache.commons.collections.iterators.AbstractListIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.iterators.AbstractListIteratorTest;
 
 /**
  * Abstract test class for {@link java.util.List} methods and contracts.
@@ -46,12 +46,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorTest;
  * test case (method) your {@link List} fails or override one of the
  * protected methods from AbstractTestCollection.
  *
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Paul Jack
- * @author Stephen Colebourne
- * @author Neil O'Toole
+ * @version $Id$
  */
 public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
@@ -1074,18 +1069,6 @@ public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
         assertEquals("Both lists are same size", size, list2.size());
     }
 
-    /**
-     * Skip the serialized canonical tests for now.
-     *
-     * @return true
-     *
-     * TODO: store new serialized objects in CVS.
-     */
-    @Override
-    protected boolean skipSerializedCanonicalTests() {
-        return true;
-    }
-
     /**
      * Compare the current serialized form of the List
      * against the canonical version in SVN.
diff --git a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java
rename to src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index cdbbf8190..42cdf30db 100644
--- a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
@@ -26,15 +26,13 @@ import java.util.NoSuchElementException;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.list.CursorableLinkedList;
 
 /**
  * Test class.
  *
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Simon Kitching
+ * @version $Id$
  */
 public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
     public CursorableLinkedListTest(final String testName) {
@@ -1525,14 +1523,14 @@ public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "4.0";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.emptyCollection.version4.0.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.fullCollection.version4.0.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
similarity index 79%
rename from src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java
rename to src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
index a4c34dcbe..c4ebc9896 100644
--- a/src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.collections4.list.FixedSizeList;
+
 /**
  * Extension of {@link AbstractListTest} for exercising the {@link FixedSizeList}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
 public class FixedSizeListTest<E> extends AbstractListTest<E> {
 
@@ -59,14 +59,14 @@ public class FixedSizeListTest<E> extends AbstractListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/list/GrowthListTest.java b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/collections/list/GrowthListTest.java
rename to src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
index a890509b2..ed9baaa67 100644
--- a/src/test/java/org/apache/commons/collections/list/GrowthListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.collections4.list.GrowthList;
+
 /**
  * Extension of {@link AbstractListTest} for exercising the {@link GrowthList}.
  *
- * @since Commons Collections 3.2
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.2
+ * @version $Id$
  */
 public class GrowthListTest<E> extends AbstractListTest<E> {
 
@@ -158,14 +158,14 @@ public class GrowthListTest<E> extends AbstractListTest<E> {
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.2";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.emptyCollection.version3.2.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.fullCollection.version3.2.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java
rename to src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
index fab71fdcb..5fb11f44a 100644
--- a/src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
@@ -14,22 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.list.NodeCachingLinkedList;
 
 /**
  * Test class for NodeCachingLinkedList, a performance optimised LinkedList.
  *
- * @version $Revision$
- *
- * @author Jeff Varszegi
- * @author Phil Steitz
+ * @version $Id$
  */
 public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
@@ -49,7 +47,7 @@ public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     //-----------------------------------------------------------------------
@@ -145,11 +143,11 @@ public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection,
-//           "D:/dev/collections/data/test/NodeCachingLinkedList.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(),
+//           "src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection,
-//            "D:/dev/collections/data/test/NodeCachingLinkedList.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(),
+//            "src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/list/PredicatedListTest.java b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/list/PredicatedListTest.java
rename to src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
index a7dfaab16..7ab307563 100644
--- a/src/test/java/org/apache/commons/collections/list/PredicatedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
+import org.apache.commons.collections4.list.PredicatedList;
 
 /**
  * Extension of {@link AbstractListTest} for exercising the 
  * {@link PredicatedList} implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Phil Steitz
+ * @since 3.0
+ * @version $Id$
  */
 public class PredicatedListTest<E> extends AbstractListTest<E> {
 
@@ -139,14 +138,14 @@ public class PredicatedListTest<E> extends AbstractListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java
rename to src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
index 09f1110fb..6f995d3da 100644
--- a/src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,14 +25,13 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
+import org.apache.commons.collections4.list.SetUniqueList;
+
 /**
  * JUnit tests.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Matthew Hawthorne
- * @author Tom Dunham
+ * @since 3.0
+ * @version $Id$
  */
 public class SetUniqueListTest<E> extends AbstractListTest<E> {
 
@@ -444,14 +443,14 @@ public class SetUniqueListTest<E> extends AbstractListTest<E> {
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SetUniqueList.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SetUniqueList.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj");
 //    }
 
     // TODO: Generics
diff --git a/src/test/java/org/apache/commons/collections/list/TransformedListTest.java b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/list/TransformedListTest.java
rename to src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
index ce0d6bbf6..d3e905c71 100644
--- a/src/test/java/org/apache/commons/collections/list/TransformedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
@@ -14,24 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.list.TransformedList;
 
 /**
  * Extension of {@link AbstractListTest} for exercising the {@link TransformedList}
  * implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
  */
 public class TransformedListTest<E> extends AbstractListTest<E> {
 
@@ -132,14 +131,14 @@ public class TransformedListTest<E> extends AbstractListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedList.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedList.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/list/TreeListTest.java
rename to src/test/java/org/apache/commons/collections4/list/TreeListTest.java
index a5d57050c..0a70db06b 100644
--- a/src/test/java/org/apache/commons/collections/list/TreeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.List;
 import java.util.ListIterator;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.list.TreeList;
 
 /**
  * JUnit tests
  *
- * @since Commons Collections 3.1
- * @version $Revision$
- *
- * @author Joerg Schmuecker
+ * @since 3.1
+ * @version $Id$
  */
 public class TreeListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java
rename to src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
index bf3f73ac1..e472636a9 100644
--- a/src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.collections4.list.UnmodifiableList;
+
 /**
  * Extension of {@link AbstractListTest} for exercising the
  * {@link UnmodifiableList} implementation.
  *
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Phil Steitz
+ * @since 3.0
+ * @version $Id$
  */
 public class UnmodifiableListTest<E> extends AbstractListTest<E> {
 
@@ -165,14 +165,14 @@ public class UnmodifiableListTest<E> extends AbstractListTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableList.emptyCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableList.fullCollection.version3.1.obj");
+//        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
index 0ad08c9b7..99d7a268d 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
 
 /**
  * Abstract test class for {@link IterableMap} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index 5e7a8f65e..9de9fcb5d 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -29,12 +29,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.collections.AbstractObjectTest;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.collection.AbstractCollectionTest;
-import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.commons.collections.set.AbstractSetTest;
+import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
+import org.apache.commons.collections4.set.AbstractSetTest;
 
 /**
  * Abstract test class for {@link java.util.Map} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
index 251dfe0f2..39960ec7a 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,11 +25,11 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.comparators.NullComparator;
-import org.apache.commons.collections.iterators.AbstractOrderedMapIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.comparators.NullComparator;
+import org.apache.commons.collections4.iterators.AbstractOrderedMapIteratorTest;
 
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
index 53d1d1dde..649d3df83 100644
--- a/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
 
 /**
  * Abstract test class for {@link java.util.SortedMap} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
index 2e04ef303..bb4b0565a 100644
--- a/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -22,7 +22,9 @@ import java.util.Map;
 import java.util.Set;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
 
 /**
  * Tests for the {@link CaseInsensitiveMap} implementation.
@@ -46,7 +48,7 @@ public class CaseInsensitiveMapTest<K, V> extends AbstractIterableMapTest<K, V>
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     //-------------------------------------------------------------------------
@@ -107,14 +109,12 @@ public class CaseInsensitiveMapTest<K, V> extends AbstractIterableMapTest<K, V>
         assertSame(map.get("1"), cloned.get("1"));
     }
 
-    /*
-    public void testCreate() throws Exception {
-        resetEmpty();
-        writeExternalFormToDisk((java.io.Serializable) map, "/home/phil/jakarta-commons/collections/data/test/CaseInsensitiveMap.emptyCollection.version3.obj");
-        resetFull();
-        writeExternalFormToDisk((java.io.Serializable) map, "/home/phil/jakarta-commons/collections/data/test/CaseInsensitiveMap.fullCollection.version3.obj");
-    }
-     */
+//    public void testCreate() throws Exception {
+//        resetEmpty();
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj");
+//        resetFull();
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj");
+//    }
 
     // COLLECTIONS-294
     public void testLocaleIndependence() {
diff --git a/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/map/CompositeMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
index 6095cc7b4..0f11d787c 100644
--- a/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collection;
 
+import org.apache.commons.collections4.map.CompositeMap;
+
 /**
  * Extension of {@link AbstractMapTest} for exercising the 
  * {@link CompositeMap} implementation.
@@ -208,14 +210,14 @@ public class CompositeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.3";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "/tmp/CompositeMap.emptyCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "/tmp/CompositeMap.fullCollection.version3.3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CompositeMap.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
index 9230c245a..0b67e4a0f 100644
--- a/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FactoryUtils;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.functors.ConstantFactory;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.ConstantFactory;
+import org.apache.commons.collections4.map.DefaultedMap;
 
 /**
  * Extension of {@link AbstractMapTest} for exercising the 
@@ -132,18 +133,18 @@ public class DefaultedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.2";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "c:/commons/collections/data/test/DefaultedMap.emptyCollection.version3.2.obj");
+//            "src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "c:/commons/collections/data/test/DefaultedMap.fullCollection.version3.2.obj");
+//            "src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj");
 //    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java b/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java
rename to src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java
index fe34a1fc4..a4b4c01c7 100644
--- a/src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java
+++ b/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Map;
 import java.util.Collection;
 
+import org.apache.commons.collections4.map.CompositeMap;
+
 /**
  * This class is used in TestCompositeMap. When testing serialization, 
  * the class has to be separate of TestCompositeMap, else the test 
diff --git a/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
index 0039d2301..6605378e1 100644
--- a/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.map.FixedSizeMap;
 
 /**
  * Extension of {@link AbstractMapTest} for exercising the {@link FixedSizeMap}
@@ -58,17 +59,18 @@ public class FixedSizeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/FixedSizeMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/FixedSizeMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
index a9e59365e..dac6d7177 100644
--- a/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.FixedSizeSortedMap;
 
 /**
  * Extension of {@link AbstractSortedMapTest} for exercising the {@link FixedSizeSortedMap}
@@ -72,17 +73,18 @@ public class FixedSizeSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/map/Flat3MapTest.java
rename to src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 47de79cb8..b5d0ee8f9 100644
--- a/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,10 +24,12 @@ import java.util.Iterator;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.map.Flat3Map;
 
 /**
  * JUnit tests.
@@ -394,18 +396,18 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/Flat3Map.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/Flat3Map.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/Flat3Map.fullCollection.version4.obj");
 //    }
 
     public void testCollections261() {
diff --git a/src/test/java/org/apache/commons/collections/map/HashedMapTest.java b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/map/HashedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
index 4ff50ba3d..7aac4d75d 100644
--- a/src/test/java/org/apache/commons/collections/map/HashedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.HashedMap;
 
 /**
  * JUnit tests.
@@ -41,7 +43,7 @@ public class HashedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     @SuppressWarnings("unchecked")
@@ -64,9 +66,9 @@ public class HashedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/HashedMap.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/HashedMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/HashedMap.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/HashedMap.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/map/IdentityMap.java b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/map/IdentityMap.java
rename to src/test/java/org/apache/commons/collections4/map/IdentityMap.java
index b349ae7d2..9fc9f679f 100644
--- a/src/test/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -22,6 +22,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
+import org.apache.commons.collections4.map.AbstractHashedMap;
+import org.apache.commons.collections4.map.ListOrderedMap;
+
 /**
  * A <code>Map</code> implementation that matches keys and values based
  * on <code>==</code> not <code>equals()</code>.
diff --git a/src/test/java/org/apache/commons/collections/map/LRUMapTest.java b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/map/LRUMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
index c1322f52f..0f8fcca79 100644
--- a/src/test/java/org/apache/commons/collections/map/LRUMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,10 +23,12 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.ResettableIterator;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.map.LRUMap;
 
 /**
  * JUnit tests.
@@ -63,7 +65,7 @@ public class LRUMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     //-----------------------------------------------------------------------
@@ -828,9 +830,9 @@ public class LRUMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LRUMap.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LRUMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LRUMap.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LRUMap.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/map/LazyMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/map/LazyMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
index bcba8b1a1..904aaaf08 100644
--- a/src/test/java/org/apache/commons/collections/map/LazyMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
-import static org.apache.commons.collections.map.LazyMap.lazyMap;
+import static org.apache.commons.collections4.map.LazyMap.lazyMap;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FactoryUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.map.LazyMap;
 import org.junit.Test;
 
 /**
@@ -88,17 +89,18 @@ public class LazyMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/LazyMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/LazyMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/LazyMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/LazyMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
index f0d7e7515..694c3ae45 100644
--- a/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
@@ -14,19 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
-import static org.apache.commons.collections.map.LazySortedMap.lazySortedMap;
+import static org.apache.commons.collections4.map.LazySortedMap.lazySortedMap;
 
 import java.util.Comparator;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.FactoryUtils;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.map.LazySortedMap;
 import org.junit.Test;
 
 /**
@@ -123,17 +124,17 @@ public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
     
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/LazySortedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/LazySortedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/map/LinkedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
index bd6e02feb..4b8494237 100644
--- a/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,11 +22,13 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.ResettableIterator;
-import org.apache.commons.collections.list.AbstractListTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.list.AbstractListTest;
+import org.apache.commons.collections4.map.LinkedMap;
 
 /**
  * JUnit tests.
@@ -58,7 +60,7 @@ public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3";
+        return "4";
     }
 
     //-----------------------------------------------------------------------
@@ -283,9 +285,9 @@ public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LinkedMap.emptyCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj");
 //        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LinkedMap.fullCollection.version3.obj");
+//        writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LinkedMap.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java
rename to src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index 79a2777c9..8d7bbe4b5 100644
--- a/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.list.AbstractListTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.list.AbstractListTest;
+import org.apache.commons.collections4.map.ListOrderedMap;
 
 /**
  * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap}
@@ -203,7 +204,7 @@ public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
diff --git a/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index 3af44f14f..984c9496f 100644
--- a/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,9 +24,10 @@ import java.util.TreeMap;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.list.AbstractListTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.list.AbstractListTest;
+import org.apache.commons.collections4.map.ListOrderedMap;
 
 /**
  * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap}
@@ -478,18 +479,18 @@ public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/ListOrderedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/ListOrderedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
index 8626e7f8f..11ddfd839 100644
--- a/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
@@ -14,14 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.keyvalue.MultiKey;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.keyvalue.MultiKey;
+import org.apache.commons.collections4.map.LRUMap;
+import org.apache.commons.collections4.map.MultiKeyMap;
 
 /**
  * JUnit tests.
@@ -439,18 +442,18 @@ public class MultiKeyMapTest<K, V> extends AbstractIterableMapTest<MultiKey<? ex
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "4.0";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj");
+//            "src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "src/test/resources/data/test/MultiKeyMap.fullCollection.version4.0.obj");
+//            "src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj");
 //    }
 
     /**
diff --git a/src/test/java/org/apache/commons/collections/map/MultiValueMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/map/MultiValueMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
index a6a2ee951..ebc04e554 100644
--- a/src/test/java/org/apache/commons/collections/map/MultiValueMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,10 +25,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.MultiMap;
 
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.MultiMap;
+import org.apache.commons.collections4.map.MultiValueMap;
 
 /**
  * TestMultiValueMap.
@@ -368,7 +369,7 @@ public class MultiValueMapTest<K, V> extends AbstractObjectTest {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.3";
+        return "4";
     }
 
     @Override
@@ -387,16 +388,6 @@ public class MultiValueMapTest<K, V> extends AbstractObjectTest {
         return new MultiValueMap();
     }
 
-//    public void testCreate() throws Exception {
-//        writeExternalFormToDisk(
-//            (java.io.Serializable) makeEmptyMap(),
-//            "/tmp/MultiValueMap.emptyCollection.version3.3.obj");
-//
-//        writeExternalFormToDisk(
-//            (java.io.Serializable) makeObject(),
-//            "/tmp/MultiValueMap.fullCollection.version3.3.obj");
-//    }
-
     public void testEmptyMapCompatibility() throws Exception {
         final Map<?,?> map = makeEmptyMap();
         final Map<?,?> map2 = (Map<?,?>) readExternalFormFromDisk(getCanonicalEmptyCollectionName(map));
@@ -413,4 +404,14 @@ public class MultiValueMapTest<K, V> extends AbstractObjectTest {
         assertEquals("Map had extra values", 0, map2.size());
     }
 
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) makeEmptyMap(),
+//            "src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj");
+//
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) makeObject(),
+//            "src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj");
+//    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
index e22e09536..f113903c1 100644
--- a/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,8 +22,9 @@ import java.util.concurrent.TimeUnit;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.map.PassiveExpiringMap.ExpirationPolicy;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.PassiveExpiringMap;
+import org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy;
 
 public class PassiveExpiringMapTest<K, V>
     extends AbstractMapTest<K, V> {
@@ -55,13 +56,13 @@ public class PassiveExpiringMapTest<K, V>
         super(testName);
     }
 
-    // public void testCreate() throws Exception {
-    // writeExternalFormToDisk((java.io.Serializable) makeObject(),
-    // "PassiveExpiringMap.emptyCollection.version4.obj");
-    //
-    // writeExternalFormToDisk((java.io.Serializable) makeFullMap(),
-    // "PassiveExpiringMap.fullCollection.version4.obj");
-    // }
+//    public void testCreate() throws Exception {
+//        writeExternalFormToDisk((java.io.Serializable) makeObject(),
+//                "src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj");
+//    
+//        writeExternalFormToDisk((java.io.Serializable) makeFullMap(),
+//                "src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj");
+//    }
 
     @Override
     public String getCompatibilityVersion() {
diff --git a/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
index 0ad2d0002..fe0e93b41 100644
--- a/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
+import org.apache.commons.collections4.map.PredicatedMap;
 
 /**
  * Extension of {@link AbstractMapTest} for exercising the 
@@ -125,17 +126,18 @@ public class PredicatedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/PredicatedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/PredicatedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
index f282deb7b..f4517757e 100644
--- a/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -23,8 +23,9 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
+import org.apache.commons.collections4.map.PredicatedSortedMap;
 
 /**
  * Extension of {@link PredicatedMapTest} for exercising the
@@ -172,17 +173,18 @@ public class PredicatedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/PredicatedSortedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
index cac42e4fc..c0a8d4dd4 100644
--- a/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.lang.ref.WeakReference;
 import java.util.Iterator;
@@ -22,9 +22,10 @@ import java.util.Map;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.map.ReferenceIdentityMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 
 /**
  * Tests for ReferenceIdentityMap.
@@ -71,9 +72,20 @@ public class ReferenceIdentityMapTest<K, V> extends AbstractIterableMapTest<K, V
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
+//    public void testCreate() throws Exception {
+//        resetEmpty();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj");
+//        resetFull();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj");
+//    }
+
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testBasics() {
diff --git a/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
index c2c6d6d17..093f188c1 100644
--- a/src/test/java/org/apache/commons/collections/map/ReferenceMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.ReferenceMap;
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 
 /**
  * Tests for ReferenceMap.
@@ -56,9 +57,20 @@ public class ReferenceMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
+//    public void testCreate() throws Exception {
+//        resetEmpty();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj");
+//        resetFull();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj");
+//    }
+    
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testNullHandling() {
diff --git a/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/map/SingletonMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
index c73c0f866..54344b2fb 100644
--- a/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
@@ -14,15 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BoundedMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.OrderedMap;
+import org.apache.commons.collections4.BoundedMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.map.ListOrderedMap;
+import org.apache.commons.collections4.map.SingletonMap;
+import org.apache.commons.collections4.map.UnmodifiableOrderedMap;
 
 /**
  * JUnit tests.
@@ -171,17 +174,18 @@ public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/SingletonMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/SingletonMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/SingletonMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
index a51896c0b..469d65504 100644
--- a/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.map.StaticBucketMap;
 
 /**
  * Unit tests.
diff --git a/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/collections/map/TransformedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
index f5695632d..f89f124aa 100644
--- a/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.map.TransformedMap;
 
 /**
  * Extension of {@link AbstractMapTest} for exercising the {@link TransformedMap}
@@ -137,17 +138,18 @@ public class TransformedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/TransformedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/TransformedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/TransformedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
index 9c11c3636..0552daede 100644
--- a/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.Map;
 import java.util.Set;
@@ -23,10 +23,11 @@ import java.util.TreeMap;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.map.TransformedSortedMap;
 
 /**
  * Extension of {@link AbstractSortedMapTest} for exercising the {@link TransformedSortedMap}
@@ -162,17 +163,17 @@ public class TransformedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V>
     //-----------------------------------------------------------------------
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/TransformedSortedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/TransformedSortedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj");
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
index 3560ed00d..b38d4c0a5 100644
--- a/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.map.UnmodifiableMap;
 
 /**
  * Extension of {@link AbstractMapTest} for exercising the
@@ -82,17 +83,18 @@ public class UnmodifiableMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
similarity index 85%
rename from src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
index 08401deb5..ea3aaf979 100644
--- a/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.HashMap;
 
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.map.ListOrderedMap;
+import org.apache.commons.collections4.map.UnmodifiableOrderedMap;
 
 /**
  * Extension of {@link AbstractOrderedMapTest} for exercising the
@@ -81,17 +83,18 @@ public class UnmodifiableOrderedMapTest<K, V> extends AbstractOrderedMapTest<K,
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java
rename to src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
index fb66b2540..341d58341 100644
--- a/src/test/java/org/apache/commons/collections/map/UnmodifiableSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.map;
+package org.apache.commons.collections4.map;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.map.UnmodifiableSortedMap;
 
 /**
  * Extension of {@link AbstractSortedMapTest} for exercising the
@@ -81,17 +82,18 @@ public class UnmodifiableSortedMapTest<K, V> extends AbstractSortedMapTest<K, V>
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
 //        resetEmpty();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj");
 //        resetFull();
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
-//            "D:/dev/collections/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj");
+//            "src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj");
 //    }
+
 }
diff --git a/src/test/java/org/apache/commons/collections/overview.html b/src/test/java/org/apache/commons/collections4/overview.html
similarity index 100%
rename from src/test/java/org/apache/commons/collections/overview.html
rename to src/test/java/org/apache/commons/collections4/overview.html
diff --git a/src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java
rename to src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
index b48104be7..762c60cf5 100644
--- a/src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,8 +28,9 @@ import java.util.NoSuchElementException;
 import java.util.Queue;
 
 import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.collection.AbstractCollectionTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
 
 /**
  * Test cases for CircularFifoQueue.
diff --git a/src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java
rename to src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
index 31aaf679a..6019a2cc4 100644
--- a/src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -22,8 +22,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.collection.PredicatedCollectionTest;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.collection.PredicatedCollectionTest;
 
 /**
  * Extension of {@link PredicatedCollectionTest} for exercising the
diff --git a/src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java
rename to src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
index 14cbe0f3d..00da6dc19 100644
--- a/src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.AbstractCollectionTest;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
diff --git a/src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java
rename to src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
index 1bb954eb1..795a3fc97 100644
--- a/src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.queue;
+package org.apache.commons.collections4.queue;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.commons.collections.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
 
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
diff --git a/src/test/java/org/apache/commons/collections/set/AbstractSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/set/AbstractSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
index 152cc1df6..09dea0c27 100644
--- a/src/test/java/org/apache/commons/collections/set/AbstractSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.collections.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
 
 /**
  * Abstract test class for {@link Set} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index 0c058bc55..42e4a73a1 100644
--- a/src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
 
 /**
  * Abstract test class for {@link SortedSet} methods and contracts.
diff --git a/src/test/java/org/apache/commons/collections/set/CompositeSetTest.java b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/collections/set/CompositeSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
index 67ad40ed1..5a7fb855b 100644
--- a/src/test/java/org/apache/commons/collections/set/CompositeSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.set.CompositeSet.SetMutator;
+import org.apache.commons.collections4.set.CompositeSet.SetMutator;
 
 /**
  * Extension of {@link AbstractSetTest} for exercising the
@@ -152,14 +152,14 @@ public class CompositeSetTest<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.3";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeSet.emptyCollection.version3.3.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeSet.fullCollection.version3.3.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/EmptySetMutator.java b/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java
similarity index 97%
rename from src/test/java/org/apache/commons/collections/set/EmptySetMutator.java
rename to src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java
index 9f9840e40..b53669ba3 100644
--- a/src/test/java/org/apache/commons/collections/set/EmptySetMutator.java
+++ b/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java
rename to src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
index 1644df644..1d294c8cf 100644
--- a/src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -156,7 +156,7 @@ public class ListOrderedSet2Test<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
 //    public void testCreate() throws Exception {
diff --git a/src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
index 32130094c..6d6a83be6 100644
--- a/src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -282,14 +282,14 @@ public class ListOrderedSetTest<E>
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-    //    public void testCreate() throws Exception {
-    //        resetEmpty();
-    //        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/ListOrderedSet.emptyCollection.version3.1.obj");
-    //        resetFull();
-    //        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/ListOrderedSet.fullCollection.version3.1.obj");
-    //    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
similarity index 96%
rename from src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java
rename to src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
index 98814263b..b280d1d7a 100644
--- a/src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.collections.map.LinkedMap;
+import org.apache.commons.collections4.map.LinkedMap;
 
 /**
  * JUnit test.
diff --git a/src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
similarity index 70%
rename from src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
index 1089ad01f..3bfecb5e8 100644
--- a/src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections4.map.HashedMap;
 
 /**
  * JUnit test.
@@ -39,14 +39,14 @@ public class MapBackedSetTest<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/MapBackedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/MapBackedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
index 03e6e76bd..218526f16 100644
--- a/src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Extension of {@link AbstractSetTest} for exercising the 
@@ -112,14 +112,14 @@ public class PredicatedSetTest<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
index 2873daa65..8dd780475 100644
--- a/src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -24,9 +24,9 @@ import java.util.TreeSet;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
  * Extension of {@link AbstractSortedSetTest} for exercising the
@@ -120,14 +120,14 @@ public class PredicatedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSortedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/TransformedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
similarity index 85%
rename from src/test/java/org/apache/commons/collections/set/TransformedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
index 67d5e0c81..5a0d6b631 100644
--- a/src/test/java/org/apache/commons/collections/set/TransformedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
 
 /**
  * Extension of {@link AbstractSetTest} for exercising the {@link TransformedSet}
@@ -101,14 +101,14 @@ public class TransformedSetTest<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
similarity index 84%
rename from src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
index 4af898594..cec1e7c95 100644
--- a/src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Arrays;
 import java.util.TreeSet;
@@ -23,9 +23,9 @@ import java.util.SortedSet;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
 
 /**
  * Extension of {@link AbstractSortedSetTest} for exercising the {@link TransformedSortedSet}
@@ -92,14 +92,14 @@ public class TransformedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSortedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSortedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
similarity index 79%
rename from src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
index b82c387ac..01b1e4db6 100644
--- a/src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -22,7 +22,7 @@ import java.util.Set;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
 
 /**
  * Extension of {@link AbstractSetTest} for exercising the
@@ -66,14 +66,14 @@ public class UnmodifiableSetTest<E> extends AbstractSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java
rename to src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
index 32eeec24c..87e752547 100644
--- a/src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.set;
+package org.apache.commons.collections4.set;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.TreeSet;
 
 import junit.framework.Test;
 
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
 
 /**
  * Extension of {@link AbstractSortedSetTest} for exercising the
@@ -140,14 +140,14 @@ public class UnmodifiableSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
     @Override
     public String getCompatibilityVersion() {
-        return "3.1";
+        return "4";
     }
 
-//    public void testCreate() throws Exception {
-//        resetEmpty();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj");
-//        resetFull();
-//        writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj");
-//    }
+    public void testCreate() throws Exception {
+        resetEmpty();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj");
+        resetFull();
+        writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj");
+    }
 
 }
diff --git a/src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java
rename to src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java
index 7163fe4ba..c201e7339 100644
--- a/src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java
@@ -14,21 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.splitmap;
+package org.apache.commons.collections4.splitmap;
 
 import java.io.*;
 import java.math.BigInteger;
 import java.util.HashMap;
 
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.functors.NOPTransformer;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.NOPTransformer;
 
 /**
  * Tests for {@link TransformedMap}
  *
  * TODO fix version, add Serialization tests
+ * FIXME the serialization result is stored as TransformedSplitMap.versionX.obj
+ * to distinguish it from the one for o.a.c.c.map.TransformedMap.
  *
  * @since 4.0
  * @version $Id$
@@ -124,7 +126,7 @@ public class TransformedMapTest extends BulkTest {
                 NOPTransformer.<String>nopTransformer(),
                 NOPTransformer.<String>nopTransformer() );
 
-        final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"/TransformedMap.emptyCollection.version3.2.obj" ) );
+        final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"/TransformedSplitMap.emptyCollection.version4.obj" ) );
         final Object readObject = in.readObject();
         in.close();
 
@@ -143,7 +145,7 @@ public class TransformedMapTest extends BulkTest {
         map.put( "e", "f" );
         map.put( "g", "h" );
 
-        final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"TransformedMap.fullCollection.version3.2.obj" ) );
+        final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"TransformedSplitMap.fullCollection.version4.obj" ) );
         final Object readObject = in.readObject();
         in.close();
 
@@ -151,15 +153,15 @@ public class TransformedMapTest extends BulkTest {
         assertFalse( "Map should not be empty", readMap.size() == 0 );
         assertEquals( map.entrySet(), readMap.entrySet() );
     }
-//
+
 //    public void testCreate() throws IOException {
-//        TransformedMap<String, String, String, String> map = TransformedMap.decorate(
+//        TransformedMap<String, String, String, String> map = TransformedMap.transformingMap(
 //                new HashMap<String, String>(),
-//                NOPTransformer.<String>getInstance(),
-//                NOPTransformer.<String>getInstance() );
+//                NOPTransformer.<String>nopTransformer(),
+//                NOPTransformer.<String>nopTransformer() );
 //
 //        ObjectOutputStream out = new ObjectOutputStream(
-//                new FileOutputStream( "data/test/TransformedMap.emptyCollection.version3.2.obj" ) );
+//                new FileOutputStream( "src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj" ) );
 //        out.writeObject( map );
 //
 //        map.put( "a", "b" );
@@ -168,7 +170,7 @@ public class TransformedMapTest extends BulkTest {
 //        map.put( "g", "h" );
 //
 //        out = new ObjectOutputStream(
-//                new FileOutputStream( "data/test/TransformedMap.fullCollection.version3.2.obj" ) );
+//                new FileOutputStream( "src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj" ) );
 //        out.writeObject( map );
 //    }
 }
diff --git a/src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java b/src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java
rename to src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java
index b0b5085c5..d15ba4938 100644
--- a/src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.math.BigInteger;
 import java.util.Map;
diff --git a/src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java
rename to src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
index eadf318fc..fdeaf5ea5 100755
--- a/src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.collections.trie;
+package org.apache.commons.collections4.trie;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -33,7 +33,7 @@ import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import org.apache.commons.collections.Trie.Cursor;
+import org.apache.commons.collections4.Trie.Cursor;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj b/src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj
deleted file mode 100644
index 2591e235e..000000000
Binary files a/src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj b/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj
new file mode 100644
index 000000000..8b4837763
Binary files /dev/null and b/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ArrayStack.fullCollection.version1.obj b/src/test/resources/data/test/ArrayStack.fullCollection.version1.obj
deleted file mode 100644
index 9a623e4dc..000000000
Binary files a/src/test/resources/data/test/ArrayStack.fullCollection.version1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj b/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj
new file mode 100644
index 000000000..8a2540607
Binary files /dev/null and b/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/BooleanComparator.version3.obj b/src/test/resources/data/test/BooleanComparator.version3.obj
deleted file mode 100644
index d91b6b886..000000000
Binary files a/src/test/resources/data/test/BooleanComparator.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/BooleanComparator.version4.obj b/src/test/resources/data/test/BooleanComparator.version4.obj
new file mode 100644
index 000000000..b5901f518
Binary files /dev/null and b/src/test/resources/data/test/BooleanComparator.version4.obj differ
diff --git a/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj b/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj
deleted file mode 100644
index cedcdcd3d..000000000
Binary files a/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj b/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..8d3633c12
Binary files /dev/null and b/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj b/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj
deleted file mode 100644
index eddebf0fd..000000000
Binary files a/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj b/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj
new file mode 100644
index 000000000..088702cd3
Binary files /dev/null and b/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj b/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj
index 6cb4deaad..c9dd8935c 100644
Binary files a/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj and b/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj b/src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj
index 96bcd900d..6984760db 100644
Binary files a/src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj and b/src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ComparableComparator.version2.obj b/src/test/resources/data/test/ComparableComparator.version2.obj
deleted file mode 100644
index 595e59048..000000000
Binary files a/src/test/resources/data/test/ComparableComparator.version2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ComparableComparator.version4.obj b/src/test/resources/data/test/ComparableComparator.version4.obj
new file mode 100644
index 000000000..77e82b68b
Binary files /dev/null and b/src/test/resources/data/test/ComparableComparator.version4.obj differ
diff --git a/src/test/resources/data/test/ComparatorChain.version2.obj b/src/test/resources/data/test/ComparatorChain.version2.obj
deleted file mode 100644
index 66dcce07b..000000000
Binary files a/src/test/resources/data/test/ComparatorChain.version2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ComparatorChain.version4.obj b/src/test/resources/data/test/ComparatorChain.version4.obj
new file mode 100644
index 000000000..2dc99454a
Binary files /dev/null and b/src/test/resources/data/test/ComparatorChain.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj b/src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj
deleted file mode 100644
index 4c19ee157..000000000
Binary files a/src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj
new file mode 100644
index 000000000..61bac5631
Binary files /dev/null and b/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj b/src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj
deleted file mode 100644
index b0daa230f..000000000
Binary files a/src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj b/src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj
new file mode 100644
index 000000000..8476e54e7
Binary files /dev/null and b/src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeMap.emptyCollection.version3.3.obj b/src/test/resources/data/test/CompositeMap.emptyCollection.version3.3.obj
deleted file mode 100644
index eb4dfd563..000000000
Binary files a/src/test/resources/data/test/CompositeMap.emptyCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..488cbe01c
Binary files /dev/null and b/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj b/src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj
deleted file mode 100644
index 9262aadd4..000000000
Binary files a/src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj b/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj
new file mode 100644
index 000000000..65229b18a
Binary files /dev/null and b/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj b/src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj
deleted file mode 100644
index 1e13dcc4f..000000000
Binary files a/src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..6937c372a
Binary files /dev/null and b/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CompositeSet.fullCollection.version3.3.obj b/src/test/resources/data/test/CompositeSet.fullCollection.version3.3.obj
deleted file mode 100644
index e22530830..000000000
Binary files a/src/test/resources/data/test/CompositeSet.fullCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj b/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj
new file mode 100644
index 000000000..6cb2231c9
Binary files /dev/null and b/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj b/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj
new file mode 100644
index 000000000..552ef3db4
Binary files /dev/null and b/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj b/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj
new file mode 100644
index 000000000..5a3696f61
Binary files /dev/null and b/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj b/src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj
deleted file mode 100644
index 7ac1eb0c7..000000000
Binary files a/src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj b/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..ef1f681fc
Binary files /dev/null and b/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DefaultedMap.fullCollection.version3.2.obj b/src/test/resources/data/test/DefaultedMap.fullCollection.version3.2.obj
deleted file mode 100644
index 2665584e1..000000000
Binary files a/src/test/resources/data/test/DefaultedMap.fullCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj b/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..c4541b52d
Binary files /dev/null and b/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj b/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj
deleted file mode 100644
index c8c431895..000000000
Binary files a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj b/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..90a5a17c6
Binary files /dev/null and b/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj b/src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj
deleted file mode 100644
index a5448baad..000000000
Binary files a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj b/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj
new file mode 100644
index 000000000..76dfe97b0
Binary files /dev/null and b/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj b/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj
index 91074a9df..1a86e2dcb 100644
Binary files a/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj and b/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj b/src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj
index bc38b6943..acaf87b56 100644
Binary files a/src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj and b/src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj
deleted file mode 100644
index 56783aa78..000000000
Binary files a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.obj
deleted file mode 100644
index e7875f3fd..000000000
Binary files a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj
new file mode 100644
index 000000000..7bd0dc183
Binary files /dev/null and b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..f6c4ffd1f
Binary files /dev/null and b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj
deleted file mode 100644
index fdab60ce5..000000000
Binary files a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj
new file mode 100644
index 000000000..2a746e07b
Binary files /dev/null and b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj differ
diff --git a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.obj b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj
similarity index 63%
rename from src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.obj
rename to src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj
index ff7ea0940..cda6c5cb1 100644
Binary files a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.obj and b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedOrderComparator.version4.obj b/src/test/resources/data/test/FixedOrderComparator.version4.obj
index 979f64e90..f11e12169 100644
Binary files a/src/test/resources/data/test/FixedOrderComparator.version4.obj and b/src/test/resources/data/test/FixedOrderComparator.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeList.emptyCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeList.emptyCollection.version3.1.obj
deleted file mode 100644
index e8f063824..000000000
Binary files a/src/test/resources/data/test/FixedSizeList.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj b/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj
new file mode 100644
index 000000000..dbaee55e5
Binary files /dev/null and b/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeList.fullCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeList.fullCollection.version3.1.obj
deleted file mode 100644
index 10e60a8da..000000000
Binary files a/src/test/resources/data/test/FixedSizeList.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj b/src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj
new file mode 100644
index 000000000..a882e27ee
Binary files /dev/null and b/src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj
deleted file mode 100644
index a22abc377..000000000
Binary files a/src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj b/src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..7d2d859b4
Binary files /dev/null and b/src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj
deleted file mode 100644
index a865775f2..000000000
Binary files a/src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj b/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj
new file mode 100644
index 000000000..39ce1bd60
Binary files /dev/null and b/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index bdfaf67e3..000000000
Binary files a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..65475c7e6
Binary files /dev/null and b/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj
similarity index 73%
rename from src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj
rename to src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj
index 0260e21b9..0390613ec 100644
Binary files a/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj and b/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj b/src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj
deleted file mode 100644
index 2f30ffa20..000000000
Binary files a/src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj b/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj
new file mode 100644
index 000000000..891277be3
Binary files /dev/null and b/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj b/src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj
deleted file mode 100644
index 3e3665812..000000000
Binary files a/src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj b/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj
new file mode 100644
index 000000000..795ff1180
Binary files /dev/null and b/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj b/src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj
deleted file mode 100644
index 8a0532354..000000000
Binary files a/src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/GrowthList.emptyCollection.version4.obj b/src/test/resources/data/test/GrowthList.emptyCollection.version4.obj
new file mode 100644
index 000000000..62e810027
Binary files /dev/null and b/src/test/resources/data/test/GrowthList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/GrowthList.fullCollection.version3.2.obj b/src/test/resources/data/test/GrowthList.fullCollection.version3.2.obj
deleted file mode 100644
index a97bbe2a3..000000000
Binary files a/src/test/resources/data/test/GrowthList.fullCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/GrowthList.fullCollection.version4.obj b/src/test/resources/data/test/GrowthList.fullCollection.version4.obj
new file mode 100644
index 000000000..69a4598d2
Binary files /dev/null and b/src/test/resources/data/test/GrowthList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/HashBag.emptyCollection.version3.obj b/src/test/resources/data/test/HashBag.emptyCollection.version3.obj
deleted file mode 100644
index e74098603..000000000
Binary files a/src/test/resources/data/test/HashBag.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/HashBag.emptyCollection.version4.obj b/src/test/resources/data/test/HashBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..6fd5e3512
Binary files /dev/null and b/src/test/resources/data/test/HashBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/HashBag.fullCollection.version3.obj b/src/test/resources/data/test/HashBag.fullCollection.version3.obj
deleted file mode 100644
index 9ec908180..000000000
Binary files a/src/test/resources/data/test/HashBag.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/HashBag.fullCollection.version4.obj b/src/test/resources/data/test/HashBag.fullCollection.version4.obj
new file mode 100644
index 000000000..0348fd7b7
Binary files /dev/null and b/src/test/resources/data/test/HashBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/HashedMap.emptyCollection.version3.obj b/src/test/resources/data/test/HashedMap.emptyCollection.version3.obj
deleted file mode 100644
index fa5d88d3e..000000000
Binary files a/src/test/resources/data/test/HashedMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj b/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..bd1d97976
Binary files /dev/null and b/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/HashedMap.fullCollection.version3.obj b/src/test/resources/data/test/HashedMap.fullCollection.version4.obj
similarity index 83%
rename from src/test/resources/data/test/HashedMap.fullCollection.version3.obj
rename to src/test/resources/data/test/HashedMap.fullCollection.version4.obj
index 9e7abbe96..3185f410e 100644
Binary files a/src/test/resources/data/test/HashedMap.fullCollection.version3.obj and b/src/test/resources/data/test/HashedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LRUMap.emptyCollection.version3.obj b/src/test/resources/data/test/LRUMap.emptyCollection.version3.obj
deleted file mode 100644
index eff363cee..000000000
Binary files a/src/test/resources/data/test/LRUMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj b/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..3a8ee54a5
Binary files /dev/null and b/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LRUMap.fullCollection.version4.obj b/src/test/resources/data/test/LRUMap.fullCollection.version4.obj
new file mode 100644
index 000000000..360bd51e5
Binary files /dev/null and b/src/test/resources/data/test/LRUMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LazyMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/LazyMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 6548b35c9..000000000
Binary files a/src/test/resources/data/test/LazyMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj b/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..ac3db2612
Binary files /dev/null and b/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj b/src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj
deleted file mode 100644
index 60efc78f1..000000000
Binary files a/src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LazyMap.fullCollection.version4.obj b/src/test/resources/data/test/LazyMap.fullCollection.version4.obj
new file mode 100644
index 000000000..d2e3a9c60
Binary files /dev/null and b/src/test/resources/data/test/LazyMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 4ee9e516b..000000000
Binary files a/src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..d150b34a0
Binary files /dev/null and b/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LazySortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj
similarity index 50%
rename from src/test/resources/data/test/LazySortedMap.fullCollection.version3.1.obj
rename to src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj
index 37570dbd8..b46538b60 100644
Binary files a/src/test/resources/data/test/LazySortedMap.fullCollection.version3.1.obj and b/src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LinkedMap.emptyCollection.version3.obj b/src/test/resources/data/test/LinkedMap.emptyCollection.version3.obj
deleted file mode 100644
index a23e4553f..000000000
Binary files a/src/test/resources/data/test/LinkedMap.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj b/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..de86081d9
Binary files /dev/null and b/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/LinkedMap.fullCollection.version3.obj b/src/test/resources/data/test/LinkedMap.fullCollection.version3.obj
deleted file mode 100644
index 63f4ab345..000000000
Binary files a/src/test/resources/data/test/LinkedMap.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/LRUMap.fullCollection.version3.obj b/src/test/resources/data/test/LinkedMap.fullCollection.version4.obj
similarity index 61%
rename from src/test/resources/data/test/LRUMap.fullCollection.version3.obj
rename to src/test/resources/data/test/LinkedMap.fullCollection.version4.obj
index d40bce461..695c69e47 100644
Binary files a/src/test/resources/data/test/LRUMap.fullCollection.version3.obj and b/src/test/resources/data/test/LinkedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ListOrderedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 89dbcbcdf..000000000
Binary files a/src/test/resources/data/test/ListOrderedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj b/src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..50b798bf0
Binary files /dev/null and b/src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj
deleted file mode 100644
index 3e3d5eab8..000000000
Binary files a/src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj b/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..1d03465cb
Binary files /dev/null and b/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index 9ef613cd9..000000000
Binary files a/src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj b/src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..0d23e1aeb
Binary files /dev/null and b/src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ListOrderedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedSet.fullCollection.version3.1.obj
deleted file mode 100644
index d8f57dfbb..000000000
Binary files a/src/test/resources/data/test/ListOrderedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj b/src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..b18daa686
Binary files /dev/null and b/src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index 5c34fb61b..000000000
Binary files a/src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj b/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..8a4c2c0ef
Binary files /dev/null and b/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj
deleted file mode 100644
index b02dd61df..000000000
Binary files a/src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj b/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..a0bcab276
Binary files /dev/null and b/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj b/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj
deleted file mode 100644
index 3e5f4d5c0..000000000
Binary files a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj b/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..dad0648c3
Binary files /dev/null and b/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.0.obj b/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.0.obj
deleted file mode 100644
index 4eedd7e24..000000000
Binary files a/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.0.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj b/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj
new file mode 100644
index 000000000..845e14b51
Binary files /dev/null and b/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MultiValueMap.emptyCollection.version3.3.obj b/src/test/resources/data/test/MultiValueMap.emptyCollection.version3.3.obj
deleted file mode 100644
index ab339eb37..000000000
Binary files a/src/test/resources/data/test/MultiValueMap.emptyCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj b/src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..45288ccbd
Binary files /dev/null and b/src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj b/src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj
deleted file mode 100644
index c6d5aa549..000000000
Binary files a/src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj b/src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj
new file mode 100644
index 000000000..0df29614d
Binary files /dev/null and b/src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj b/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj
deleted file mode 100644
index 209bd4e00..000000000
Binary files a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj b/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj
new file mode 100644
index 000000000..f70df10cc
Binary files /dev/null and b/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version3.obj b/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version3.obj
deleted file mode 100644
index b34808c7d..000000000
Binary files a/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj b/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj
new file mode 100644
index 000000000..97cd575f7
Binary files /dev/null and b/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/NullComparator.version2.obj1 b/src/test/resources/data/test/NullComparator.version2.obj1
deleted file mode 100644
index 056e48b4e..000000000
Binary files a/src/test/resources/data/test/NullComparator.version2.obj1 and /dev/null differ
diff --git a/src/test/resources/data/test/NullComparator.version2.obj2 b/src/test/resources/data/test/NullComparator.version2.obj2
deleted file mode 100644
index b1a16c80a..000000000
Binary files a/src/test/resources/data/test/NullComparator.version2.obj2 and /dev/null differ
diff --git a/src/test/resources/data/test/NullComparator.version4.obj1 b/src/test/resources/data/test/NullComparator.version4.obj1
new file mode 100644
index 000000000..4540f191a
Binary files /dev/null and b/src/test/resources/data/test/NullComparator.version4.obj1 differ
diff --git a/src/test/resources/data/test/NullComparator.version4.obj2 b/src/test/resources/data/test/NullComparator.version4.obj2
new file mode 100644
index 000000000..5bfbfd95a
Binary files /dev/null and b/src/test/resources/data/test/NullComparator.version4.obj2 differ
diff --git a/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj b/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj
index 9a961c7b6..3574211e0 100644
Binary files a/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj and b/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj b/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj
index d724556dd..ab281b1ef 100644
Binary files a/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj and b/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedBag.emptyCollection.version3.1.obj
deleted file mode 100644
index f1c626c35..000000000
Binary files a/src/test/resources/data/test/PredicatedBag.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..1ebdd003c
Binary files /dev/null and b/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj
deleted file mode 100644
index 1af48edc2..000000000
Binary files a/src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj
new file mode 100644
index 000000000..8024c4644
Binary files /dev/null and b/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedCollection.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedCollection.emptyCollection.version3.1.obj
deleted file mode 100644
index 547dd649e..000000000
Binary files a/src/test/resources/data/test/PredicatedCollection.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj
new file mode 100644
index 000000000..f5402db38
Binary files /dev/null and b/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedCollection.fullCollection.version3.1.obj
deleted file mode 100644
index ae8f0e955..000000000
Binary files a/src/test/resources/data/test/PredicatedCollection.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj
new file mode 100644
index 000000000..d51a26774
Binary files /dev/null and b/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedList.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedList.emptyCollection.version3.1.obj
deleted file mode 100644
index 772d9ebb8..000000000
Binary files a/src/test/resources/data/test/PredicatedList.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj
new file mode 100644
index 000000000..549b012c6
Binary files /dev/null and b/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj
deleted file mode 100644
index 1e1410bdc..000000000
Binary files a/src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj
new file mode 100644
index 000000000..bd3b6e816
Binary files /dev/null and b/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 6f350644b..000000000
Binary files a/src/test/resources/data/test/PredicatedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..fb9bf8d1b
Binary files /dev/null and b/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj
deleted file mode 100644
index 0eedaedce..000000000
Binary files a/src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..ccbad9bc5
Binary files /dev/null and b/src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj
index 0a210ab3c..073f63cdf 100644
Binary files a/src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj and b/src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj
index 5d6afec97..497f78452 100644
Binary files a/src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj and b/src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index 1e74c661e..000000000
Binary files a/src/test/resources/data/test/PredicatedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..6447fc6ea
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj
deleted file mode 100644
index 3faca8f23..000000000
Binary files a/src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..5df948ff8
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj
deleted file mode 100644
index 4494f63de..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..e6c1a15c5
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj
deleted file mode 100644
index f1a62a184..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj
new file mode 100644
index 000000000..b8b25c4d8
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 192eb7295..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..a070b544b
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj
deleted file mode 100644
index e6ba6c66a..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..93ced4588
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index 948058251..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..3ee6b5528
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj
deleted file mode 100644
index 780265b21..000000000
Binary files a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..0adbfb5be
Binary files /dev/null and b/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 64ebde74b..000000000
Binary files a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj b/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..7b262fe83
Binary files /dev/null and b/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj
deleted file mode 100644
index 6d42d87b0..000000000
Binary files a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj b/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj
new file mode 100644
index 000000000..dd85eb88c
Binary files /dev/null and b/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 13e2efc99..000000000
Binary files a/src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj b/src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..f0326ec64
Binary files /dev/null and b/src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ReferenceMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj
similarity index 67%
rename from src/test/resources/data/test/ReferenceMap.fullCollection.version3.1.obj
rename to src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj
index d0824bbcb..4dd7b798f 100644
Binary files a/src/test/resources/data/test/ReferenceMap.fullCollection.version3.1.obj and b/src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/ReverseComparator.version2.obj b/src/test/resources/data/test/ReverseComparator.version4.obj
similarity index 52%
rename from src/test/resources/data/test/ReverseComparator.version2.obj
rename to src/test/resources/data/test/ReverseComparator.version4.obj
index 2dea524d1..e54a8dacd 100644
Binary files a/src/test/resources/data/test/ReverseComparator.version2.obj and b/src/test/resources/data/test/ReverseComparator.version4.obj differ
diff --git a/src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj b/src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj
deleted file mode 100644
index 8f750ab5b..000000000
Binary files a/src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj b/src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj
deleted file mode 100644
index 4dfc23179..000000000
Binary files a/src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SetUniqueList.emptyCollection.version3.1.obj b/src/test/resources/data/test/SetUniqueList.emptyCollection.version3.1.obj
deleted file mode 100644
index 6fbadaebd..000000000
Binary files a/src/test/resources/data/test/SetUniqueList.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj b/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj
new file mode 100644
index 000000000..d18b84222
Binary files /dev/null and b/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj b/src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj
deleted file mode 100644
index 37a21b6bf..000000000
Binary files a/src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj b/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj
new file mode 100644
index 000000000..01c6dc862
Binary files /dev/null and b/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 89dbcbcdf..000000000
Binary files a/src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj b/src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..d25857522
Binary files /dev/null and b/src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj b/src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj
deleted file mode 100644
index ef4b96742..000000000
Binary files a/src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/SingletonMap.fullCollection.version4.obj b/src/test/resources/data/test/SingletonMap.fullCollection.version4.obj
new file mode 100644
index 000000000..56a4e1a79
Binary files /dev/null and b/src/test/resources/data/test/SingletonMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version3.1.obj b/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj
similarity index 58%
rename from src/test/resources/data/test/SynchronizedCollection.emptyCollection.version3.1.obj
rename to src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj
index 48c0c012c..fc11bea43 100644
Binary files a/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version3.1.obj and b/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/SynchronizedCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj
similarity index 85%
rename from src/test/resources/data/test/SynchronizedCollection.fullCollection.version3.1.obj
rename to src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj
index 05b8b71e1..d9450cff5 100644
Binary files a/src/test/resources/data/test/SynchronizedCollection.fullCollection.version3.1.obj and b/src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj
deleted file mode 100644
index 28ee32051..000000000
Binary files a/src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..b643a8e9e
Binary files /dev/null and b/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj
deleted file mode 100644
index e494e44b5..000000000
Binary files a/src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj b/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj
new file mode 100644
index 000000000..f0bdff710
Binary files /dev/null and b/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedCollection.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedCollection.emptyCollection.version3.1.obj
deleted file mode 100644
index 9eec5fd56..000000000
Binary files a/src/test/resources/data/test/TransformedCollection.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj
new file mode 100644
index 000000000..16399bd69
Binary files /dev/null and b/src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedCollection.fullCollection.version3.1.obj
deleted file mode 100644
index 4a579cf42..000000000
Binary files a/src/test/resources/data/test/TransformedCollection.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj b/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj
new file mode 100644
index 000000000..d3c5818fe
Binary files /dev/null and b/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj
deleted file mode 100644
index d1c2b16d5..000000000
Binary files a/src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj
new file mode 100644
index 000000000..34b1fbb56
Binary files /dev/null and b/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedList.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedList.fullCollection.version3.1.obj
deleted file mode 100644
index 9ab8e06ff..000000000
Binary files a/src/test/resources/data/test/TransformedList.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedList.fullCollection.version4.obj b/src/test/resources/data/test/TransformedList.fullCollection.version4.obj
new file mode 100644
index 000000000..ecdcc39a1
Binary files /dev/null and b/src/test/resources/data/test/TransformedList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 881bd7d32..000000000
Binary files a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj b/src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj
deleted file mode 100644
index 010748cdd..000000000
Binary files a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..6d6433df6
Binary files /dev/null and b/src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj
deleted file mode 100644
index be8bb3974..000000000
Binary files a/src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj b/src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj
deleted file mode 100644
index 7a41b3463..000000000
Binary files a/src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedMap.fullCollection.version4.obj b/src/test/resources/data/test/TransformedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..bdb035bd1
Binary files /dev/null and b/src/test/resources/data/test/TransformedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj
index 4d586a114..af01fcc21 100644
Binary files a/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj and b/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj b/src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj
index 4be7e6d4e..1b23e41bf 100644
Binary files a/src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj and b/src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index a6e376b87..000000000
Binary files a/src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..ef6852c46
Binary files /dev/null and b/src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj
deleted file mode 100644
index 402382ba3..000000000
Binary files a/src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..d8a1cd89f
Binary files /dev/null and b/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj
deleted file mode 100644
index 8c38659ee..000000000
Binary files a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..02420ab87
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj
deleted file mode 100644
index b98e583ea..000000000
Binary files a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj
new file mode 100644
index 000000000..59c4b4c87
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index e185c429a..000000000
Binary files a/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..b21204cb1
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj
deleted file mode 100644
index a52118607..000000000
Binary files a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..ea7d60b58
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index 3b132cabe..000000000
Binary files a/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..14c736e1c
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSortedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedSet.fullCollection.version3.1.obj
deleted file mode 100644
index 7f8c5529c..000000000
Binary files a/src/test/resources/data/test/TransformedSortedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..ba9ae1ba5
Binary files /dev/null and b/src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..f0cc10c72
Binary files /dev/null and b/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj
new file mode 100644
index 000000000..cea50c79e
Binary files /dev/null and b/src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TransformingComparator.version4.obj b/src/test/resources/data/test/TransformingComparator.version4.obj
index 19d010103..c13321055 100644
Binary files a/src/test/resources/data/test/TransformingComparator.version4.obj and b/src/test/resources/data/test/TransformingComparator.version4.obj differ
diff --git a/src/test/resources/data/test/TreeBag.emptyCollection.version3.obj b/src/test/resources/data/test/TreeBag.emptyCollection.version3.obj
deleted file mode 100644
index feb0d433f..000000000
Binary files a/src/test/resources/data/test/TreeBag.emptyCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj b/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj
new file mode 100644
index 000000000..607687f2a
Binary files /dev/null and b/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TreeBag.fullCollection.version3.obj b/src/test/resources/data/test/TreeBag.fullCollection.version3.obj
deleted file mode 100644
index 987570e11..000000000
Binary files a/src/test/resources/data/test/TreeBag.fullCollection.version3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TreeBag.fullCollection.version4.obj b/src/test/resources/data/test/TreeBag.fullCollection.version4.obj
new file mode 100644
index 000000000..7459cfde6
Binary files /dev/null and b/src/test/resources/data/test/TreeBag.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj b/src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj
deleted file mode 100644
index d74791e35..000000000
Binary files a/src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/TreeBidiMap.fullCollection.version3.3.obj b/src/test/resources/data/test/TreeBidiMap.fullCollection.version3.3.obj
deleted file mode 100644
index 492cdc58e..000000000
Binary files a/src/test/resources/data/test/TreeBidiMap.fullCollection.version3.3.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj
deleted file mode 100644
index a2e3b31ca..000000000
Binary files a/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj
new file mode 100644
index 000000000..24a998026
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj
deleted file mode 100644
index 0034a9af6..000000000
Binary files a/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj
new file mode 100644
index 000000000..ee6774715
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj
deleted file mode 100644
index c7f049547..000000000
Binary files a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj
new file mode 100644
index 000000000..2d132cca1
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableList.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableList.fullCollection.version3.1.obj
deleted file mode 100644
index 5fb11cf45..000000000
Binary files a/src/test/resources/data/test/UnmodifiableList.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj
new file mode 100644
index 000000000..75202ef34
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj
deleted file mode 100644
index a5786598e..000000000
Binary files a/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..980139965
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj
deleted file mode 100644
index 91ae85a2b..000000000
Binary files a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj
new file mode 100644
index 000000000..8ce8a1f3a
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index 89b4d0670..000000000
Binary files a/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..d25857522
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj
deleted file mode 100644
index 6077984d8..000000000
Binary files a/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj
new file mode 100644
index 000000000..979de2653
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj
index 572726ba2..a483dfb03 100644
Binary files a/src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj and b/src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj
index 13b80cd59..aefa6779e 100644
Binary files a/src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj and b/src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version3.1.obj
deleted file mode 100644
index c53a7c856..000000000
Binary files a/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..a8f07e492
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj
deleted file mode 100644
index 888e6adce..000000000
Binary files a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj
new file mode 100644
index 000000000..a0903c1fc
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj
deleted file mode 100644
index d8bcab945..000000000
Binary files a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj
new file mode 100644
index 000000000..7eb1c626e
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
similarity index 73%
rename from src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj
rename to src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
index 6a0104d54..f58fb9dac 100644
Binary files a/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj and b/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj
deleted file mode 100644
index abedad76e..000000000
Binary files a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj
new file mode 100644
index 000000000..ce0c85af2
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj
deleted file mode 100644
index 4b46e50a8..000000000
Binary files a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj and /dev/null differ
diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj
new file mode 100644
index 000000000..20cc23986
Binary files /dev/null and b/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj differ
diff --git a/src/test/resources/org/apache/commons/collections/trie/hamlet.txt b/src/test/resources/org/apache/commons/collections4/trie/hamlet.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/collections/trie/hamlet.txt
rename to src/test/resources/org/apache/commons/collections4/trie/hamlet.txt