diff --git a/.gitignore b/.gitignore
index 19e8c91..1b686fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 *.pyc
-MANIFEST
\ No newline at end of file
+MANIFEST
+/build
+*.egg-info
+/dist
+.DS_Store
\ No newline at end of file
diff --git a/cloudkick_api/__init__.py b/cloudkick/__init__.py
similarity index 88%
rename from cloudkick_api/__init__.py
rename to cloudkick/__init__.py
index 4c82bb2..20803ef 100644
--- a/cloudkick_api/__init__.py
+++ b/cloudkick/__init__.py
@@ -15,7 +15,7 @@
 
 
 __all__ = ["__version__", "Connection"]
-__version__ = "0.1.0-dev"
+__version__ = "0.2.0"
 
-from cloudkick_api.base import Connection
-from cloudkick_api import fabhelper as fab
+from cloudkick.base import Connection
+from cloudkick import fabhelper as fab
diff --git a/cloudkick_api/base.py b/cloudkick/base.py
similarity index 100%
rename from cloudkick_api/base.py
rename to cloudkick/base.py
diff --git a/cloudkick_api/endpoints.py b/cloudkick/endpoints.py
similarity index 100%
rename from cloudkick_api/endpoints.py
rename to cloudkick/endpoints.py
diff --git a/cloudkick_api/fabhelper.py b/cloudkick/fabhelper.py
similarity index 98%
rename from cloudkick_api/fabhelper.py
rename to cloudkick/fabhelper.py
index 1324670..dd51926 100644
--- a/cloudkick_api/fabhelper.py
+++ b/cloudkick/fabhelper.py
@@ -18,7 +18,7 @@
 
 import sys
 
-from cloudkick_api.base import Connection
+from cloudkick.base import Connection
 
 _QUERY_CACHE = {}
 
diff --git a/examples/gcharts.py b/examples/gcharts.py
index acc3302..902174c 100644
--- a/examples/gcharts.py
+++ b/examples/gcharts.py
@@ -18,7 +18,7 @@
   import simplejson as json
 
 
-from cloudkick_api.base import Connection
+from cloudkick.base import Connection
 from pprint import pprint
 from pygooglechart import SimpleLineChart
 from pygooglechart import Axis
diff --git a/setup.py b/setup.py
index 6256018..a9a3ce9 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='cloudkick',
-    version='0.1.0-dev',
+    version='0.2.0',
     description='',
     author='Cloudkick, Inc.',
     author_email='support@cloudkick.ccom',