diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index f5b4de9d..9728ccb8 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -40,24 +40,46 @@ from apscheduler.triggers.interval import IntervalTrigger
 from UniversalAnalytics import Tracker
 import pytz
 
-from plexpy import activity_handler
-from plexpy import activity_pinger
-from plexpy import common
-from plexpy import database
-from plexpy import datafactory
-from plexpy import libraries
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import newsletters
-from plexpy import newsletter_handler
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import plextv
-from plexpy import users
-from plexpy import versioncheck
-from plexpy import web_socket
-from plexpy import webstart
-from plexpy import config
+PYTHON_VERSION = sys.version_info[0]
+
+if PYTHON_VERSION < 3:
+    import activity_handler
+    import activity_pinger
+    import common
+    import database
+    import datafactory
+    import libraries
+    import logger
+    import mobile_app
+    import newsletters
+    import newsletter_handler
+    import notification_handler
+    import notifiers
+    import plextv
+    import users
+    import versioncheck
+    import web_socket
+    import webstart
+    import config
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_pinger
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import newsletters
+    from plexpy import newsletter_handler
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import plextv
+    from plexpy import users
+    from plexpy import versioncheck
+    from plexpy import web_socket
+    from plexpy import webstart
+    from plexpy import config
 
 
 PROG_DIR = None
diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py
index b53f0821..b95fbe6a 100644
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -26,12 +26,20 @@ from apscheduler.triggers.date import DateTrigger
 import pytz
 
 import plexpy
-from plexpy import activity_processor
-from plexpy import datafactory
-from plexpy import helpers
-from plexpy import logger
-from plexpy import notification_handler
-from plexpy import pmsconnect
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import datafactory
+    import helpers
+    import logger
+    import notification_handler
+    import pmsconnect
+else:
+    from plexpy import activity_processor
+    from plexpy import datafactory
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import notification_handler
+    from plexpy import pmsconnect
 
 
 ACTIVITY_SCHED = None
diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py
index ed93e138..61eaa7e8 100644
--- a/plexpy/activity_pinger.py
+++ b/plexpy/activity_pinger.py
@@ -21,16 +21,28 @@ import threading
 import time
 
 import plexpy
-from plexpy import activity_handler
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import notification_handler
-from plexpy import plextv
-from plexpy import pmsconnect
-from plexpy import web_socket
+if plexpy.PYTHON_VERSION < 3:
+    import activity_handler
+    import activity_processor
+    import database
+    import helpers
+    import libraries
+    import logger
+    import notification_handler
+    import plextv
+    import pmsconnect
+    import web_socket
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import notification_handler
+    from plexpy import plextv
+    from plexpy import pmsconnect
+    from plexpy import web_socket
 
 
 monitor_lock = threading.Lock()
diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py
index 5c781827..3cb69c2a 100644
--- a/plexpy/activity_processor.py
+++ b/plexpy/activity_processor.py
@@ -23,12 +23,20 @@ import json
 import time
 
 import plexpy
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import pmsconnect
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import helpers
+    import libraries
+    import logger
+    import pmsconnect
+    import users
+else:
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import pmsconnect
+    from plexpy import users
 
 
 class ActivityProcessor(object):
diff --git a/plexpy/api2.py b/plexpy/api2.py
index 5dbc5fb7..cfe55894 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -34,17 +34,30 @@ import cherrypy
 import xmltodict
 
 import plexpy
-from plexpy import config
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import newsletter_handler
-from plexpy import newsletters
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import config
+    import database
+    import helpers
+    import libraries
+    import logger
+    import mobile_app
+    import notification_handler
+    import notifiers
+    import newsletter_handler
+    import newsletters
+    import users
+else:
+    from plexpy import config
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import newsletter_handler
+    from plexpy import newsletters
+    from plexpy import users
 
 
 class API2(object):
