diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/BooleanKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/BooleanKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/FloatKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/FloatKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/IntegerKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/IntegerKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/PaintKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/PaintKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/StringKey.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/StringKey.java
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/TypedMap.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java
rename to sandbox/sandbox-common/src/main/java/com/twelvemonkeys/util/TypedMap.java