diff --git a/openlp/theme/__init__.py b/openlp/core/theme/__init__.py
similarity index 100%
rename from openlp/theme/__init__.py
rename to openlp/core/theme/__init__.py
diff --git a/openlp/theme/test/test_theme.py b/openlp/core/theme/test/test_theme.py
similarity index 100%
rename from openlp/theme/test/test_theme.py
rename to openlp/core/theme/test/test_theme.py
diff --git a/openlp/theme/test/test_theme.xml b/openlp/core/theme/test/test_theme.xml
similarity index 100%
rename from openlp/theme/test/test_theme.xml
rename to openlp/core/theme/test/test_theme.xml
diff --git a/openlp/theme/theme.py b/openlp/core/theme/theme.py
similarity index 100%
rename from openlp/theme/theme.py
rename to openlp/core/theme/theme.py
diff --git a/openlp/utils/ConfigHelper.py b/openlp/core/utils/ConfigHelper.py
similarity index 100%
rename from openlp/utils/ConfigHelper.py
rename to openlp/core/utils/ConfigHelper.py
diff --git a/openlp/utils/__init__.py b/openlp/core/utils/__init__.py
similarity index 100%
rename from openlp/utils/__init__.py
rename to openlp/core/utils/__init__.py