diff --git a/SickBeard.py b/SickBeard.py
index 6efb57dfc0eb71ca03e101d005f93e3ee528de4c..2465daf5afb232003fc72231ffe05632585d1a6b 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -32,6 +32,9 @@ import sqlite3
 import traceback
 import getopt
 
+# allow libraries to import each other
+sys.path.append(os.path.join(os.path.dirname(__file__), 'lib'))
+
 import sickbeard
 
 from sickbeard import db
@@ -95,7 +98,7 @@ def daemonize():
 def main():
 
     # do some preliminary stuff
-    sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(sys.argv[0]))
+    sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(__file__))
     sickbeard.MY_NAME = os.path.basename(sickbeard.MY_FULLNAME)
     sickbeard.PROG_DIR = os.path.dirname(sickbeard.MY_FULLNAME)
     sickbeard.MY_ARGS = sys.argv[1:]
diff --git a/lib/hachoir_metadata/__init__.py b/lib/hachoir_metadata/__init__.py
index 5ab4743cf6b63a790d1b3b3ee3ce2542292f5926..4f59b70d7182b8a8deae07a40a3b3221f4b13e7f 100644
--- a/lib/hachoir_metadata/__init__.py
+++ b/lib/hachoir_metadata/__init__.py
@@ -1,4 +1,4 @@
-from hachoir_metadata.version import VERSION as __version__
+from .hachoir_metadata.version import VERSION as __version__
 from hachoir_metadata.metadata import extractMetadata
 
 # Just import the module,
diff --git a/lib/oauth2/__init__.py b/lib/oauth2/__init__.py
index 2b9389096eaa8d68fd4201d237aa8dedeb655367..a965fc71e4361ab55f02c2b538c93f57820ce974 100644
--- a/lib/oauth2/__init__.py
+++ b/lib/oauth2/__init__.py
@@ -28,7 +28,7 @@ import random
 import urlparse
 import hmac
 import binascii
-import lib.httplib2 as httplib2
+import httplib2
 
 try:
     from urlparse import parse_qs, parse_qsl
diff --git a/lib/pythontwitter/__init__.py b/lib/pythontwitter/__init__.py
index badc70c310cd7b114651d853cd1af9eb81b62eba..9e101dc8c51c709e093195f74173f7e8b18f6405 100755
--- a/lib/pythontwitter/__init__.py
+++ b/lib/pythontwitter/__init__.py
@@ -42,7 +42,7 @@ try:
 except ImportError:
   try:
     # Python < 2.6
-    import lib.simplejson as simplejson
+    import simplejson
   except ImportError:
     try:
       # Google App Engine
@@ -61,7 +61,7 @@ try:
 except ImportError:
   from md5 import md5
 
-import lib.oauth2 as oauth
+import oauth2 as oauth
 
 
 CHARACTER_LIMIT = 140
diff --git a/lib/simplejson/decoder.py b/lib/simplejson/decoder.py
index dd57ddeefb690469a34c4c73bfb8790556a8145c..b769ea486ca932cd83b1689ef8e055ae2658aa72 100644
--- a/lib/simplejson/decoder.py
+++ b/lib/simplejson/decoder.py
@@ -4,9 +4,9 @@ import re
 import sys
 import struct
 
-from lib.simplejson.scanner import make_scanner
+from simplejson.scanner import make_scanner
 try:
-    from lib.simplejson._speedups import scanstring as c_scanstring
+    from simplejson._speedups import scanstring as c_scanstring
 except ImportError:
     c_scanstring = None
 
diff --git a/lib/simplejson/encoder.py b/lib/simplejson/encoder.py
index 15c35f7a1b9adfed1d9518dcd2038007033b0e9f..cf58290366b4e33351a73123c391eabc8ebc45fa 100644
--- a/lib/simplejson/encoder.py
+++ b/lib/simplejson/encoder.py
@@ -3,11 +3,11 @@
 import re
 
 try:
-    from lib.simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
+    from simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
 except ImportError:
     c_encode_basestring_ascii = None
 try:
-    from lib.simplejson._speedups import make_encoder as c_make_encoder
+    from simplejson._speedups import make_encoder as c_make_encoder
 except ImportError:
     c_make_encoder = None
 
diff --git a/lib/tvdb_api/tvdb_api.py b/lib/tvdb_api/tvdb_api.py
index 1450ff4661dffa866b78cb8fb3433fa5de8f6c96..288a46e9f6f1cbf9045e4f482e332f2d0625067c 100644
--- a/lib/tvdb_api/tvdb_api.py
+++ b/lib/tvdb_api/tvdb_api.py
@@ -41,10 +41,7 @@ except ImportError:
 
 
 # Use local version for sickbeard, system version elsewhere
-try:
-    import lib.httplib2 as httplib2
-except ImportError:
-    import httplib2 as httplib2
+import httplib2
 
 from tvdb_ui import BaseUI, ConsoleUI
 from tvdb_exceptions import (tvdb_error, tvdb_userabort, tvdb_shownotfound,
diff --git a/sickbeard/image_cache.py b/sickbeard/image_cache.py
index be99a47e0bd024b3636091dde1792ee7b314b3ac..e242054b83a71baf26b871f53bb52e661a9b4d4e 100644
--- a/sickbeard/image_cache.py
+++ b/sickbeard/image_cache.py
@@ -24,9 +24,6 @@ import sickbeard
 from sickbeard import helpers, logger, exceptions
 from sickbeard import encodingKludge as ek
 
-# this is such a hack, I really need to fix this crap
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 'lib'))
-
 from sickbeard.metadata.generic import GenericMetadata
 
 from lib.hachoir_parser import createParser