diff --git a/plexpy/classes.py b/plexpy/classes.py
index b754fa8f..86b5d2ea 100644
--- a/plexpy/classes.py
+++ b/plexpy/classes.py
@@ -25,12 +25,16 @@ from __future__ import unicode_literals
 from future import standard_library
 standard_library.install_aliases()
 
-import urllib.request, urllib.parse, urllib.error
+from urllib.request import FancyURLopener
 
-from plexpy.common import USER_AGENT
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    from common import USER_AGENT
+else:
+    from plexpy.common import USER_AGENT
 
 
-class PlexPyURLopener(urllib.request.FancyURLopener):
+class PlexPyURLopener(FancyURLopener):
     version = USER_AGENT
 
 
@@ -51,7 +55,7 @@ class AuthURLOpener(PlexPyURLopener):
         self.numTries = 0
 
         # call the base class
-        urllib.request.FancyURLopener.__init__(self)
+        FancyURLopener.__init__(self)
 
     def prompt_user_passwd(self, host, realm):
         """
diff --git a/plexpy/common.py b/plexpy/common.py
index 8190d434..0f565a8b 100644
--- a/plexpy/common.py
+++ b/plexpy/common.py
@@ -22,7 +22,11 @@ import distro
 import platform
 from collections import OrderedDict
 
-from plexpy import version
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import version
+else:
+    from plexpy import version
 
 
 # Identify Our Application
diff --git a/plexpy/config.py b/plexpy/config.py
index 5534908e..d143e5d7 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -27,7 +27,10 @@ import time
 from configobj import ConfigObj
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 def bool_int(value):
diff --git a/plexpy/database.py b/plexpy/database.py
index ea7ae760..843a7eb4 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -25,7 +25,10 @@ import threading
 import time
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 FILENAME = "tautulli.db"
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 867b8d20..b9b9f5e5 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -27,13 +27,22 @@ import json
 from itertools import groupby
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import logger
-from plexpy import pmsconnect
-from plexpy import session
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import logger
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 class DataFactory(object):
diff --git a/plexpy/datatables.py b/plexpy/datatables.py
index 4c57ec8e..aed877a3 100644
--- a/plexpy/datatables.py
+++ b/plexpy/datatables.py
@@ -19,9 +19,15 @@ from builtins import object
 
 import re
 
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import helpers
+    import logger
+else:
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
 
 
 class DataTables(object):
diff --git a/plexpy/exceptions.py b/plexpy/exceptions.py
index 1a31b2d4..96bb1032 100644
--- a/plexpy/exceptions.py
+++ b/plexpy/exceptions.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 #  This file is part of Tautulli.
 #
 #  Tautulli is free software: you can redistribute it and/or modify
@@ -14,6 +13,8 @@ from __future__ import unicode_literals
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import unicode_literals
+
 
 class PlexPyException(Exception):
     """
diff --git a/plexpy/graphs.py b/plexpy/graphs.py
index b8b78ed9..56244f84 100644
--- a/plexpy/graphs.py
+++ b/plexpy/graphs.py
@@ -24,11 +24,18 @@ from builtins import object
 import datetime
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import logger
-from plexpy import libraries
-from plexpy import session
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import logger
+    import libraries
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import logger
+    from plexpy import libraries
+    from plexpy import session
 
 
 class Graphs(object):
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index a5c9c181..eab2edb4 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -63,9 +63,14 @@ from xml.dom import minidom
 import xmltodict
 
 import plexpy
-from plexpy import logger
-from plexpy import request
-from plexpy.api2 import API2
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    import request
+    from api2 import API2
+else:
+    from plexpy import logger
+    from plexpy import request
+    from plexpy.api2 import API2
 
 
 def addtoapi(*dargs, **dkwargs):
diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py
index 9c0611a8..c4facf51 100644
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -30,8 +30,12 @@ import certifi
 import urllib3
 
 import plexpy
