diff --git a/pom.xml b/pom.xml
index d731054..516958f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,6 @@ under the License.
   </scm>
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
 
     <testResources>
diff --git a/src/java/org/apache/commons/logging/Log.java b/src/main/java/org/apache/commons/logging/Log.java
similarity index 100%
rename from src/java/org/apache/commons/logging/Log.java
rename to src/main/java/org/apache/commons/logging/Log.java
diff --git a/src/java/org/apache/commons/logging/LogConfigurationException.java b/src/main/java/org/apache/commons/logging/LogConfigurationException.java
similarity index 100%
rename from src/java/org/apache/commons/logging/LogConfigurationException.java
rename to src/main/java/org/apache/commons/logging/LogConfigurationException.java
diff --git a/src/java/org/apache/commons/logging/LogFactory.java b/src/main/java/org/apache/commons/logging/LogFactory.java
similarity index 100%
rename from src/java/org/apache/commons/logging/LogFactory.java
rename to src/main/java/org/apache/commons/logging/LogFactory.java
diff --git a/src/java/org/apache/commons/logging/LogSource.java b/src/main/java/org/apache/commons/logging/LogSource.java
similarity index 100%
rename from src/java/org/apache/commons/logging/LogSource.java
rename to src/main/java/org/apache/commons/logging/LogSource.java
diff --git a/src/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/AvalonLogger.java
rename to src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
diff --git a/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
rename to src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
diff --git a/src/java/org/apache/commons/logging/impl/Jdk14Logger.java b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/Jdk14Logger.java
rename to src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
diff --git a/src/java/org/apache/commons/logging/impl/Log4JLogger.java b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/Log4JLogger.java
rename to src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
rename to src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
diff --git a/src/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/LogKitLogger.java
rename to src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
diff --git a/src/java/org/apache/commons/logging/impl/NoOpLog.java b/src/main/java/org/apache/commons/logging/impl/NoOpLog.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/NoOpLog.java
rename to src/main/java/org/apache/commons/logging/impl/NoOpLog.java
diff --git a/src/java/org/apache/commons/logging/impl/ServletContextCleaner.java b/src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/ServletContextCleaner.java
rename to src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java
diff --git a/src/java/org/apache/commons/logging/impl/SimpleLog.java b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/SimpleLog.java
rename to src/main/java/org/apache/commons/logging/impl/SimpleLog.java
diff --git a/src/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/WeakHashtable.java
rename to src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
diff --git a/src/java/org/apache/commons/logging/impl/package.html b/src/main/java/org/apache/commons/logging/impl/package.html
similarity index 100%
rename from src/java/org/apache/commons/logging/impl/package.html
rename to src/main/java/org/apache/commons/logging/impl/package.html
diff --git a/src/java/org/apache/commons/logging/package.html b/src/main/java/org/apache/commons/logging/package.html
similarity index 100%
rename from src/java/org/apache/commons/logging/package.html
rename to src/main/java/org/apache/commons/logging/package.html
diff --git a/src/java/overview.html b/src/main/java/overview.html
similarity index 100%
rename from src/java/overview.html
rename to src/main/java/overview.html