diff --git a/src/test/org/apache/commons/logging/AbstractLogTest.java b/src/test/java/org/apache/commons/logging/AbstractLogTest.java
similarity index 100%
rename from src/test/org/apache/commons/logging/AbstractLogTest.java
rename to src/test/java/org/apache/commons/logging/AbstractLogTest.java
diff --git a/src/test/org/apache/commons/logging/AltHashtable.java b/src/test/java/org/apache/commons/logging/AltHashtable.java
similarity index 100%
rename from src/test/org/apache/commons/logging/AltHashtable.java
rename to src/test/java/org/apache/commons/logging/AltHashtable.java
diff --git a/src/test/org/apache/commons/logging/AltHashtableTestCase.java b/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/AltHashtableTestCase.java
rename to src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
diff --git a/src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java b/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java
rename to src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
diff --git a/src/test/org/apache/commons/logging/BasicOperationsTestCase.java b/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/BasicOperationsTestCase.java
rename to src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
diff --git a/src/test/org/apache/commons/logging/DummyException.java b/src/test/java/org/apache/commons/logging/DummyException.java
similarity index 100%
rename from src/test/org/apache/commons/logging/DummyException.java
rename to src/test/java/org/apache/commons/logging/DummyException.java
diff --git a/src/test/org/apache/commons/logging/LoadTestCase.java b/src/test/java/org/apache/commons/logging/LoadTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/LoadTestCase.java
rename to src/test/java/org/apache/commons/logging/LoadTestCase.java
diff --git a/src/test/org/apache/commons/logging/LogTestCase.java b/src/test/java/org/apache/commons/logging/LogTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/LogTestCase.java
rename to src/test/java/org/apache/commons/logging/LogTestCase.java
diff --git a/src/test/org/apache/commons/logging/NullClassLoaderTestCase.java b/src/test/java/org/apache/commons/logging/NullClassLoaderTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/NullClassLoaderTestCase.java
rename to src/test/java/org/apache/commons/logging/NullClassLoaderTestCase.java
diff --git a/src/test/org/apache/commons/logging/PathableClassLoader.java b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
similarity index 100%
rename from src/test/org/apache/commons/logging/PathableClassLoader.java
rename to src/test/java/org/apache/commons/logging/PathableClassLoader.java
diff --git a/src/test/org/apache/commons/logging/PathableTestSuite.java b/src/test/java/org/apache/commons/logging/PathableTestSuite.java
similarity index 100%
rename from src/test/org/apache/commons/logging/PathableTestSuite.java
rename to src/test/java/org/apache/commons/logging/PathableTestSuite.java
diff --git a/src/test/org/apache/commons/logging/SimpleLogTestCase.java b/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/SimpleLogTestCase.java
rename to src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
diff --git a/src/test/org/apache/commons/logging/UserClass.java b/src/test/java/org/apache/commons/logging/UserClass.java
similarity index 100%
rename from src/test/org/apache/commons/logging/UserClass.java
rename to src/test/java/org/apache/commons/logging/UserClass.java
diff --git a/src/test/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
rename to src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
diff --git a/src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java b/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties b/src/test/java/org/apache/commons/logging/config/nopriority/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/config/nopriority/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/config/priority10/commons-logging.properties b/src/test/java/org/apache/commons/logging/config/priority10/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/config/priority10/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/config/priority10/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/config/priority20/commons-logging.properties b/src/test/java/org/apache/commons/logging/config/priority20/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/config/priority20/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/config/priority20/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties b/src/test/java/org/apache/commons/logging/config/priority20a/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/config/priority20a/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTest.java
similarity index 100%
rename from src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
rename to src/test/java/org/apache/commons/logging/impl/WeakHashtableTest.java
diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfig.properties b/src/test/java/org/apache/commons/logging/jdk14/CustomConfig.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/CustomConfig.properties
rename to src/test/java/org/apache/commons/logging/jdk14/CustomConfig.properties
diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/jdk14/TestHandler.java b/src/test/java/org/apache/commons/logging/jdk14/TestHandler.java
similarity index 100%
rename from src/test/org/apache/commons/logging/jdk14/TestHandler.java
rename to src/test/java/org/apache/commons/logging/jdk14/TestHandler.java
diff --git a/src/test/org/apache/commons/logging/log4j/StandardTests.java b/src/test/java/org/apache/commons/logging/log4j/StandardTests.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/StandardTests.java
rename to src/test/java/org/apache/commons/logging/log4j/StandardTests.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/Log4j12StandardTests.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/Log4j12StandardTests.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/Log4j12StandardTests.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/Log4j12StandardTests.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
diff --git a/src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/TestAppender.java
similarity index 100%
rename from src/test/org/apache/commons/logging/log4j/log4j12/TestAppender.java
rename to src/test/java/org/apache/commons/logging/log4j/log4j12/TestAppender.java
diff --git a/src/test/org/apache/commons/logging/logkit/StandardTestCase.java b/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/logkit/StandardTestCase.java
rename to src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
diff --git a/src/test/org/apache/commons/logging/noop/NoOpLogTestCase.java b/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/noop/NoOpLogTestCase.java
rename to src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
diff --git a/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
diff --git a/src/test/org/apache/commons/logging/pathable/GeneralTestCase.java b/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/pathable/GeneralTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
diff --git a/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
diff --git a/src/test/org/apache/commons/logging/security/MockSecurityManager.java b/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java
similarity index 100%
rename from src/test/org/apache/commons/logging/security/MockSecurityManager.java
rename to src/test/java/org/apache/commons/logging/security/MockSecurityManager.java
diff --git a/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java
rename to src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
diff --git a/src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
rename to src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
diff --git a/src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java b/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
rename to src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
diff --git a/src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java b/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java b/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java b/src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java
similarity index 100%
rename from src/test/org/apache/commons/logging/simple/DecoratedSimpleLog.java
rename to src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java
diff --git a/src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
diff --git a/src/test/org/apache/commons/logging/simple/LogRecord.java b/src/test/java/org/apache/commons/logging/simple/LogRecord.java
similarity index 100%
rename from src/test/org/apache/commons/logging/simple/LogRecord.java
rename to src/test/java/org/apache/commons/logging/simple/LogRecord.java
diff --git a/src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/NullTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/NullTCCLTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/custom/MyLog.java b/src/test/java/org/apache/commons/logging/tccl/custom/MyLog.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/custom/MyLog.java
rename to src/test/java/org/apache/commons/logging/tccl/custom/MyLog.java
diff --git a/src/test/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java b/src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java
rename to src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java
diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/log/props_disable_tccl/commons-logging.properties b/src/test/java/org/apache/commons/logging/tccl/log/props_disable_tccl/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/log/props_disable_tccl/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/tccl/log/props_disable_tccl/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/tccl/log/props_enable_tccl/commons-logging.properties b/src/test/java/org/apache/commons/logging/tccl/log/props_enable_tccl/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/log/props_enable_tccl/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/tccl/log/props_enable_tccl/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/props_disable_tccl/commons-logging.properties b/src/test/java/org/apache/commons/logging/tccl/logfactory/props_disable_tccl/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/logfactory/props_disable_tccl/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/tccl/logfactory/props_disable_tccl/commons-logging.properties
diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/props_enable_tccl/commons-logging.properties b/src/test/java/org/apache/commons/logging/tccl/logfactory/props_enable_tccl/commons-logging.properties
similarity index 100%
rename from src/test/org/apache/commons/logging/tccl/logfactory/props_enable_tccl/commons-logging.properties
rename to src/test/java/org/apache/commons/logging/tccl/logfactory/props_enable_tccl/commons-logging.properties