diff --git a/.gitignore b/.gitignore
index 29056c4..dca1822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,131 +1,107 @@
-#add file which you want to ignore
 # Byte-compiled / optimized / DLL files
- __pycache__/
- *.db
-# *.py[cod]
-# *$py.class
-#
-# # C extensions
-# *.so
-#
-# # Distribution / packaging
-# .Python
-# build/
-# develop-eggs/
-# dist/
-# downloads/
-# eggs/
-# .eggs/
-# lib/
-# lib64/
-# parts/
-# sdist/
-# var/
-# wheels/
-# pip-wheel-metadata/
-# share/python-wheels/
-# *.egg-info/
-# .installed.cfg
-# *.egg
-# MANIFEST
-#
-# # PyInstaller
-# #  Usually these files are written by a python script from a template
-# #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-# *.manifest
-# *.spec
-#
-# # Installer logs
-# pip-log.txt
-# pip-delete-this-directory.txt
-#
-# # Unit test / coverage reports
-# htmlcov/
-# .tox/
-# .nox/
-# .coverage
-# .coverage.*
-# .cache
-# nosetests.xml
-# coverage.xml
-# *.cover
-# *.py,cover
-# .hypothesis/
-# .pytest_cache/
-#
-# # Translations
-# *.mo
-# *.pot
-#
-# # Django stuff:
-# *.log
-# local_settings.py
-# db.sqlite3
-# db.sqlite3-journal
-#
-# # Flask stuff:
-# instance/
-# .webassets-cache
-#
-# # Scrapy stuff:
-# .scrapy
-#
-# # Sphinx documentation
-# docs/_build/
-#
-# # PyBuilder
-# target/
-#
-# # Jupyter Notebook
-# .ipynb_checkpoints
-#
-# # IPython
-# profile_default/
-# ipython_config.py
-#
-# # pyenv
-# .python-version
-#
-# # pipenv
-# #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-# #   However, in case of collaboration, if having platform-specific dependencies or dependencies
-# #   having no cross-platform support, pipenv may install dependencies that don't work, or not
-# #   install all needed dependencies.
-# #Pipfile.lock
-#
-# # PEP 582; used by e.g. github.com/David-OConnor/pyflow
-# __pypackages__/
-#
-# # Celery stuff
-# celerybeat-schedule
-# celerybeat.pid
-#
-# # SageMath parsed files
-# *.sage.py
-#
-# # Environments
-# .env
-# .venv
-# env/
-# venv/
-# ENV/
-# env.bak/
-# venv.bak/
-#
-# # Spyder project settings
-# .spyderproject
-# .spyproject
-#
-# # Rope project settings
-# .ropeproject
-#
-# # mkdocs documentation
-# /site
-#
-# # mypy
-# .mypy_cache/
-# .dmypy.json
-# dmypy.json
-#
-# # Pyre type checker
-# .pyre/
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# User db files
+generated_password.db
diff --git a/MANIFEST.in b/MANIFEST.in
index 96b97fa..bdaa7ba 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1 @@
-include genpass/*.py
-include README.rst
-include LICENSE
-include requirements.txt
+include README.rst LICENSE requirements.txt contributing.md
diff --git a/requirements.txt b/requirements.txt
index b0f06e3..f22be4f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 diceware>=0.9.6
 click>=7.0
 beautifultable>=0.5.0
+setuptools>=40.0.0
diff --git a/setup.py b/setup.py
index e52ff8e..bf5ee97 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,18 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()
 
-install_requires = ["setuptools", "click>=5.0", "diceware>=0.9.5", "beautifultable>=0.5.0"]
+with open("requirements.txt") as req_file:
+    install_requires = req_file.read().split()
+
 
 setup_requirements = ["setuptools_scm"]
 
 setup(
     name="pygenpass",
-    packages=find_packages(),
     entry_points={"console_scripts": ["pygenpass = genpass.__init__:main"]},
     version="0.1",
     author="Mayuri Lahane",
@@ -20,9 +23,10 @@
     license="MIT",
     keywords="genpass pygenpass gempass passwordmanager manager encryption",
     url="https://github.com/paint-it/genpass",
-    py_modules=["genpass.__init__"],
+    packages=find_packages(include=["genpass"]),
     namespace_packages=[],
     include_package_data=True,
     zip_safe=False,
     install_requires=install_requires,
+    python_requires=">=3.5",
 )