diff --git a/Usage.md b/Usage.md
index cf8b9f9..1fcce26 100644
--- a/Usage.md
+++ b/Usage.md
@@ -40,7 +40,7 @@ Cortex4py 2 has the following structure:
 ```plain
 ├── cortex4py
 │   ├── api
-│   ├── controller
+│   ├── controllers
 │   │   ├── abstract
 │   │   ├── analyzers
 │   │   ├── jobs
@@ -59,7 +59,7 @@ Cortex4py 2 has the following structure:
 ```
 
 - The **model** classes represent the data objects and extend the `cortex4py.models.Model` that provides `json()` methods returning a JSON `dict` from every model object.
-- The **controller** classes wrap the available methods that call Cortex APIs.
+- The **controllers** classes wrap the available methods that call Cortex APIs.
 - The **api** class is the main class giving access to the different controllers.
 - **query.*** are utility methods that allow building search queries.
 - **exceptions.*** are supported exceptions
diff --git a/cortex4py/api.py b/cortex4py/api.py
index 93f624f..7a10a0d 100644
--- a/cortex4py/api.py
+++ b/cortex4py/api.py
@@ -6,10 +6,10 @@
 import warnings
 
 from .exceptions import *
-from .controller.organizations import OrganizationsController
-from .controller.users import UsersController
-from .controller.jobs import JobsController
-from .controller.analyzers import AnalyzersController
+from .controllers.organizations import OrganizationsController
+from .controllers.users import UsersController
+from .controllers.jobs import JobsController
+from .controllers.analyzers import AnalyzersController
 
 
 class Api(object):
diff --git a/cortex4py/controller/__init__.py b/cortex4py/controllers/__init__.py
similarity index 100%
rename from cortex4py/controller/__init__.py
rename to cortex4py/controllers/__init__.py
diff --git a/cortex4py/controller/abstract.py b/cortex4py/controllers/abstract.py
similarity index 100%
rename from cortex4py/controller/abstract.py
rename to cortex4py/controllers/abstract.py
diff --git a/cortex4py/controller/analyzers.py b/cortex4py/controllers/analyzers.py
similarity index 100%
rename from cortex4py/controller/analyzers.py
rename to cortex4py/controllers/analyzers.py
diff --git a/cortex4py/controller/jobs.py b/cortex4py/controllers/jobs.py
similarity index 100%
rename from cortex4py/controller/jobs.py
rename to cortex4py/controllers/jobs.py
diff --git a/cortex4py/controller/organizations.py b/cortex4py/controllers/organizations.py
similarity index 100%
rename from cortex4py/controller/organizations.py
rename to cortex4py/controllers/organizations.py
diff --git a/cortex4py/controller/users.py b/cortex4py/controllers/users.py
similarity index 100%
rename from cortex4py/controller/users.py
rename to cortex4py/controllers/users.py
diff --git a/setup.py b/setup.py
index cecd09a..7e2c15e 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='cortex4py',
-    version='2.0.0',
+    version='2.0.1',
     description='Python API client for Cortex.',
     long_description=read_md('README.md'),
     author='TheHive-Project',
@@ -19,7 +19,7 @@
     maintainer='TheHive-Project',
     url='https://github.com/Thehive-Project/Cortex4py',
     license='AGPL-V3',
-    packages=['cortex4py'],
+    packages=['cortex4py', 'cortex4py.models', 'cortex4py.controllers'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -33,5 +33,5 @@
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     include_package_data=True,
-    install_requires=['future', 'requests', 'python-magic']
+    install_requires=['typing', 'requests', 'python-magic']
 )