diff --git a/csv/fms.csv b/__dep__csv/fms.csv
similarity index 100%
rename from csv/fms.csv
rename to __dep__csv/fms.csv
diff --git a/csv/pocsag.csv b/__dep__csv/pocsag.csv
similarity index 100%
rename from csv/pocsag.csv
rename to __dep__csv/pocsag.csv
diff --git a/csv/zvei.csv b/__dep__csv/zvei.csv
similarity index 100%
rename from csv/zvei.csv
rename to __dep__csv/zvei.csv
diff --git a/boswatch/plugin/pluginManager.py b/boswatch/__dep__pluginManager.py
similarity index 100%
rename from boswatch/plugin/pluginManager.py
rename to boswatch/__dep__pluginManager.py
diff --git a/boswatch/watchdog/watchdog.py b/boswatch/__watchdog.py
similarity index 100%
rename from boswatch/watchdog/watchdog.py
rename to boswatch/__watchdog.py
diff --git a/boswatch/decoder/fmsdecoder.py b/boswatch/decoder/fmsdecoder.py
index 440f918..6384295 100644
--- a/boswatch/decoder/fmsdecoder.py
+++ b/boswatch/decoder/fmsdecoder.py
@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -50,7 +50,7 @@ class FmsDecoder:
             if re.search("[0-9a-f]{8}[0-9a-f][01]", fms_id):
                 logging.debug("found valid FMS")
 
-                bwPacket = packet.Packet()
+                bwPacket = Packet()
                 bwPacket.set("mode", "fms")
                 bwPacket.set("fms", fms_id)
                 bwPacket.set("service", service)
diff --git a/boswatch/decoder/pocsagdecoder.py b/boswatch/decoder/pocsagdecoder.py
index 7a1b341..1264953 100644
--- a/boswatch/decoder/pocsagdecoder.py
+++ b/boswatch/decoder/pocsagdecoder.py
@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -48,7 +48,7 @@ class PocsagDecoder:
 
             logging.debug("found valid POCSAG")
 
-            bwPacket = packet.Packet()
+            bwPacket = Packet()
             bwPacket.set("mode", "pocsag")
             bwPacket.set("bitrate", bitrate)
             bwPacket.set("ric", ric)
diff --git a/boswatch/decoder/zveidecoder.py b/boswatch/decoder/zveidecoder.py
index 0cfea54..6ccd65b 100644
--- a/boswatch/decoder/zveidecoder.py
+++ b/boswatch/decoder/zveidecoder.py
@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -40,7 +40,7 @@ class ZveiDecoder:
         if re.search("[0-9E]{5}", data[7:12]):
             logging.debug("found valid ZVEI")
 
-            bwPacket = packet.Packet()
+            bwPacket = Packet()
             bwPacket.set("mode", "zvei")
             bwPacket.set("zvei", ZveiDecoder._solveDoubleTone(data[7:12]))
 
diff --git a/boswatch/packet/packet.py b/boswatch/packet.py
similarity index 100%
rename from boswatch/packet/packet.py
rename to boswatch/packet.py
diff --git a/boswatch/packet/__init__.py b/boswatch/packet/__init__.py
deleted file mode 100644
index 836e3e8..0000000
--- a/boswatch/packet/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
diff --git a/boswatch/plugin/__init__.py b/boswatch/plugin/__init__.py
deleted file mode 100644
index 836e3e8..0000000
--- a/boswatch/plugin/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
diff --git a/boswatch/watchdog/__init__.py b/boswatch/watchdog/__init__.py
deleted file mode 100644
index 836e3e8..0000000
--- a/boswatch/watchdog/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
diff --git a/boswatch/worker/alarmWorker.py b/boswatch/worker/alarmWorker.py
deleted file mode 100644
index e191a7c..0000000
--- a/boswatch/worker/alarmWorker.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-"""!
-    ____  ____  ______       __      __       __       _____
-   / __ )/ __ \/ ___/ |     / /___ _/ /______/ /_     |__  /
-  / __  / / / /\__ \| | /| / / __ `/ __/ ___/ __ \     /_ <
- / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / /   ___/ /
-/_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/   /____/
-                German BOS Information Script
-                     by Bastian Schroll
-
-@file:        alarmWorker.py
-@date:        20.09.2018
-@author:      Bastian Schroll
-@description: Alarm worker to process the alarms in a separate thread
-"""
-import logging
-
-# from boswatch.module import file
-
-logging.debug("- %s loaded", __name__)
-
-
-class alarmWorker:
-    """!Worker class to process alarms"""
-
-    def __init__(self, alarmQueue):
-        self.__alarmQueue = alarmQueue
diff --git a/bw_server.py b/bw_server.py
index aa21002..8073f4a 100644
--- a/bw_server.py
+++ b/bw_server.py
@@ -47,7 +47,7 @@ try:
     logging.debug("Import BOSWatch module")
     from boswatch.configYaml import ConfigYAML
     from boswatch.network.server import TCPServer
-    from boswatch.packet.packet import Packet
+    from boswatch.packet import Packet
     from boswatch.utils import header
     from boswatch.network.broadcast import BroadcastServer
 except:  # pragma: no cover
diff --git a/router_test.py b/router_test.py
index 226768a..dee1ba1 100644
--- a/router_test.py
+++ b/router_test.py
@@ -4,7 +4,7 @@
 import logging
 
 from boswatch.configYaml import ConfigYAML
-from boswatch.packet.packet import Packet
+from boswatch.packet import Packet
 
 import importlib
 import copy