diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BASE64.java b/common/common-io/src/main/java/com/twelvemonkeys/util/BASE64.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BASE64.java
rename to common/common-io/src/main/java/com/twelvemonkeys/util/BASE64.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/BeanUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/BeanUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/DateUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/DateUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/MathUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/MathUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/MathUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/MathUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/StringUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/StringUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/SystemUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/SystemUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/SystemUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/SystemUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Validate.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/Validate.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Validate.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/Validate.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/package_info.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/package_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractResource.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractResource.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractResource.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BeanMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/BeanMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BeanMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/BeanMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BooleanKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BooleanKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/CollectionUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/CollectionUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/CollectionUtil.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/CollectionUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ExpiringMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ExpiringMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ExpiringMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ExpiringMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FileResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FileResource.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FileResource.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FileResource.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FilterIterator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FilterIterator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FloatKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FloatKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IntegerKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IntegerKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUHashMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUHashMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedSet.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedSet.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedSet.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedSet.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/NullMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/NullMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/NullMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/NullMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/PaintKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/PaintKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Resource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Resource.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Resource.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Resource.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringKey.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Time.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Time.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Time.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Time.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeFormat.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TimeFormat.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeFormat.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TimeFormat.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeoutMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TimeoutMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeoutMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TimeoutMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TokenIterator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TokenIterator.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TokenIterator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TypedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TypedMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/URLResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/URLResource.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/URLResource.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/URLResource.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Visitor.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Visitor.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Visitor.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Visitor.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/XMLProperties.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/XMLProperties.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/XMLProperties.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/XMLProperties.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/Converter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/Converter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/Converter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/Converter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/package_info.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/package_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/package_info.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/package_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/package_info.java
rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/package_info.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java
rename to common/common-lang/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java