diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8518736..e5336c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,19 +56,19 @@ qt_add_qml_module(mirai
 		src/qml/Main.qml
 		src/qml/MainPanel.qml 
 		src/qml/SideMenu.qml 
-		src/qml/DatePicker.qml
-		src/qml/DateField.qml
-		src/qml/AppIcon.qml
-		src/qml/AppLineEdit.qml
-		src/qml/AppButton.qml
-		src/qml/AppCheckbox.qml
-		src/qml/AppText.qml
-		src/qml/AppComboBox.qml
-		src/qml/TaskItem.qml
 		src/qml/ThemeLoader.qml
 		src/qml/forms/TaskForm.qml
 		src/qml/forms/FilesForm.qml
 		src/qml/forms/TagsConfigForm.qml
+		src/qml/components/TaskItem.qml
+		src/qml/components/DatePicker.qml
+		src/qml/components/DateField.qml
+		src/qml/components/AppIcon.qml
+		src/qml/components/AppLineEdit.qml
+		src/qml/components/AppCheckbox.qml
+		src/qml/components/AppText.qml
+		src/qml/components/AppComboBox.qml
+		src/qml/components/AppButton.qml
 		src/qml/components/TabSelector.qml
 		src/qml/components/Tag.qml
 		src/qml/components/Calendar.qml
diff --git a/src/qml/AppButton.qml b/src/qml/components/AppButton.qml
similarity index 100%
rename from src/qml/AppButton.qml
rename to src/qml/components/AppButton.qml
diff --git a/src/qml/AppCheckbox.qml b/src/qml/components/AppCheckbox.qml
similarity index 100%
rename from src/qml/AppCheckbox.qml
rename to src/qml/components/AppCheckbox.qml
diff --git a/src/qml/AppComboBox.qml b/src/qml/components/AppComboBox.qml
similarity index 100%
rename from src/qml/AppComboBox.qml
rename to src/qml/components/AppComboBox.qml
diff --git a/src/qml/AppIcon.qml b/src/qml/components/AppIcon.qml
similarity index 100%
rename from src/qml/AppIcon.qml
rename to src/qml/components/AppIcon.qml
diff --git a/src/qml/AppLineEdit.qml b/src/qml/components/AppLineEdit.qml
similarity index 97%
rename from src/qml/AppLineEdit.qml
rename to src/qml/components/AppLineEdit.qml
index b23da45..186e162 100644
--- a/src/qml/AppLineEdit.qml
+++ b/src/qml/components/AppLineEdit.qml
@@ -7,7 +7,6 @@
 import QtQuick
 import QtQuick.Window
 import QtQuick.Controls
-import Mirai
 
 TextField {
     color: colorPalette.selected.text
diff --git a/src/qml/AppText.qml b/src/qml/components/AppText.qml
similarity index 100%
rename from src/qml/AppText.qml
rename to src/qml/components/AppText.qml
diff --git a/src/qml/DateField.qml b/src/qml/components/DateField.qml
similarity index 100%
rename from src/qml/DateField.qml
rename to src/qml/components/DateField.qml
diff --git a/src/qml/DatePicker.qml b/src/qml/components/DatePicker.qml
similarity index 100%
rename from src/qml/DatePicker.qml
rename to src/qml/components/DatePicker.qml
diff --git a/src/qml/TaskItem.qml b/src/qml/components/TaskItem.qml
similarity index 100%
rename from src/qml/TaskItem.qml
rename to src/qml/components/TaskItem.qml