diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/Chore.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/Chore.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/Chore.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/Stoppable.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/Stoppable.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/Stoppable.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/Stoppable.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/HasThread.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/util/HasThread.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/util/HasThread.java
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
similarity index 100%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java