diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/session/type/KafkaSession.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSession.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/kafka/session/type/KafkaSession.java
rename to src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSession.java
index b5a16df..b2c714a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/session/type/KafkaSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSession.java
@@ -12,11 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.kafka.session.type;
+package com.googlesource.gerrit.plugins.kafka.session;
 
 import com.googlesource.gerrit.plugins.kafka.config.KafkaProperties;
-import com.googlesource.gerrit.plugins.kafka.session.Session;
-
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSessionFactory.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSessionFactory.java
index d4b6e80..6260ad3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSessionFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/session/KafkaSessionFactory.java
@@ -15,7 +15,6 @@
 package com.googlesource.gerrit.plugins.kafka.session;
 
 import com.googlesource.gerrit.plugins.kafka.config.KafkaProperties;
-import com.googlesource.gerrit.plugins.kafka.session.type.KafkaSession;
 
 public class KafkaSessionFactory {
   public Session create(KafkaProperties properties) {