diff --git a/MANIFEST b/MANIFEST
index 3c54057..9557647 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,48 +2,41 @@
 LICENSE.txt
 README.txt
 setup.py
-dist\Gooey-0.1.0\LICENSE.txt
-dist\Gooey-0.1.0\README.txt
-dist\Gooey-0.1.0\dist\Gooey-0.1.0\LICENSE.txt
-dist\Gooey-0.1.0\dist\Gooey-0.1.0\README.txt
-dist\Gooey-0.1.0\dist\Gooey-0.1.0\gooey\TODO.txt
-dist\Gooey-0.1.0\gooey\TODO.txt
-gooey\TODO.txt
 gooey\__init__.py
 gooey\codegen.py
-gooey\gooey.py
+gooey\gooey_decorator.py
 gooey\i18n.py
+gooey\i18n_config.py
 gooey\i18n_unittest.py
+gooey\image_repository.py
 gooey\monkey_parser.py
+gooey\parser_exceptions.py
 gooey\source_parser.py
 gooey\source_parser_unittest.py
-gooey\test_queue.py
-gooey\app\__init__.py
-gooey\app\dialogs\__init__.py
-gooey\app\dialogs\action_sorter.py
-gooey\app\dialogs\action_sorter_unittest.py
-gooey\app\dialogs\advanced_config.py
-gooey\app\dialogs\advanced_config_unittest.py
-gooey\app\dialogs\argparse_test_data.py
-gooey\app\dialogs\base_window.py
-gooey\app\dialogs\basic_config_panel.py
-gooey\app\dialogs\component_factory.py
-gooey\app\dialogs\component_register.py
-gooey\app\dialogs\component_register_unittest.py
-gooey\app\dialogs\components.py
-gooey\app\dialogs\components_unittest.py
-gooey\app\dialogs\config_model.py
-gooey\app\dialogs\controller.py
-gooey\app\dialogs\display_main.py
-gooey\app\dialogs\footer.py
-gooey\app\dialogs\header.py
-gooey\app\dialogs\imageutil.py
-gooey\app\dialogs\msg_dialog.py
-gooey\app\dialogs\option_reader.py
-gooey\app\dialogs\option_reader_unittest.py
-gooey\app\dialogs\runtime_display_panel.py
-gooey\app\images\__init__.py
-gooey\app\images\image_store.py
+gooey\gui\__init__.py
+gooey\gui\action_sorter.py
+gooey\gui\action_sorter_unittest.py
+gooey\gui\advanced_config.py
+gooey\gui\advanced_config_unittest.py
+gooey\gui\argparse_test_data.py
+gooey\gui\base_window.py
+gooey\gui\basic_config_panel.py
+gooey\gui\client_app.py
+gooey\gui\component_factory.py
+gooey\gui\component_register.py
+gooey\gui\component_register_unittest.py
+gooey\gui\components.py
+gooey\gui\components_unittest.py
+gooey\gui\controller.py
+gooey\gui\display_main.py
+gooey\gui\footer.py
+gooey\gui\header.py
+gooey\gui\imageutil.py
+gooey\gui\msg_dialog.py
+gooey\gui\option_reader.py
+gooey\gui\option_reader_unittest.py
+gooey\gui\runtime_display_panel.py
+gooey\gui\styling.py
 gooey\languages\__init__.py
 gooey\languages\eng.py
 gooey\mockapplications\__init__.py
@@ -51,5 +44,3 @@ gooey\mockapplications\example_argparse_souce_in_main.py
 gooey\mockapplications\example_argparse_souce_in_try.py
 gooey\mockapplications\mockapp.py
 gooey\mockapplications\module_with_no_argparse.py
-gooey\themes\__init__.py
-gooey\themes\thm.py
diff --git a/README.md b/README.md
index 51d3104..95cd460 100644
--- a/README.md
+++ b/README.md
@@ -215,4 +215,5 @@ Wanna help?
 
 
 
+
   [1]: http://i.imgur.com/7fKUvw9.png
\ No newline at end of file
diff --git a/setup.py b/setup.py
index b5710f7..979d5d9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,19 @@
 from distutils.core import setup
 
 setup(
-		name='Gooey',
-		version='0.1.0',
-		author='Chris Kiehl',
-		author_email='ckiehl@gmail.com',
-		packages=[
-					'gooey', 
-					'gooey.languages', 
-					'gooey.app', 
-					'gooey.app.dialogs', 
-					'gooey.app.images', 
-					'gooey.mockapplications',
-					'gooey.themes'],
-		url='http://pypi.python.org/pypi/TowelStuff/',
-		license='LICENSE.txt',
-		description='Useful towel-related stuff.',
-		long_description=open('README.txt').read()
+    name='Gooey',
+    version='0.1.0',
+    author='Chris Kiehl',
+    author_email='ckiehl@gmail.com',
+    packages=[
+      'gooey',
+      'gooey.gui',
+      'gooey.images',
+      'gooey.languages',
+      'gooey.mockapplications',
+    ],
+    url='http://pypi.python.org/pypi/TowelStuff/',
+    license='LICENSE.txt',
+    description='Turn (almost) any command line program into a full GUI application with one line',
+    long_description=open('README.md').read()
 )
\ No newline at end of file