diff --git a/src/__init__.py b/src/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7557381574e93598d90e7057d3e6db9945694b82 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -0,0 +1 @@
+#!/bin/env python3
\ No newline at end of file
diff --git a/src/parsers/abstract.py b/src/abstract.py
similarity index 100%
rename from src/parsers/abstract.py
rename to src/abstract.py
diff --git a/src/parsers/audio.py b/src/audio.py
similarity index 100%
rename from src/parsers/audio.py
rename to src/audio.py
diff --git a/src/parsers/jpg.py b/src/jpg.py
similarity index 100%
rename from src/parsers/jpg.py
rename to src/jpg.py
diff --git a/src/parser_factory.py b/src/parser_factory.py
index f4cf07bc5f13ef012ea521a411622fdd00bdd292..176ff2b17c8ddc3655a9890a8217f7956d2f13cb 100644
--- a/src/parser_factory.py
+++ b/src/parser_factory.py
@@ -2,12 +2,12 @@ import mimetypes
 import importlib
 import pkgutil
 
-from .parsers import abstract
+from . import abstract
 
-for module_loader, name, ispkg in pkgutil.walk_packages('.src.parsers'):
-    if not name.startswith('src.parsers.'):
+for module_loader, name, ispkg in pkgutil.walk_packages('.src'):
+    if not name.startswith('src.'):
         continue
-    elif name == 'src.parsers.abstract':
+    elif name == 'src.abstract':
         continue
     importlib.import_module(name)
 
@@ -16,4 +16,5 @@ def get_parser(filename: str):
     for c in abstract.AbstractParser.__subclasses__():
         if mtype in c.mimetypes:
             return c(filename)
-    print('Nope')
+    print('factory: %s is not supported' % mtype)
+    return None
diff --git a/src/parsers/__init__.py b/src/parsers/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/parsers/pdf.py b/src/pdf.py
similarity index 100%
rename from src/parsers/pdf.py
rename to src/pdf.py
diff --git a/src/parsers/png.py b/src/png.py
similarity index 100%
rename from src/parsers/png.py
rename to src/png.py
diff --git a/tests/test_libmat2.py b/tests/test_libmat2.py
index 27bb8d152a81056f67359ab898c3f503fef80c32..c21185ee2bc480b9915c09cc05ef889406dd9ce0 100644
--- a/tests/test_libmat2.py
+++ b/tests/test_libmat2.py
@@ -4,8 +4,7 @@ import unittest
 import shutil
 import os
 
-from src import parsers
-from src.parsers import pdf, png, jpg, audio
+from src import pdf, png, jpg, audio, office
 
 class TestGetMeta(unittest.TestCase):
     def test_pdf(self):