diff --git a/setup.py b/setup.py
index b08f0cbd..236f0997 100644
--- a/setup.py
+++ b/setup.py
@@ -39,15 +39,15 @@ setup(name='dependency-injector',
       maintainer_email='rmogilatov@gmail.com',
       url='https://github.com/ets-labs/python-dependency-injector',
       download_url='https://pypi.python.org/pypi/dependency_injector',
-      install_requires=requirements,
-      # extras_require={
-      #     'yaml': [
-      #         'pyyaml',
-      #     ],
-      # },
+      packages=[
+          'dependency_injector',
+      ],
       package_dir={
           '': 'src',
       },
+      package_data={
+          'dependency_injector': ['*.pxd'],
+      },
       ext_modules=[
           Extension('dependency_injector.containers',
                     ['src/dependency_injector/containers.c'],
@@ -58,8 +58,11 @@ setup(name='dependency-injector',
                     define_macros=list(defined_macros.items()),
                     extra_compile_args=['-O2']),
       ],
-      package_data={
-          'dependency_injector': ['*.pxd'],
+      install_requires=requirements,
+      extras_require={
+          'yaml': [
+              'pyyaml',
+          ],
       },
       zip_safe=True,
       license='BSD New',