diff --git a/.gitignore b/.gitignore
index d871ada..e17f89f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ dist
 build
 eggs
 parts
-bin
 var
 sdist
 develop-eggs
@@ -34,6 +33,7 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+*.sublime*
 
 #
 .idea
diff --git a/MANIFEST.in b/MANIFEST.in
index 9a0722e..35e8522 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,7 @@
-include *.txt
-include *.md
-include gooey\images\*
-include gooey\languages\*
+include README.md
+include LICENSE.txt
+include MANIFEST.in
+recursive-include gooey/images *
+recursive-include gooey/languages *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
diff --git a/gooey/__init__.py b/gooey/__init__.py
index fff2c09..dacbfff 100644
--- a/gooey/__init__.py
+++ b/gooey/__init__.py
@@ -1 +1,6 @@
-from gooey_decorator import Gooey
+try:
+    from gooey_decorator import Gooey
+except:
+    pass
+
+__version__ = '0.1.0'
diff --git a/gooey/languages/__init__.py b/gooey/languages/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.py b/setup.py
index da884cc..9d88fc2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,35 +1,25 @@
-import os 
+"""Script for setuptools."""
+
 from setuptools import setup, find_packages
 
 
 with open('README.md') as readme:
-  long_description = readme.read()
-
-local_path = os.path.join(os.path.dirname(__file__), 'gooey') 
-
-imagepath = os.path.join(local_path, 'images')
-langpath  = os.path.join(local_path, 'languages')
-
-images = [os.path.join(imagepath, image) for image in os.listdir(imagepath)]
+    long_description = readme.read()
 
-languages = [os.path.join(langpath, lang)
-            for lang in os.listdir(langpath)
-            if '.py' not in lang]
+version = __import__('gooey').__version__
 
 setup(
     name='Gooey',
-    version='0.1.0',
+    version=version,
+    url='http://pypi.python.org/pypi/Gooey/',
     author='Chris Kiehl',
     author_email='audionautic@gmail.com',
-    package_data={
-      '': ['*.txt', '*.png', '*.jpg', '*.json', '*.ico', '*.gif']
-    },
+    description=('Turn (almost) any command line program into a full GUI '
+                 'application with one line'),
+    license='MIT',
     packages=find_packages(),
-    url='http://pypi.python.org/pypi/Gooey/',
-    dependency_links = [
-        "http://www.wxpython.org/download.php"
-    ],
-    license='LICENSE.txt',
+    include_package_data=True,
+    dependency_links = ["http://www.wxpython.org/download.php"],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -37,6 +27,5 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7'
     ],
-    description='Turn (almost) any command line program into a full GUI application with one line',
     long_description=long_description
 )
diff --git a/test.py b/test.py
deleted file mode 100644
index e61f713..0000000
--- a/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-'''
-Created on Feb 9, 2014
-
-@author: Chris
-'''
-
-from gooey import Gooey
-
-if __name__ == '__main__':
-	pass	
\ No newline at end of file