diff --git a/discord/ext/__init__.py b/discord/ext/__init__.py
deleted file mode 100644
index 73194d95d..000000000
--- a/discord/ext/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-discord.py extensions
-~~~~~~~~~~~~~~~~~~~~~~
-
-Extensions for the discord.py library live in this namespace.
-
-:copyright: (c) 2017 Rapptz
-:license: MIT, see LICENSE for more details.
-
-"""
diff --git a/setup.py b/setup.py
index 212c12696..15b7769f5 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(name='discord.py',
       author='Rapptz',
       url='https://github.com/Rapptz/discord.py',
       version=version,
-      packages=find_packages(),
+      packages=['discord', 'discord.ext.commands'],
       license='MIT',
       description='A python wrapper for the Discord API',
       long_description=readme,
@@ -44,6 +44,7 @@ setup(name='discord.py',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',