-from plexpy import helpers
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import helpers
+    import logger
+else:
+    from plexpy import helpers
+    from plexpy import logger
 
 
 class HTTPHandler(object):
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index adc79119..d5b52ed2 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -25,14 +25,24 @@ import json
 import os
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import logger
-from plexpy import plextv
-from plexpy import pmsconnect
-from plexpy import session
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import logger
+    import plextv
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 def refresh_libraries():
diff --git a/plexpy/lock.py b/plexpy/lock.py
index f901dd1c..aeaf473f 100644
--- a/plexpy/lock.py
+++ b/plexpy/lock.py
@@ -23,7 +23,11 @@ import queue
 import time
 import threading
 
-from plexpy import logger
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 class TimedLock(object):
diff --git a/plexpy/log_reader.py b/plexpy/log_reader.py
index bb1d0186..cd37e9ff 100644
--- a/plexpy/log_reader.py
+++ b/plexpy/log_reader.py
@@ -17,13 +17,17 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from io import open
 
 import os
 
 import plexpy
-from plexpy import helpers
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import helpers
+    import logger
+else:
+    from plexpy import helpers
+    from plexpy import logger
 
 
 def get_log_tail(window=20, parsed=True, log_type="server"):
diff --git a/plexpy/logger.py b/plexpy/logger.py
index 2b0c5d5c..40e76ca5 100644
--- a/plexpy/logger.py
+++ b/plexpy/logger.py
@@ -34,8 +34,12 @@ import threading
 import traceback
 
 import plexpy
-from plexpy.helpers import is_public_ip
-from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+if plexpy.PYTHON_VERSION < 3:
+    from helpers import is_public_ip
+    from config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+else:
+    from plexpy.helpers import is_public_ip
+    from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
 
 
 # These settings are for file logging only
diff --git a/plexpy/mobile_app.py b/plexpy/mobile_app.py
index b397d7c0..16828e30 100644
--- a/plexpy/mobile_app.py
+++ b/plexpy/mobile_app.py
@@ -21,8 +21,13 @@ from builtins import str
 
 import time
 
-from plexpy import database
-from plexpy import logger
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import logger
+else:
+    from plexpy import database
+    from plexpy import logger
 
 
 TEMP_DEVICE_TOKEN = None
diff --git a/plexpy/newsletter_handler.py b/plexpy/newsletter_handler.py
index 5bd332d7..23322f37 100644
--- a/plexpy/newsletter_handler.py
+++ b/plexpy/newsletter_handler.py
@@ -25,9 +25,14 @@ from apscheduler.triggers.cron import CronTrigger
 import email.utils
 
 import plexpy
