diff --git a/code/model/formfields/EditableCheckboxGroupField.php b/code/model/editableformfields/EditableCheckboxGroupField.php
similarity index 100%
rename from code/model/formfields/EditableCheckboxGroupField.php
rename to code/model/editableformfields/EditableCheckboxGroupField.php
diff --git a/code/model/formfields/EditableCountryDropdownField.php b/code/model/editableformfields/EditableCountryDropdownField.php
similarity index 100%
rename from code/model/formfields/EditableCountryDropdownField.php
rename to code/model/editableformfields/EditableCountryDropdownField.php
diff --git a/code/model/formfields/EditableDateField.php b/code/model/editableformfields/EditableDateField.php
similarity index 100%
rename from code/model/formfields/EditableDateField.php
rename to code/model/editableformfields/EditableDateField.php
diff --git a/code/model/formfields/EditableDropdown.php b/code/model/editableformfields/EditableDropdown.php
similarity index 100%
rename from code/model/formfields/EditableDropdown.php
rename to code/model/editableformfields/EditableDropdown.php
diff --git a/code/model/formfields/EditableEmailField.php b/code/model/editableformfields/EditableEmailField.php
similarity index 100%
rename from code/model/formfields/EditableEmailField.php
rename to code/model/editableformfields/EditableEmailField.php
diff --git a/code/model/formfields/EditableFileField.php b/code/model/editableformfields/EditableFileField.php
similarity index 100%
rename from code/model/formfields/EditableFileField.php
rename to code/model/editableformfields/EditableFileField.php
diff --git a/code/model/formfields/EditableFormField.php b/code/model/editableformfields/EditableFormField.php
similarity index 100%
rename from code/model/formfields/EditableFormField.php
rename to code/model/editableformfields/EditableFormField.php
diff --git a/code/model/formfields/EditableFormHeading.php b/code/model/editableformfields/EditableFormHeading.php
similarity index 100%
rename from code/model/formfields/EditableFormHeading.php
rename to code/model/editableformfields/EditableFormHeading.php
diff --git a/code/model/formfields/EditableLiteralField.php b/code/model/editableformfields/EditableLiteralField.php
similarity index 100%
rename from code/model/formfields/EditableLiteralField.php
rename to code/model/editableformfields/EditableLiteralField.php
diff --git a/code/model/formfields/EditableMemberListField.php b/code/model/editableformfields/EditableMemberListField.php
similarity index 100%
rename from code/model/formfields/EditableMemberListField.php
rename to code/model/editableformfields/EditableMemberListField.php
diff --git a/code/model/formfields/EditableMultipleOptionField.php b/code/model/editableformfields/EditableMultipleOptionField.php
similarity index 100%
rename from code/model/formfields/EditableMultipleOptionField.php
rename to code/model/editableformfields/EditableMultipleOptionField.php
diff --git a/code/model/formfields/EditableNumericField.php b/code/model/editableformfields/EditableNumericField.php
similarity index 100%
rename from code/model/formfields/EditableNumericField.php
rename to code/model/editableformfields/EditableNumericField.php
diff --git a/code/model/formfields/EditableOption.php b/code/model/editableformfields/EditableOption.php
similarity index 100%
rename from code/model/formfields/EditableOption.php
rename to code/model/editableformfields/EditableOption.php
diff --git a/code/model/formfields/EditableRadioField.php b/code/model/editableformfields/EditableRadioField.php
similarity index 100%
rename from code/model/formfields/EditableRadioField.php
rename to code/model/editableformfields/EditableRadioField.php
diff --git a/code/model/formfields/EditableTextField.php b/code/model/editableformfields/EditableTextField.php
similarity index 100%
rename from code/model/formfields/EditableTextField.php
rename to code/model/editableformfields/EditableTextField.php