diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/CoordinatedStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/CoordinatedStateManager.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/CoordinatedStateManager.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/CoordinatedStateManager.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/Server.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/TableStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/TableStateManager.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/TableStateManager.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/TableStateManager.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableStateManager.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableStateManager.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableStateManager.java