diff --git a/src/java/com/samskivert/tests/jdbc/depot/TestRecord.java b/src/java/com/samskivert/jdbc/tests/TestRecord.java
similarity index 100%
rename from src/java/com/samskivert/tests/jdbc/depot/TestRecord.java
rename to src/java/com/samskivert/jdbc/tests/TestRecord.java
diff --git a/src/java/com/samskivert/tests/jdbc/depot/TestRepository.java b/src/java/com/samskivert/jdbc/tests/TestRepository.java
similarity index 100%
rename from src/java/com/samskivert/tests/jdbc/depot/TestRepository.java
rename to src/java/com/samskivert/jdbc/tests/TestRepository.java
diff --git a/src/java/com/samskivert/tests/servlet/SiteResourceLoaderTest.java b/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/servlet/SiteResourceLoaderTest.java
rename to src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java
diff --git a/src/java/com/samskivert/tests/swing/AdjustTestApp.java b/src/java/com/samskivert/swing/tests/AdjustTestApp.java
similarity index 100%
rename from src/java/com/samskivert/tests/swing/AdjustTestApp.java
rename to src/java/com/samskivert/swing/tests/AdjustTestApp.java
diff --git a/src/java/com/samskivert/tests/swing/LabelDemo.java b/src/java/com/samskivert/swing/tests/LabelDemo.java
similarity index 100%
rename from src/java/com/samskivert/tests/swing/LabelDemo.java
rename to src/java/com/samskivert/swing/tests/LabelDemo.java
diff --git a/src/java/com/samskivert/tests/swing/TestComboButtonBox.java b/src/java/com/samskivert/swing/tests/TestComboButtonBox.java
similarity index 100%
rename from src/java/com/samskivert/tests/swing/TestComboButtonBox.java
rename to src/java/com/samskivert/swing/tests/TestComboButtonBox.java
diff --git a/src/java/com/samskivert/tests/swing/util/ProximityTrackerTest.java b/src/java/com/samskivert/swing/tests/util/ProximityTrackerTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/swing/util/ProximityTrackerTest.java
rename to src/java/com/samskivert/swing/tests/util/ProximityTrackerTest.java
diff --git a/src/java/com/samskivert/tests/util/ArrayIntSetTest.java b/src/java/com/samskivert/util/tests/ArrayIntSetTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/ArrayIntSetTest.java
rename to src/java/com/samskivert/util/tests/ArrayIntSetTest.java
diff --git a/src/java/com/samskivert/tests/util/ArrayUtilTest.java b/src/java/com/samskivert/util/tests/ArrayUtilTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/ArrayUtilTest.java
rename to src/java/com/samskivert/util/tests/ArrayUtilTest.java
diff --git a/src/java/com/samskivert/tests/util/CheapIntMapTest.java b/src/java/com/samskivert/util/tests/CheapIntMapTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/CheapIntMapTest.java
rename to src/java/com/samskivert/util/tests/CheapIntMapTest.java
diff --git a/src/java/com/samskivert/tests/util/CollectionUtilTest.java b/src/java/com/samskivert/util/tests/CollectionUtilTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/CollectionUtilTest.java
rename to src/java/com/samskivert/util/tests/CollectionUtilTest.java
diff --git a/src/java/com/samskivert/tests/util/ConfigTest.java b/src/java/com/samskivert/util/tests/ConfigTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/ConfigTest.java
rename to src/java/com/samskivert/util/tests/ConfigTest.java
diff --git a/src/java/com/samskivert/tests/util/ConfigUtilTest.java b/src/java/com/samskivert/util/tests/ConfigUtilTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/ConfigUtilTest.java
rename to src/java/com/samskivert/util/tests/ConfigUtilTest.java
diff --git a/src/java/com/samskivert/tests/util/HashIntMapTest.java b/src/java/com/samskivert/util/tests/HashIntMapTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/HashIntMapTest.java
rename to src/java/com/samskivert/util/tests/HashIntMapTest.java
diff --git a/src/java/com/samskivert/tests/util/IntListUtilTest.java b/src/java/com/samskivert/util/tests/IntListUtilTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/IntListUtilTest.java
rename to src/java/com/samskivert/util/tests/IntListUtilTest.java
diff --git a/src/java/com/samskivert/tests/util/LRUHashMapTest.java b/src/java/com/samskivert/util/tests/LRUHashMapTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/LRUHashMapTest.java
rename to src/java/com/samskivert/util/tests/LRUHashMapTest.java
diff --git a/src/java/com/samskivert/tests/util/ObserverListTest.java b/src/java/com/samskivert/util/tests/ObserverListTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/ObserverListTest.java
rename to src/java/com/samskivert/util/tests/ObserverListTest.java
diff --git a/src/java/com/samskivert/tests/util/QuickSortTest.java b/src/java/com/samskivert/util/tests/QuickSortTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/QuickSortTest.java
rename to src/java/com/samskivert/util/tests/QuickSortTest.java
diff --git a/src/java/com/samskivert/tests/util/SerialExecutorTest.java b/src/java/com/samskivert/util/tests/SerialExecutorTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/SerialExecutorTest.java
rename to src/java/com/samskivert/util/tests/SerialExecutorTest.java
diff --git a/src/java/com/samskivert/tests/util/StringUtilTest.java b/src/java/com/samskivert/util/tests/StringUtilTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/StringUtilTest.java
rename to src/java/com/samskivert/util/tests/StringUtilTest.java
diff --git a/src/java/com/samskivert/tests/util/SystemInfoDemo.java b/src/java/com/samskivert/util/tests/SystemInfoDemo.java
similarity index 100%
rename from src/java/com/samskivert/tests/util/SystemInfoDemo.java
rename to src/java/com/samskivert/util/tests/SystemInfoDemo.java
diff --git a/src/java/com/samskivert/tests/xml/SetFieldRuleTest.java b/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java
similarity index 100%
rename from src/java/com/samskivert/tests/xml/SetFieldRuleTest.java
rename to src/java/com/samskivert/xml/tests/SetFieldRuleTest.java