diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
similarity index 99%
rename from accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
rename to accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
index 6886307cda431eaf2d421780a91a25c07f375bb1..51dcd5e56b3ee4163ad0be0e22ac1efe4de6f0e3 100644
--- a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
+++ b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
@@ -16,7 +16,7 @@
  * LICENSE file.
  */
 
-package com.yahoo.ycsb.db;
+package com.yahoo.ycsb.db.accumulo;
 
 import com.yahoo.ycsb.ByteArrayByteIterator;
 import com.yahoo.ycsb.ByteIterator;
diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/ZKProducerConsumer.java
similarity index 100%
rename from accumulo/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java
rename to accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/ZKProducerConsumer.java
diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c85b6ac902f6f08e5921b443f65091b374a9b46
--- /dev/null
+++ b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2015, YCSB contributors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License. See accompanying
+ * LICENSE file.
+ */
+
+/**
+ * The YCSB binding for <a href="https://accumulo.apache.org/">Apache Accumulo</a>.
+ */
+package com.yahoo.ycsb.db.accumulo;
+
diff --git a/bin/ycsb b/bin/ycsb
index 1f0834d1be8bf72b6eae59054350cd5c29ff2c84..90010a7d6118b5f914089dd5a6d0d8b7fed70ccc 100755
--- a/bin/ycsb
+++ b/bin/ycsb
@@ -49,7 +49,7 @@ COMMANDS = {
 }
 
 DATABASES = {
-    "accumulo"     : "com.yahoo.ycsb.db.AccumuloClient",
+    "accumulo"     : "com.yahoo.ycsb.db.accumulo.AccumuloClient",
     "aerospike"    : "com.yahoo.ycsb.db.AerospikeClient",
     "basic"        : "com.yahoo.ycsb.BasicDB",
     "cassandra-7"  : "com.yahoo.ycsb.db.CassandraClient7",