diff --git a/couchpotato/_tests/__init__.py b/couchpotato/_tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/couchpotato/_tests/renamer.py b/couchpotato/_tests/renamer.py
deleted file mode 100644
index cbd8a10..0000000
--- a/couchpotato/_tests/renamer.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import unittest
-
-class RenamingTests(unittest.TestCase):
-    """
-        Test renaming of just downloaded movies
-    """
-
-    fixtures = [
-        (
-            '/path/to/movies/Moviename.2009.720p.bluray-groupname',
-            'Unicodestring'
-        ),
-    ]
-
-    def testUnicode(self, name, result):
-        pass
-
-    def tests(self):
-        for (name, result) in self.fixtures:
-            self.testUnicode(name, result)
-
-
diff --git a/couchpotato/_tests/scanner.py b/couchpotato/_tests/scanner.py
deleted file mode 100644
index 9e6408b..0000000
--- a/couchpotato/_tests/scanner.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import unittest
-
-class UnicodeTests(unittest.TestCase):
-    """
-        Test unicode pathname conversion
-    """
-
-    fixtures = [
-        (
-            'Unicodstring',
-            u'Unicodestring'
-        ),
-    ]
-
-    def testUnicode(self, name, result):
-        pass
-
-    def tests(self):
-        for (name, result) in self.fixtures:
-            self.testUnicode(name, result)
-
-
diff --git a/couchpotato/api/__init__.py b/couchpotato/api.py
similarity index 100%
rename from couchpotato/api/__init__.py
rename to couchpotato/api.py