diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py
index fcb96e5ac..e891e5502 100644
--- a/openlp/core/common/__init__.py
+++ b/openlp/core/common/__init__.py
@@ -24,13 +24,12 @@ The :mod:`common` module contains most of the components and libraries that make
 OpenLP work.
 """
 import hashlib
-import re
-import os
 import logging
+import os
+import re
 import sys
 import traceback
 from ipaddress import IPv4Address, IPv6Address, AddressValueError
-from codecs import decode, encode
 
 from PyQt5 import QtCore
 from PyQt5.QtCore import QCryptographicHash as QHash
@@ -241,6 +240,5 @@ from .registryproperties import RegistryProperties
 from .uistrings import UiStrings
 from .settings import Settings
 from .applocation import AppLocation
-from .historycombobox import HistoryComboBox
 from .actions import ActionList
 from .languagemanager import LanguageManager
diff --git a/openlp/core/ui/lib/__init__.py b/openlp/core/ui/lib/__init__.py
new file mode 100644
index 000000000..ef0211030
--- /dev/null
+++ b/openlp/core/ui/lib/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2016 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
\ No newline at end of file
diff --git a/openlp/core/common/historycombobox.py b/openlp/core/ui/lib/historycombobox.py
similarity index 98%
rename from openlp/core/common/historycombobox.py
rename to openlp/core/ui/lib/historycombobox.py
index f0ec7c2ad..23e05e76e 100644
--- a/openlp/core/common/historycombobox.py
+++ b/openlp/core/ui/lib/historycombobox.py
@@ -20,7 +20,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`~openlp.core.common.historycombobox` module contains the HistoryComboBox widget
+The :mod:`~openlp.core.ui.lib.historycombobox` module contains the HistoryComboBox widget
 """
 
 from PyQt5 import QtCore, QtWidgets
diff --git a/tests/interfaces/openlp_core_ui_lib/__init__.py b/tests/interfaces/openlp_core_ui_lib/__init__.py
new file mode 100644
index 000000000..ef0211030
--- /dev/null
+++ b/tests/interfaces/openlp_core_ui_lib/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2016 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
\ No newline at end of file
diff --git a/tests/interfaces/openlp_core_common/test_historycombobox.py b/tests/interfaces/openlp_core_ui_lib/test_historycombobox.py
similarity index 96%
rename from tests/interfaces/openlp_core_common/test_historycombobox.py
rename to tests/interfaces/openlp_core_ui_lib/test_historycombobox.py
index 1bc7a2f0d..7aa460c8f 100644
--- a/tests/interfaces/openlp_core_common/test_historycombobox.py
+++ b/tests/interfaces/openlp_core_ui_lib/test_historycombobox.py
@@ -28,9 +28,8 @@ from unittest import TestCase
 from PyQt5 import QtWidgets
 
 from openlp.core.common import Registry
-from openlp.core.common import HistoryComboBox
+from openlp.core.ui.lib.historycombobox import HistoryComboBox
 from tests.helpers.testmixin import TestMixin
-from tests.interfaces import MagicMock, patch
 
 
 class TestHistoryComboBox(TestCase, TestMixin):