diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 71d5cfb4..fc3d6563 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -1173,6 +1173,21 @@
 			path = FormUIHelpers;
 			sourceTree = "<group>";
 		};
+		0A0FEC7125D4246000AF2548 /* Dropdown Fields */ = {
+			isa = PBXGroup;
+			children = (
+				0A7EF86223D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift */,
+				0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */,
+				0A7EF86623D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift */,
+				0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */,
+				0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */,
+				0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */,
+				0AE277EB25D2EE310048A38D /* MultiItemDropdownEntryFieldModel.swift */,
+				0AE277E825D2ED4B0048A38D /* MultiItemDropdownEntryField.swift */,
+			);
+			path = "Dropdown Fields";
+			sourceTree = "<group>";
+		};
 		0A5D59C323AD488600EFD9E9 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
@@ -2043,16 +2058,9 @@
 				0A8321AE2355FE9500CB7F00 /* DigitBox.swift */,
 				0A7EF86023D8AC2500B2AAD1 /* DigitEntryFieldModel.swift */,
 				0A21DB93235E24ED00C160A2 /* DigitEntryField.swift */,
-				0A7EF86223D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift */,
-				0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */,
-				0A7EF86623D8B0AE00B2AAD1 /* DateDropdownEntryFieldModel.swift */,
-				0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */,
-				0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */,
-				0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */,
 				0A25209724645B76000FA9F6 /* TextViewEntryFieldModel.swift */,
 				0A25209524645AFD000FA9F6 /* TextViewEntryField.swift */,
-				0AE277EB25D2EE310048A38D /* MultiItemDropdownEntryFieldModel.swift */,
-				0AE277E825D2ED4B0048A38D /* MultiItemDropdownEntryField.swift */,
+				0A0FEC7125D4246000AF2548 /* Dropdown Fields */,
 			);
 			path = TextFields;
 			sourceTree = "<group>";
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryFieldModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryFieldModel.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryFieldModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/DateDropdownEntryField.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/DateDropdownEntryField.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/DateDropdownEntryFieldModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryFieldModel.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/DateDropdownEntryFieldModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/ItemDropdownEntryField.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/ItemDropdownEntryField.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/ItemDropdownEntryFieldModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/ItemDropdownEntryFieldModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/MultiItemDropdownEntryField.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEntryField.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/MultiItemDropdownEntryField.swift
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/MultiItemDropdownEntryFieldModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MultiItemDropdownEntryFieldModel.swift
rename to MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/MultiItemDropdownEntryFieldModel.swift