diff --git a/hadoop-common-project/hadoop-common-client/pom.xml b/hadoop-common-project/hadoop-common-client/pom.xml
index cd360c5..c9e634b 100644
--- a/hadoop-common-project/hadoop-common-client/pom.xml
+++ b/hadoop-common-project/hadoop-common-client/pom.xml
@@ -47,13 +47,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Writable.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/Writable.java
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Writable.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/Writable.java
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparable.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/WritableComparable.java
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparable.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/WritableComparable.java
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactory.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/WritableFactory.java
similarity index 97%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactory.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/WritableFactory.java
index bb8af97..6f39d14 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactory.java
+++ b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/WritableFactory.java
@@ -22,7 +22,6 @@
 import org.apache.hadoop.classification.InterfaceStability;
 
 /** A factory for a class of Writable.
- * @see WritableFactories
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AtMostOnce.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/AtMostOnce.java
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AtMostOnce.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/AtMostOnce.java
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/Idempotent.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/Idempotent.java
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/Idempotent.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/Idempotent.java
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java b/hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java
rename to hadoop-common-project/hadoop-common-client/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java