diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 0af01831..294f6188 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -1419,6 +1419,16 @@
 		D264FAA8243FE17A00D98315 /* Selectors */ = {
 			isa = PBXGroup;
 			children = (
+				D264FAAB2441009400D98315 /* RadioBoxCollectionViewCell.swift */,
+				BBAA4F01243D8E3B005AAD5F /* RadioBoxesModel.swift */,
+				BBAA4EFF243D8E3B005AAD5F /* RadioBoxes.swift */,
+				BBAA4F00243D8E3B005AAD5F /* RadioBoxModel.swift */,
+				D264FAA6243FE13B00D98315 /* RadioBox.swift */,
+				0116A4E4228B19640094F3ED /* RadioButtonSelectionHelper.swift */,
+				011D95AE2407266E000E3791 /* RadioButtonModel.swift */,
+				01004F2F22721C3800991ECC /* RadioButton.swift */,
+				31BE15CA23D8924C00452370 /* CheckboxModel.swift */,
+				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
 			);
 			path = Selectors;
 			sourceTree = "<group>";
@@ -1641,9 +1651,6 @@
 				DBC4391A224421A0001AB423 /* CaretLink.swift */,
 				D28A838A23CCDA6B00DFE4FC /* ButtonModel.swift */,
 				D2E2A99E23E07F8A000B42E6 /* PillButton.swift */,
-				0116A4E4228B19640094F3ED /* RadioButtonSelectionHelper.swift */,
-				011D95AE2407266E000E3791 /* RadioButtonModel.swift */,
-				01004F2F22721C3800991ECC /* RadioButton.swift */,
 			);
 			path = Buttons;
 			sourceTree = "<group>";
@@ -1651,11 +1658,6 @@
 		D29DF17D21E69E26003B2FB9 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				D264FAAB2441009400D98315 /* RadioBoxCollectionViewCell.swift */,
-				BBAA4F01243D8E3B005AAD5F /* RadioBoxesModel.swift */,
-				BBAA4EFF243D8E3B005AAD5F /* RadioBoxes.swift */,
-				BBAA4F00243D8E3B005AAD5F /* RadioBoxModel.swift */,
-				D264FAA6243FE13B00D98315 /* RadioBox.swift */,
 				9445890B2385BCE300DE9FD4 /* ProgressBarModel.swift */,
 				01509D922327ECFB00EF99AA /* ProgressBar.swift */,
 				9445890D2385C3F800DE9FD4 /* MultiProgressModel.swift */,
@@ -1672,8 +1674,6 @@
 				017BEB7A236763000024EF95 /* LineModel.swift */,
 				D213347623843825008E41B3 /* Line.swift */,
 				94C2D9822386F3E30006CF46 /* Label */,
-				31BE15CA23D8924C00452370 /* CheckboxModel.swift */,
-				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
 				31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */,
 				0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */,
 				D28A838223CCBD3F00DFE4FC /* CircleProgressModel.swift */,
diff --git a/MVMCoreUI/Atomic/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/Checkbox.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/CheckboxModel.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/RadioBox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBox.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/RadioBox.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioBox.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/RadioBoxCollectionViewCell.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxCollectionViewCell.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/RadioBoxCollectionViewCell.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxCollectionViewCell.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/RadioBoxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/RadioBoxModel.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/RadioBoxes.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxes.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/RadioBoxes.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxes.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Views/RadioBoxesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Views/RadioBoxesModel.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonModel.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
rename to MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift