diff --git a/MANIFEST.in b/MANIFEST.in
index 944ebbada4661ba0768179e055121b922de73dfa..6eb3dd95f9295fc829bff4b5d3486ebeda48165a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,6 @@ include version
 recursive-include spams_wrap *.h
 recursive-include spams_wrap *.cpp
 
-recursive-include tests *.py
-recursive-include data *.png
+recursive-include spams/tests *.py
+recursive-include spams/data *.png
 recursive-include doc *
diff --git a/README.md b/README.md
index a04c1b805b1ab3754a58d529373f82a5d891d3d6..ca55eac53bf37c5e504d72a8d5d6dabdc8e02c86 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,8 @@ Manipulated objects are imported from numpy and scipy. Matrices should be stored
 ### Testing the interface
 
 ```bash
-python tests/test_spams.py -h # to get help
-python tests/test_spams.py    # will run all the tests
+python spams/tests/test_spams.py -h # to get help
+python spams/tests/test_spams.py    # will run all the tests
 ```
 
 ---
diff --git a/setup.py b/setup.py
index 6c96b2a99a861cde8397ecec435fbbf80851f3ea..9c2991f66c2c5da2a601e558b7bb88a056d1ce10 100644
--- a/setup.py
+++ b/setup.py
@@ -196,6 +196,9 @@ opts = dict(
     packages=find_packages(),
     cmdclass={'build_ext': CustomBuildExtCommand},
     ext_modules=get_extension(),
+    package_data={
+        "spams": ["data/*.png", "tests/*.py"]
+    },
     zip_safe=True
 )
 
diff --git a/data/boat.png b/spams/data/boat.png
similarity index 100%
rename from data/boat.png
rename to spams/data/boat.png
diff --git a/data/lena.png b/spams/data/lena.png
similarity index 100%
rename from data/lena.png
rename to spams/data/lena.png
diff --git a/tests/test_decomp.py b/spams/tests/test_decomp.py
similarity index 100%
rename from tests/test_decomp.py
rename to spams/tests/test_decomp.py
diff --git a/tests/test_dictLearn.py b/spams/tests/test_dictLearn.py
similarity index 100%
rename from tests/test_dictLearn.py
rename to spams/tests/test_dictLearn.py
diff --git a/tests/test_linalg.py b/spams/tests/test_linalg.py
similarity index 100%
rename from tests/test_linalg.py
rename to spams/tests/test_linalg.py
diff --git a/tests/test_prox.py b/spams/tests/test_prox.py
similarity index 100%
rename from tests/test_prox.py
rename to spams/tests/test_prox.py
diff --git a/tests/test_spams.py b/spams/tests/test_spams.py
similarity index 100%
rename from tests/test_spams.py
rename to spams/tests/test_spams.py
diff --git a/tests/test_utils.py b/spams/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to spams/tests/test_utils.py