diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..53c1b22055
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+graft docs
+
+include COPYING
+include AUTHORS
+
+recursive-include src/einsteinpy/tests *.py *.html
+
+prune docs/source/examples/.ipynb_checkpoints
+global-exclude *.py[cod] __pycache__ *.so *.dylib
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..ee7778129d
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,5 @@
+[build-system]
+requires = [
+    "setuptools",
+    "wheel",
+]
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000..c7616dab25
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,21 @@
+[tool:pytest]
+norecursedirs =
+    .git
+    dist
+    build
+python_files =
+    test_*.py
+doctest_plus = disabled
+addopts = --strict
+markers =
+    slow
+    remote_data
+    filterwarnings
+
+[pycodestyle]
+ignore = E731,W504
+max-line-length = 120
+
+[flake8]
+ignore = E731,W504,F401,F841
+max-line-length = 120
diff --git a/setup.py b/setup.py
index 2a6e421b91..5d6cbf0048 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ setup(
     },
     packages=find_packages("src"),
     package_dir={"": "src"},
-    entry_points={"console_scripts": ["pytorch-lightning=pytorch-lightning.cli:main"]},
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Education",