diff --git a/package/contents/ui/LunaIcon.qml b/package/contents/ui/LunaIcon.qml
index 87c420a38b519ded5407a3b918f98217f85eae9f..1cdaba38299a976b4533b31dcc94be5054add829 100644
--- a/package/contents/ui/LunaIcon.qml
+++ b/package/contents/ui/LunaIcon.qml
@@ -67,7 +67,7 @@ Item {
         KSvg.SvgItem {
             id: lunaSvgItem
 
-            imagePath: lunarImage === '' ? '' : Qt.resolvedUrl("../data/" + lunarImage)
+            imagePath: lunarImage === '' ? '' : Qt.resolvedUrl("data/" + lunarImage)
             visible: true
             anchors.centerIn: parent
             width: lunaBackground.width
@@ -80,9 +80,6 @@ Item {
         Shape {
             id: lunaCanvas
 
-            property string lunarImage: lunaIcon.lunarImage
-            property string diskColor: lunaIcon.diskColor
-
             opacity: (lunarImage === '') ? 1 : 0
             width: lunaBackground.width
             height: lunaBackground.height
diff --git a/package/contents/ui/LunaWidget.qml b/package/contents/ui/LunaWidget.qml
index c1d710e8241e1517445ccd32283950f2cca7673d..8080237712015224ae9804d41db5da8a001810a1 100644
--- a/package/contents/ui/LunaWidget.qml
+++ b/package/contents/ui/LunaWidget.qml
@@ -22,11 +22,11 @@
 
 */
 
-import "../code/lunacalc.js" as LunaCalc
-import "../code/phases.js" as Phases
 import QtQuick 2.7
 import QtQuick.Controls as QtControls
 import QtQuick.Layouts as QtLayouts
+import "code/lunacalc.js" as LunaCalc
+import "code/phases.js" as Phases
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.plasma.plasmoid
 
diff --git a/package/contents/code/lunacalc.js b/package/contents/ui/code/lunacalc.js
similarity index 100%
rename from package/contents/code/lunacalc.js
rename to package/contents/ui/code/lunacalc.js
diff --git a/package/contents/code/phases.js b/package/contents/ui/code/phases.js
similarity index 100%
rename from package/contents/code/phases.js
rename to package/contents/ui/code/phases.js
diff --git a/package/contents/data/custom.svg b/package/contents/ui/data/custom.svg
similarity index 100%
rename from package/contents/data/custom.svg
rename to package/contents/ui/data/custom.svg
diff --git a/package/contents/data/fife-moon.svg b/package/contents/ui/data/fife-moon.svg
similarity index 100%
rename from package/contents/data/fife-moon.svg
rename to package/contents/ui/data/fife-moon.svg
diff --git a/package/contents/data/full-moon-dark.svg b/package/contents/ui/data/full-moon-dark.svg
similarity index 100%
rename from package/contents/data/full-moon-dark.svg
rename to package/contents/ui/data/full-moon-dark.svg
diff --git a/package/contents/data/luna-gskbyte13.svg b/package/contents/ui/data/luna-gskbyte13.svg
similarity index 100%
rename from package/contents/data/luna-gskbyte13.svg
rename to package/contents/ui/data/luna-gskbyte13.svg
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 2f2011e583534c1ea5ab974ae5fe587b1599f40c..9099545b0524feb6db7af642666b8963762ceef1 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -21,11 +21,11 @@
 
 */
 
-import "../code/lunacalc.js" as LunaCalc
-import "../code/phases.js" as Phases
 import QtQuick 2.7
 import QtQuick.Controls as QtControls
 import QtQuick.Layouts as QtLayouts
+import "code/lunacalc.js" as LunaCalc
+import "code/phases.js" as Phases
 import org.kde.ksvg as KSvg
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.plasma.core as PlasmaCore