diff --git a/setup.py b/setup.py
index 1a52d20..e21d0fc 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ __version__ = '1.0'
 METADATA = dict(
 	name = "twython",
 	version = __version__,
-	py_modules = ['twython'],
+	py_modules = ['twython/core', 'twython/twyauth', 'twython/streaming', 'twython/oauth'],
 	author = 'Ryan McGrath',
 	author_email = 'ryan@venodesigns.net',
 	description = 'An easy (and up to date) way to access Twitter data with Python.',
diff --git a/twython/__init__.py b/twython/__init__.py
index 083a571..00deffe 100644
--- a/twython/__init__.py
+++ b/twython/__init__.py
@@ -1 +1 @@
-import core, oauth, streaming
+import core, twyauth, streaming
diff --git a/twython/oauth/oauth.py b/twython/oauth.py
similarity index 100%
rename from twython/oauth/oauth.py
rename to twython/oauth.py
diff --git a/twython/oauth/__init__.pyc b/twython/oauth/__init__.pyc
deleted file mode 100644
index 3b8a498..0000000
Binary files a/twython/oauth/__init__.pyc and /dev/null differ
diff --git a/twython/oauth/oauth.pyc b/twython/oauth/oauth.pyc
deleted file mode 100644
index cef4c6e..0000000
Binary files a/twython/oauth/oauth.pyc and /dev/null differ
diff --git a/twython/streaming/__init__.py b/twython/streaming.py
similarity index 100%
rename from twython/streaming/__init__.py
rename to twython/streaming.py
diff --git a/twython/streaming/__init__.pyc b/twython/streaming/__init__.pyc
deleted file mode 100644
index f1c6bf7..0000000
Binary files a/twython/streaming/__init__.pyc and /dev/null differ
diff --git a/twython/oauth/__init__.py b/twython/twyauth.py
similarity index 100%
rename from twython/oauth/__init__.py
rename to twython/twyauth.py