diff --git a/kafka/__init__.py b/kafka/__init__.py
new file mode 100644
index 0000000..69bc75f
--- /dev/null
+++ b/kafka/__init__.py
@@ -0,0 +1 @@
+__all__ = ["kafka"]
diff --git a/kafka.py b/kafka/kafka.py
similarity index 100%
rename from kafka.py
rename to kafka/kafka.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..52bf07a
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,12 @@
+from distutils.core import setup
+
+setup(
+    name="Kafka Python Client",
+    version="0.1-alpha",
+    author="David Arthur",
+    author_email="mumrah@gmail.com",
+    url="https://github.com/mumrah/kafka-python",
+    packages=["kafka"],
+    license="Copyright 2012, David Arthur under Apache License, v2.0",
+    long_description=open("README.md").read(),
+)
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/integration.py b/test/integration.py
index fccf28f..197f5ec 100644
--- a/test/integration.py
+++ b/test/integration.py
@@ -11,7 +11,7 @@ from threading import Thread, Event
 import time
 import unittest
 
-from kafka import KafkaClient, ProduceRequest, FetchRequest
+from kafka.kafka import KafkaClient, ProduceRequest, FetchRequest
 
 def get_open_port():
     sock = socket.socket()
diff --git a/test/unit.py b/test/unit.py
index 5c48f27..c77aa81 100644
--- a/test/unit.py
+++ b/test/unit.py
@@ -3,8 +3,8 @@ import random
 import struct
 import unittest
 
-from kafka import KafkaClient, ProduceRequest, FetchRequest
-from kafka import gzip_encode, gzip_decode, length_prefix_message
+from kafka.kafka import KafkaClient, ProduceRequest, FetchRequest
+from kafka.kafka import gzip_encode, gzip_decode, length_prefix_message
 
 ITERATIONS = 1000
 STRLEN = 100