diff --git a/flask_nemo/__init__.py b/flask_nemo/__init__.py
index 913f907..b1bb06c 100644
--- a/flask_nemo/__init__.py
+++ b/flask_nemo/__init__.py
@@ -23,7 +23,7 @@
 import flask_nemo._data
 import flask_nemo.filters
 from flask_nemo.chunker import default_chunker as __default_chunker__
-from flask_nemo.default import Breadcrumb
+from flask_nemo.plugins.default import Breadcrumb
 from flask_nemo.common import resource_qualifier, ASSETS_STRUCTURE
 
 
diff --git a/flask_nemo/plugins/annotations_api.py b/flask_nemo/plugins/annotations_api.py
index f57d7b8..6a9a18c 100644
--- a/flask_nemo/plugins/annotations_api.py
+++ b/flask_nemo/plugins/annotations_api.py
@@ -52,7 +52,6 @@ def r_annotations_by_target(self,target_urn):
         response['annotations'] = mapped
         return jsonify(response)
 
-
     def r_annotation_get(self,uri):
         """ Route to retrieve contents of an annotation resource
         :param uri: The uri of the annotation resource
@@ -67,4 +66,3 @@ def r_annotation_get(self,uri):
         # set appropriate Content-Type headers
         # and return the actual content
         return jsonify(annotation)
-            
diff --git a/flask_nemo/default.py b/flask_nemo/plugins/default.py
similarity index 100%
rename from flask_nemo/default.py
rename to flask_nemo/plugins/default.py
diff --git a/setup.py b/setup.py
index b74b64a..bbdfea5 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 setup(
     name='flask_nemo',
     version="1.0.0a",
-    packages=find_packages(exclude=["examples"]),
+    packages=find_packages(exclude=["examples", "tests"]),
     url='https://github.com/capitains/flask-capitains-nemo',
     license='GNU GPL',
     author='Thibault Clerice',
@@ -25,4 +25,4 @@
     },
     include_package_data=True,
     zip_safe=False
-)
+)
\ No newline at end of file
diff --git a/tests/test_default/test_breadcrumb.py b/tests/test_default/test_breadcrumb.py
index b67a69c..5615269 100644
--- a/tests/test_default/test_breadcrumb.py
+++ b/tests/test_default/test_breadcrumb.py
@@ -1,6 +1,6 @@
 from ..resources import NemoResource
 from mock import patch
-from flask_nemo.default import Breadcrumb
+from flask_nemo.plugins.default import Breadcrumb
 
 
 class TestBreadcrumb(NemoResource):
diff --git a/tests/test_plugins/resources.py b/tests/test_plugins/resources.py
index 424edb1..756efcc 100644
--- a/tests/test_plugins/resources.py
+++ b/tests/test_plugins/resources.py
@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_nemo import Nemo
 
+
 def make_client(*args, **kwargs):
     app = Flask("Nemo")
     app.debug = True
diff --git a/tests/test_plugins/test_annotations_api.py b/tests/test_plugins/test_annotations_api.py
index 1a764ac..bf09213 100644
--- a/tests/test_plugins/test_annotations_api.py
+++ b/tests/test_plugins/test_annotations_api.py
@@ -12,7 +12,6 @@ def setUp(self):
         self.ann_plugin = AnnotationsApiPlugin(name="testplugin",queryinterface=QueryPrototype(lambda x:x))
         self.client = make_client(self.ann_plugin)
 
-
     def test_route_by_target_valid_urn(self):
         """ Check empty response for valid urn target (given prototype query interface which knows nothing)
         """
diff --git a/tests/test_routes.py b/tests/test_routes.py
index 6cf4819..7a3ee37 100644
--- a/tests/test_routes.py
+++ b/tests/test_routes.py
@@ -5,7 +5,7 @@
 from .resources import NemoResource
 from .test_controller import NemoTestControllers
 from flask_nemo import Nemo
-from flask_nemo.default import Breadcrumb
+from flask_nemo.plugins.default import Breadcrumb
 from flask import Markup, Flask
 from lxml import etree
 from mock import Mock, patch, call