diff --git a/.gitignore b/.gitignore
index dac3fe1aa..80b4d47de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 /.cache/
+/.coverage
 /.tox/
 /bin/
+/dist/
+/htmlcov/
 /include/
 /lib/
 /pip-selfcheck.json
diff --git a/MANIFEST.in b/MANIFEST.in
index fb7dc7474..1652af658 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst
 include tox.ini
 include LICENSE
-include test*.py
+include tests/*.py
diff --git a/README.rst b/README.rst
index def6147ca..63e5feff3 100644
--- a/README.rst
+++ b/README.rst
@@ -51,6 +51,13 @@ Example
 Changes
 =======
 
+0.2.0 - Unreleased
+------------------
+
+- Add ``filterwarnings`` option.
+  [Carreau (Matthias Bussonnier)]
+
+
 0.1.0 - 2016-06-27
 ------------------
 
diff --git a/pytest_warnings.py b/pytest_warnings/__init__.py
similarity index 100%
rename from pytest_warnings.py
rename to pytest_warnings/__init__.py
diff --git a/setup.py b/setup.py
index fd478664c..ea4d193fd 100644
--- a/setup.py
+++ b/setup.py
@@ -6,11 +6,11 @@ setup(
     description='pytest plugin to list Python warnings in pytest report',
     long_description=open("README.rst").read(),
     license="MIT license",
-    version='0.1.0',
+    version='0.2.0',
     author='Florian Schulze',
     author_email='florian.schulze@gmx.net',
     url='https://github.com/fschulze/pytest-warnings',
-    py_modules=["pytest_warnings"],
+    packages=['pytest_warnings'],
     entry_points={'pytest11': ['pytest_warnings = pytest_warnings']},
     install_requires=['pytest'],
     classifiers=[
diff --git a/helper_test_a.py b/tests/helper_test_a.py
similarity index 100%
rename from helper_test_a.py
rename to tests/helper_test_a.py
diff --git a/helper_test_b.py b/tests/helper_test_b.py
similarity index 100%
rename from helper_test_b.py
rename to tests/helper_test_b.py
diff --git a/test_warnings.py b/tests/test_warnings.py
similarity index 100%
rename from test_warnings.py
rename to tests/test_warnings.py
diff --git a/test_warnings2.py b/tests/test_warnings2.py
similarity index 100%
rename from test_warnings2.py
rename to tests/test_warnings2.py
diff --git a/tox.ini b/tox.ini
index 977819b65..ec2e5622d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist = py27,py33,py34,py35
 usedevelop = true
 deps =
     pytest
+    pytest-cov
     pytest-flakes
     pytest-pep8
     coverage
@@ -12,6 +13,6 @@ commands =
     {envbindir}/py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
 
 [pytest]
-addopts = --flakes --pep8
+addopts = --flakes --pep8 --cov pytest_warnings --cov tests --no-cov-on-fail
 pep8ignore = E501
 norecursedirs = bin lib include Scripts .*