diff --git a/templates/UserForm.ss b/templates/Layout/UserForm.ss
similarity index 100%
rename from templates/UserForm.ss
rename to templates/Layout/UserForm.ss
diff --git a/templates/UserFormsDropdownField.ss b/templates/forms/UserFormsDropdownField.ss
similarity index 100%
rename from templates/UserFormsDropdownField.ss
rename to templates/forms/UserFormsDropdownField.ss
diff --git a/templates/UserFormsField.ss b/templates/forms/UserFormsField.ss
similarity index 100%
rename from templates/UserFormsField.ss
rename to templates/forms/UserFormsField.ss
diff --git a/templates/UserFormsField_holder.ss b/templates/forms/UserFormsField_holder.ss
similarity index 100%
rename from templates/UserFormsField_holder.ss
rename to templates/forms/UserFormsField_holder.ss
diff --git a/templates/UserFormsFileField.ss b/templates/forms/UserFormsFileField.ss
similarity index 100%
rename from templates/UserFormsFileField.ss
rename to templates/forms/UserFormsFileField.ss
diff --git a/templates/UserFormsGroupField_holder.ss b/templates/forms/UserFormsGroupField_holder.ss
similarity index 100%
rename from templates/UserFormsGroupField_holder.ss
rename to templates/forms/UserFormsGroupField_holder.ss
diff --git a/templates/UserFormsMultipleOptionField_holder.ss b/templates/forms/UserFormsMultipleOptionField_holder.ss
similarity index 100%
rename from templates/UserFormsMultipleOptionField_holder.ss
rename to templates/forms/UserFormsMultipleOptionField_holder.ss
diff --git a/templates/UserFormsStepField.ss b/templates/forms/UserFormsStepField.ss
similarity index 100%
rename from templates/UserFormsStepField.ss
rename to templates/forms/UserFormsStepField.ss
diff --git a/templates/UserFormsTextareaField.ss b/templates/forms/UserFormsTextareaField.ss
similarity index 100%
rename from templates/UserFormsTextareaField.ss
rename to templates/forms/UserFormsTextareaField.ss
diff --git a/templates/UserformsCheckboxField.ss b/templates/forms/UserformsCheckboxField.ss
similarity index 100%
rename from templates/UserformsCheckboxField.ss
rename to templates/forms/UserformsCheckboxField.ss
diff --git a/templates/UserformsCheckboxField_holder.ss b/templates/forms/UserformsCheckboxField_holder.ss
similarity index 100%
rename from templates/UserformsCheckboxField_holder.ss
rename to templates/forms/UserformsCheckboxField_holder.ss