diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index b5985e36..e795475d 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -779,20 +779,6 @@
 			path = ModelProtocols;
 			sourceTree = "<group>";
 		};
-		011D9583240422BF000E3791 /* New */ = {
-			isa = PBXGroup;
-			children = (
-				011D958A24042794000E3791 /* Rules */,
-				011D95882404249B000E3791 /* FormProtocol.swift */,
-				011D95AC2406BB57000E3791 /* FormHolderProtocol.swift */,
-				011D95AA2405C553000E3791 /* FormItemProtocol.swift */,
-				011D958624042492000E3791 /* FormFieldProtocol.swift */,
-				011D95A824057AC7000E3791 /* FormActionFieldProtocol.swift */,
-				011D9601240DA20A000E3791 /* ValidProtocol.swift */,
-			);
-			path = New;
-			sourceTree = "<group>";
-		};
 		011D958A24042794000E3791 /* Rules */ = {
 			isa = PBXGroup;
 			children = (
@@ -804,7 +790,8 @@
 				011D95A2240453F8000E3791 /* RuleRegexModel.swift */,
 				011D95A4240455DC000E3791 /* FormGroupRule.swift */,
 			);
-			path = Rules;
+			name = Rules;
+			path = Rules/Rules;
 			sourceTree = "<group>";
 		};
 		012A88EF23985E0100FE3DA1 /* CustomPrimitives */ = {
@@ -826,8 +813,14 @@
 		01C74D87224298E2009C25A3 /* FormUIHelpers */ = {
 			isa = PBXGroup;
 			children = (
-				011D9583240422BF000E3791 /* New */,
+				011D95882404249B000E3791 /* FormProtocol.swift */,
+				011D95AC2406BB57000E3791 /* FormHolderProtocol.swift */,
+				011D95AA2405C553000E3791 /* FormItemProtocol.swift */,
+				011D958624042492000E3791 /* FormFieldProtocol.swift */,
+				011D95A824057AC7000E3791 /* FormActionFieldProtocol.swift */,
+				011D9601240DA20A000E3791 /* ValidProtocol.swift */,
 				0105618A224BBE7700E1557D /* FormValidator.swift */,
+				011D958A24042794000E3791 /* Rules */,
 			);
 			path = FormUIHelpers;
 			sourceTree = "<group>";
diff --git a/MVMCoreUI/FormUIHelpers/New/FormActionFieldProtocol.swift b/MVMCoreUI/FormUIHelpers/FormActionFieldProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/FormActionFieldProtocol.swift
rename to MVMCoreUI/FormUIHelpers/FormActionFieldProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/FormFieldProtocol.swift b/MVMCoreUI/FormUIHelpers/FormFieldProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/FormFieldProtocol.swift
rename to MVMCoreUI/FormUIHelpers/FormFieldProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/FormHolderProtocol.swift b/MVMCoreUI/FormUIHelpers/FormHolderProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/FormHolderProtocol.swift
rename to MVMCoreUI/FormUIHelpers/FormHolderProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/FormItemProtocol.swift b/MVMCoreUI/FormUIHelpers/FormItemProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/FormItemProtocol.swift
rename to MVMCoreUI/FormUIHelpers/FormItemProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/FormProtocol.swift b/MVMCoreUI/FormUIHelpers/FormProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/FormProtocol.swift
rename to MVMCoreUI/FormUIHelpers/FormProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/FormGroupRule.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/FormGroupRule.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/FormGroupRule.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/FormGroupRule.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleAllValueChangedModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RuleAllValueChangedModel.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyValueChangedModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RuleAnyValueChangedModel.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleEqualsModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RuleEqualsModel.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleRegexModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RuleRegexModel.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RuleRequiredModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RuleRequiredModel.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/Rules/RulesProtocol.swift
rename to MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift
diff --git a/MVMCoreUI/FormUIHelpers/New/ValidProtocol.swift b/MVMCoreUI/FormUIHelpers/ValidProtocol.swift
similarity index 100%
rename from MVMCoreUI/FormUIHelpers/New/ValidProtocol.swift
rename to MVMCoreUI/FormUIHelpers/ValidProtocol.swift