diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index fad8480..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,3 +0,0 @@
-recursive-include nuVeto/data *.npz
-recursive-include nuVeto/data *.pkl
-recursive-include nuVeto/data *.dat
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b7e4789
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[aliases]
+test=pytest
diff --git a/setup.py b/setup.py
index 0d90a99..b7b456e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup, find_packages
 
 setup(
     name='nuVeto',
@@ -9,10 +9,18 @@
     author_email='caad@mit.edu, Sergio.Palomares.Ruiz@ific.uv.es, aschneider@icecube.wisc.edu, lwille@icecue.wisc.edu, and tyuan@icecube.wisc.edu',
     description='Package implements the formalism for calculating passing fraction as discussed in arXiv:XXXX.XXXX.',
     long_description=open('README.md').read(),
-    url='https://github.com/arguelles/SelfVeto.git',
-    packages=['nuVeto','nuVeto.external'],
-    package_dir={'nuVeto': 'nuVeto'},
-    package_data={'nuVeto':["data/decay_distributions/*.npz",'data/prpl/*.pkl','data/corsika/*.pkl']},
-    #data_files={'nuVeto':["data/decay_distributions/*.npz",'data/prpl/*.pkl','data/corsika/*.pkl']},
-    requires=['numpy', 'scipy', 'functools32', 'matplotlib', 'MCeq']
+    url='https://github.com/arguelles/nuVeto.git',
+    packages=find_packages('./'),
+    package_data={
+        'nuVeto':['data/decay_distributions/*.npz','data/prpl/*.pkl','data/corsika/*.pkl']
+    },
+    install_requires=[ 'numpy',
+                       'scipy',
+                       'functools32',
+                       'MCeq'],        
+    extras_require={
+        'plotting':  ['matplotlib'],
+    },
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest']
     )