-from plexpy import database
-from plexpy import logger
-from plexpy import newsletters
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import logger
+    import newsletters
+else:
+    from plexpy import database
+    from plexpy import logger
+    from plexpy import newsletters
 
 
 NEWSLETTER_SCHED = None
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py
index df2d24ad..23373ff1 100644
--- a/plexpy/newsletters.py
+++ b/plexpy/newsletters.py
@@ -31,14 +31,24 @@ import os
 import re
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import newsletter_handler
-from plexpy import pmsconnect
-from plexpy.notifiers import send_notification, EMAIL
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import helpers
+    import libraries
+    import logger
+    import newsletter_handler
+    import pmsconnect
+    from notifiers import send_notification, EMAIL
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import newsletter_handler
+    from plexpy import pmsconnect
+    from plexpy.notifiers import send_notification, EMAIL
 
 
 AGENT_IDS = {
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index fc81949a..dbff05f7 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -45,16 +45,28 @@ import time
 import musicbrainzngs
 
 import plexpy
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import database
-from plexpy import datafactory
-from plexpy import logger
-from plexpy import helpers
-from plexpy import notifiers
-from plexpy import pmsconnect
-from plexpy import request
-from plexpy.newsletter_handler import notify as notify_newsletter
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import common
+    import database
+    import datafactory
+    import logger
+    import helpers
+    import notifiers
+    import pmsconnect
+    import request
+    from newsletter_handler import notify as notify_newsletter
+else:
+    from plexpy import activity_processor
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import logger
+    from plexpy import helpers
+    from plexpy import notifiers
+    from plexpy import pmsconnect
+    from plexpy import request
+    from plexpy.newsletter_handler import notify as notify_newsletter
 
 
 def process_queue():
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 1e68a917..108666b0 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -62,14 +62,24 @@ import facebook
 import twitter
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import pmsconnect
-from plexpy import request
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import helpers
+    import logger
+    import mobile_app
+    import pmsconnect
+    import request
+    import users
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import pmsconnect
+    from plexpy import request
+    from plexpy import users
 
 
 BROWSER_NOTIFIERS = {}
diff --git a/plexpy/plexivity_import.py b/plexpy/plexivity_import.py
index e9a279c2..47e9abd5 100644
--- a/plexpy/plexivity_import.py
+++ b/plexpy/plexivity_import.py
@@ -24,12 +24,20 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-from plexpy import activity_pinger
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import activity_processor
+    import database
+    import helpers
+    import logger
+    import users
+else:
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import users
 
 
 def extract_plexivity_xml(xml=None):
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index 7fb84eea..704d80eb 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -25,13 +25,22 @@ import base64
 import json
 
 import plexpy
-from plexpy import common
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import logger
-from plexpy import users
-from plexpy import pmsconnect
-from plexpy import session
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import helpers
+    import http_handler
+    import logger
+    import users
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import logger
+    from plexpy import users
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 def get_server_resources(return_presence=False, return_server=False, **kwargs):
diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py
index 795b564f..44101949 100644
--- a/plexpy/plexwatch_import.py
+++ b/plexpy/plexwatch_import.py
@@ -23,12 +23,20 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-from plexpy import activity_pinger
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import activity_processor
+    import database
+    import helpers
+    import logger
+    import users
+else:
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import users
 
 
 def extract_plexwatch_xml(xml=None):
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 17d2bad1..7c68fbb9 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -29,14 +29,24 @@ import time
 from urllib.parse import quote, quote_plus, urlencode
 
 import plexpy
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import logger
-from plexpy import plextv
-from plexpy import session
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import common
+    import helpers
+    import http_handler
+    import logger
+    import plextv
+    import session
+    import users
+else:
+    from plexpy import activity_processor
+    from plexpy import common
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import session
+    from plexpy import users
 
 
 def get_server_friendly_name():
diff --git a/plexpy/request.py b/plexpy/request.py
index de466d3a..f109b4ad 100644
--- a/plexpy/request.py
+++ b/plexpy/request.py
@@ -27,8 +27,12 @@ import collections
 import requests
 
 import plexpy
-from plexpy import lock
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import lock
+    import logger
+else:
+    from plexpy import lock
+    from plexpy import logger
 
 
 # Dictionary with last request times, for rate limiting.
diff --git a/plexpy/session.py b/plexpy/session.py
index 083d47ee..81b76356 100644
--- a/plexpy/session.py
+++ b/plexpy/session.py
@@ -21,8 +21,13 @@ from builtins import str
 
 import cherrypy
 
-from plexpy import common
-from plexpy import users
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import users
+else:
+    from plexpy import common
+    from plexpy import users
 
 
 def get_session_info():
diff --git a/plexpy/users.py b/plexpy/users.py
index b51fe282..48b7d010 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -27,14 +27,24 @@ import httpagentparser
 import time
 
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import plextv
-from plexpy import session
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import libraries
+    import logger
+    import plextv
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import session
 
 
 def refresh_users():
diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py
index 9f6c33e7..575d4b99 100644
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -29,9 +29,14 @@ import subprocess
 import tarfile
 
 import plexpy
-from plexpy import common
-from plexpy import logger
-from plexpy import request
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import logger
+    import request
+else:
+    from plexpy import common
+    from plexpy import logger
+    from plexpy import request
 
 
 def runGit(args):
diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py
index 11ba506d..ce5ebfe5 100644
--- a/plexpy/web_socket.py
+++ b/plexpy/web_socket.py
@@ -30,11 +30,18 @@ import time
 import websocket
 
 import plexpy
-from plexpy import activity_handler
-from plexpy import activity_pinger
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import activity_handler
+    import activity_pinger
+    import activity_processor
+    import database
+    import logger
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import logger
 
 
 name = 'websocket'
diff --git a/plexpy/webauth.py b/plexpy/webauth.py
index ac5decd2..d8f14fef 100644
--- a/plexpy/webauth.py
+++ b/plexpy/webauth.py
@@ -35,10 +35,16 @@ from hashing_passwords import check_hash
 import jwt
 
 import plexpy
-from plexpy import logger
-from plexpy.database import MonitorDatabase
-from plexpy.users import Users, refresh_users
-from plexpy.plextv import PlexTV
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    from database import MonitorDatabase
+    from users import Users, refresh_users
+    from plextv import PlexTV
+else:
+    from plexpy import logger
+    from plexpy.database import MonitorDatabase
+    from plexpy.users import Users, refresh_users
+    from plexpy.plextv import PlexTV
 
 
 JWT_ALGORITHM = 'HS256'
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 03eb9400..4eef2652 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -41,34 +41,64 @@ from mako import exceptions
 import websocket
 
 import plexpy
-from plexpy import activity_pinger
-from plexpy import common
-from plexpy import config
-from plexpy import database
-from plexpy import datafactory
-from plexpy import graphs
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import libraries
-from plexpy import log_reader
-from plexpy import logger
-from plexpy import newsletter_handler
-from plexpy import newsletters
-from plexpy import mobile_app
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import plextv
-from plexpy import plexivity_import
-from plexpy import plexwatch_import
-from plexpy import pmsconnect
-from plexpy import users
-from plexpy import versioncheck
-from plexpy import web_socket
-from plexpy import webstart
-from plexpy.api2 import API2
-from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
-from plexpy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
-from plexpy.webauth import AuthController, requireAuth, member_of, check_auth
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import common
+    import config
+    import database
+    import datafactory
+    import graphs
+    import helpers
+    import http_handler
+    import libraries
+    import log_reader
+    import logger
+    import newsletter_handler
+    import newsletters
+    import mobile_app
+    import notification_handler
+    import notifiers
+    import plextv
+    import plexivity_import
+    import plexwatch_import
+    import pmsconnect
+    import users
+    import versioncheck
+    import web_socket
+    import webstart
+    from api2 import API2
+    from helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
+    from session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
+    from webauth import AuthController, requireAuth, member_of, check_auth
+else:
+    from plexpy import activity_pinger
+    from plexpy import common
+    from plexpy import config
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import graphs
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import libraries
+    from plexpy import log_reader
+    from plexpy import logger
+    from plexpy import newsletter_handler
+    from plexpy import newsletters
+    from plexpy import mobile_app
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import plextv
+    from plexpy import plexivity_import
+    from plexpy import plexwatch_import
+    from plexpy import pmsconnect
+    from plexpy import users
+    from plexpy import versioncheck
+    from plexpy import web_socket
+    from plexpy import webstart
+    from plexpy.api2 import API2
+    from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
+    from plexpy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
+    from plexpy.webauth import AuthController, requireAuth, member_of, check_auth
 
 
 def serve_template(templatename, **kwargs):
diff --git a/plexpy/webstart.py b/plexpy/webstart.py
index fb39ceb5..a208bf45 100644
--- a/plexpy/webstart.py
+++ b/plexpy/webstart.py
@@ -29,10 +29,16 @@ from urllib.parse import urlencode
 import cherrypy
 
 import plexpy
-from plexpy import logger
-from plexpy import webauth
-from plexpy.helpers import create_https_certificates
-from plexpy.webserve import WebInterface
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    import webauth
+    from helpers import create_https_certificates
+    from webserve import WebInterface
+else:
+    from plexpy import logger
+    from plexpy import webauth
+    from plexpy.helpers import create_https_certificates
+    from plexpy.webserve import WebInterface
 
 
 def start():