diff --git a/contributor_helper.py b/helpers/contributor_helper.py
similarity index 99%
rename from contributor_helper.py
rename to helpers/contributor_helper.py
index 0c51af3..d7cb412 100644
--- a/contributor_helper.py
+++ b/helpers/contributor_helper.py
@@ -10,7 +10,7 @@ import logging
 import redis
 
 import util
-import users_helper
+from . import users_helper
 KEYDAY = "CONTRIB_DAY" # To be used by other module
 logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/geo_helper.py b/helpers/geo_helper.py
similarity index 100%
rename from geo_helper.py
rename to helpers/geo_helper.py
diff --git a/trendings_helper.py b/helpers/trendings_helper.py
similarity index 100%
rename from trendings_helper.py
rename to helpers/trendings_helper.py
diff --git a/users_helper.py b/helpers/users_helper.py
similarity index 99%
rename from users_helper.py
rename to helpers/users_helper.py
index 0a3cda6..81cba1e 100644
--- a/users_helper.py
+++ b/helpers/users_helper.py
@@ -5,7 +5,7 @@ import datetime, time
 import logging
 
 import util
-import contributor_helper
+from . import contributor_helper
 
 logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/server.py b/server.py
index d82de5c..ed636d4 100755
--- a/server.py
+++ b/server.py
@@ -11,10 +11,10 @@ import os
 import logging
 
 import util
-import geo_helper
-import contributor_helper
-import users_helper
-import trendings_helper
+from helpers import geo_helper
+from helpers import contributor_helper
+from helpers import users_helper
+from helpers import trendings_helper
 
 configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
 cfg = configparser.ConfigParser()
diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py
index a8afb03..2324bed 100755
--- a/zmq_dispatcher.py
+++ b/zmq_dispatcher.py
@@ -13,17 +13,17 @@ import sys
 import json
 
 import util
-import geo_helper
-import contributor_helper
-import users_helper
-import trendings_helper
+from helpers import geo_helper
+from helpers import contributor_helper
+from helpers import users_helper
+from helpers import trendings_helper
 
 configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
 cfg = configparser.ConfigParser()
 cfg.read(configfile)
 
 logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('zmq_dispatcher')
 
 CHANNEL = cfg.get('RedisLog', 'channel')
 LISTNAME = cfg.get('RedisLIST', 'listName')
diff --git a/zmq_subscriber.py b/zmq_subscriber.py
index 4931819..281490c 100755
--- a/zmq_subscriber.py
+++ b/zmq_subscriber.py
@@ -15,7 +15,7 @@ cfg = configparser.ConfigParser()
 cfg.read(configfile)
 
 logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('zmq_subscriber')
 
 ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url')
 CHANNEL = cfg.get('RedisLog', 'channel')