diff --git a/athena_dl/__init__.py b/athena_dl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/athena_batch_query.py b/athena_dl/athena_batch_query.py
similarity index 98%
rename from athena_batch_query.py
rename to athena_dl/athena_batch_query.py
index 9ecd0b2..47660db 100644
--- a/athena_batch_query.py
+++ b/athena_dl/athena_batch_query.py
@@ -1,7 +1,5 @@
 import logging
 import pprint
-import sys
-import traceback
 
 import boto3
 from retrying import retry
diff --git a/athena_dl.py b/athena_dl/athena_dl.py
similarity index 100%
rename from athena_dl.py
rename to athena_dl/athena_dl.py
diff --git a/setup.py b/setup.py
index a72a660..19aee75 100644
--- a/setup.py
+++ b/setup.py
@@ -5,14 +5,16 @@
  
 setup(
     name='Athena-DL',
-    version='0.1',
-    description='CLI to ',
+    version='0.5',
+    description='command line interface to query SQL to Amazon Athena and save its results',
     author='George Yoshida',
     url='https://github.com/quiver/athena-dl',
-    py_modules=['athena'],
+    packages=['athena_dl'],
+    include_package_data=True,
     install_requires=[
+        'boto3',
         'Click',
-        'retry',
+        'retrying',
     ],
    classifiers=(
        'Development Status :: 3 - Alpha',
@@ -21,6 +23,6 @@
    ),
     entry_points='''
         [console_scripts]
-        athena-dl=athena_dl:cli
+        athena-dl=athena_dl.athena_dl:cli
     '''
 )