diff --git a/labelImg.py b/labelImg.py
index baadf695..bf693657 100755
--- a/labelImg.py
+++ b/labelImg.py
@@ -430,7 +430,7 @@ class MainWindow(QMainWindow, WindowMixin):
             }
 
         self.settings = settings = Settings(types)
-        self.recentFiles = list(settings.get('recentFiles', []))
+        self.recentFiles = settings.get('recentFiles') if settings.get('recentFiles') is not None else []
         size = settings.get('window/size', QSize(600, 500))
         position = settings.get('window/position', QPoint(0, 0))
         self.resize(size)
diff --git a/libs/canvas.py b/libs/canvas.py
index a27a42e9..cc681605 100644
--- a/libs/canvas.py
+++ b/libs/canvas.py
@@ -9,8 +9,8 @@ except ImportError:
 
 #from PyQt4.QtOpenGL import *
 
-from shape import Shape
-from lib import distance
+from libs.shape import Shape
+from libs.lib import distance
 
 CURSOR_DEFAULT = Qt.ArrowCursor
 CURSOR_POINT = Qt.PointingHandCursor
diff --git a/libs/labelDialog.py b/libs/labelDialog.py
index 636016d6..bc48384f 100644
--- a/libs/labelDialog.py
+++ b/libs/labelDialog.py
@@ -6,7 +6,7 @@ except ImportError:
     from PyQt4.QtGui import *
     from PyQt4.QtCore import *
 
-from lib import newIcon, labelValidator
+from libs.lib import newIcon, labelValidator
 
 BB = QDialogButtonBox
 
diff --git a/libs/labelFile.py b/libs/labelFile.py
index c3d581f9..4d9dc675 100644
--- a/libs/labelFile.py
+++ b/libs/labelFile.py
@@ -7,8 +7,8 @@ except ImportError:
     from PyQt4.QtGui import QImage
 
 from base64 import b64encode, b64decode
-from pascal_voc_io import PascalVocWriter
-from pascal_voc_io import XML_EXT
+from libs.pascal_voc_io import PascalVocWriter
+from libs.pascal_voc_io import XML_EXT
 import os.path
 import sys
 
diff --git a/libs/shape.py b/libs/shape.py
index 00b1419e..de366d27 100644
--- a/libs/shape.py
+++ b/libs/shape.py
@@ -9,7 +9,7 @@ except ImportError:
     from PyQt4.QtGui import *
     from PyQt4.QtCore import *
 
-from lib import distance
+from libs.lib import distance
 
 DEFAULT_LINE_COLOR = QColor(0, 255, 0, 128)
 DEFAULT_FILL_COLOR = QColor(255, 0, 0, 128)