Run upgrader over language translation files

2024-10-22 17:05:42 +02:00 · 2017-08-11 11:40:12 +12:00 · 2017-08-11 11:40:12 +12:00 · b27fdcb7f0
commit b27fdcb7f0
parent 46c3c5b517
31 changed files with 1215 additions and 1215 deletions
--- a/lang/ar.yml
+++ b/lang/ar.yml
@ -13,28 +13,21 @@ ar:
    SHOWTHISFIELD: 'إظهار هذا الحقل'
    VALUE: 'القيمة'
    WHEN: 'عندما'
-  EditableCheckbox:
-    PLURALNAME: 'مربعات لوضع إشارة'
-    SINGULARNAME: 'حقل ذات مربع لوضع إشارة'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'مجموعات ذات مربعات لوضع إشارة'
-    SINGULARNAME: 'مجموعة مربعات لوضع إشارة'
-  EditableCountryDropdownField:
-    PLURALNAME: 'القائمة المنسدلة للروابط البلاد'
-    SINGULARNAME: 'القائمة المنسدلة للروابط البلاد'
-  EditableDateField:
-    PLURALNAME: 'حقول التاريخ'
-    SINGULARNAME: 'حقل التاريخ'
-  EditableDropdown:
-    PLURALNAME: 'القائمات المنسدلة للروابط'
-    SINGULARNAME: 'حقل القائمة المنسدلة'
-  EditableEmailField:
-    PLURALNAME: 'حقول البريد الإلكتروني'
-    SINGULARNAME: 'خانة البريد الإلكتروني'
-  EditableFileField:
-    PLURALNAME: 'حقول تحميل الملف'
-    SINGULARNAME: 'حقل تحميل الملف'
-  EditableFormField:
+  FieldEditor:
+    ADD: أضف
+    SELECTAFIELD: 'اختر حقل'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: صفحات
+    SINGULARNAME: صفحة
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s ضروري'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: تصفية
+    ResetFilter: 'إعادة تعيين'
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'تصفية التقديمات..'
+    WHEREVALUEIS: 'حيث القيمة هي..'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: إضافة
    ADDRULE: 'إضافة قاعدة'
    BLANK: فراغ
@ -71,56 +64,69 @@ ar:
    VALIDATION: 'المصادقة'
    VALUE: 'القيمة'
    WHEN: 'عندما'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 'مربعات لوضع إشارة'
+    SINGULARNAME: 'حقل ذات مربع لوضع إشارة'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'مجموعات ذات مربعات لوضع إشارة'
+    SINGULARNAME: 'مجموعة مربعات لوضع إشارة'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'القائمة المنسدلة للروابط البلاد'
+    SINGULARNAME: 'القائمة المنسدلة للروابط البلاد'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'حقول التاريخ'
+    SINGULARNAME: 'حقل التاريخ'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 'القائمات المنسدلة للروابط'
+    SINGULARNAME: 'حقل القائمة المنسدلة'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'حقول البريد الإلكتروني'
+    SINGULARNAME: 'خانة البريد الإلكتروني'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'حقول تحميل الملف'
+    SINGULARNAME: 'حقل تحميل الملف'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'حدد مستوى العنوان'
    PLURALNAME: عناوين
    SINGULARNAME: عنوان
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'إخقاء تقارير النموذج؟'
    PLURALNAME: 'بلوكات HTML'
    SINGULARNAME: 'بلوك HTML'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'حقول قائمة الأعضاء'
    SINGULARNAME: 'حقل قائمة الأعضاء'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'حقول الخيارات المتعددة القابلة للتعديل'
    SINGULARNAME: 'حقل الخيارات المتعددة القابل للتعديل'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'احذف هذا الخيار'
    DRAG: 'اسحب لإعادة ترتيب الخيارات'
    LOCKED: 'لا يمكن تعديل هذه الحقول'
    PLURALNAME: 'الخيارات القابلة للتحرير'
    SINGULARNAME: 'خيار قابل للتحرير'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'حقول حلقية radio'
    SINGULARNAME: 'حقل حلقي Radio'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'عدد الصفوف'
    PLURALNAME: 'حقول نصية'
    SINGULARNAME: 'حقل نصي'
    TEXTLENGTH: 'طول النص'
-  FieldEditor:
-    ADD: أضف
-    SELECTAFIELD: 'اختر حقل'
-  Form:
-    FIELDISREQUIRED: '%s ضروري'
-  GridField:
-    Filter: تصفية
-    ResetFilter: 'إعادة تعيين'
-  SiteTree:
-    PLURALNAME: صفحات
-    SINGULARNAME: صفحة
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'نموذج مستلمي البريد الإلكتروني يحدده المستخدم'
+    SINGULARNAME: 'نموذج مستلم البريد الإلكتروني يحدده المستخدم'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'تحميل الملف'
    PLURALNAME: 'حقول الملف التي قدمت'
    SINGULARNAME: 'حقل الملف الذي قدّم'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'الاستمارات التي قدّمت'
    SINGULARNAME: 'الاستمارة التي قدّمت'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'حقول الاستمارة التي تمّ تقديمها'
    SINGULARNAME: 'حقل الاستمارة الذي تمّ تقديمه'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'أضف متلقي البريد الإلكتروني'
    CONFIGURATION: 'مواصفات'
    DESCRIPTION: 'يضيف استمارة مخصصة.'
@ -146,9 +152,3 @@ ar:
    SUBMISSIONS: 'التقديمات'
    SUBMITBUTTON: 'تقديم'
    TEXTONSUBMIT: 'زر النص المتعلق بالتقديم:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'نموذج مستلمي البريد الإلكتروني يحدده المستخدم'
-    SINGULARNAME: 'نموذج مستلم البريد الإلكتروني يحدده المستخدم'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'تصفية التقديمات..'
-    WHEREVALUEIS: 'حيث القيمة هي..'
--- a/lang/ar_SA.yml
+++ b/lang/ar_SA.yml
@ -13,13 +13,9 @@ ar_SA:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ ar_SA:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ ar_SA:
    SUBMISSIONS: 'الملفات المرسلة'
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'النص ال'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/bg_BG.yml
+++ b/lang/bg_BG.yml
@ -13,13 +13,9 @@ bg_BG:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ bg_BG:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ bg_BG:
    SUBMISSIONS: Заявления
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Текст за бутона на изпращане:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/da_DK.yml
+++ b/lang/da_DK.yml
@ -13,16 +13,9 @@ da_DK:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -49,33 +42,43 @@ da_DK:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -95,6 +98,3 @@ da_DK:
    SUBMISSIONS: Indsendelse
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Tekst på send-knap'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/de_DE.yml
+++ b/lang/de_DE.yml
@ -13,28 +13,28 @@ de_DE:
    SHOWTHISFIELD: 'Feld anzeigen'
    VALUE: Wert
    WHEN: Wann
-  EditableCheckbox:
-    PLURALNAME: Checkboxen
-    SINGULARNAME: 'Checkbox Feld'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Gruppen'
-    SINGULARNAME: 'Checkbox Gruppe'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Länder Dropdowns'
-    SINGULARNAME: 'Länder Dropdown'
-  EditableDateField:
-    PLURALNAME: Datumsfelder
-    SINGULARNAME: Datumsfeld
-  EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Feld'
-  EditableEmailField:
-    PLURALNAME: 'E-Mail Felder'
-    SINGULARNAME: 'E-Mail Feld'
-  EditableFileField:
-    PLURALNAME: 'Dateiupload Felder'
-    SINGULARNAME: 'Dateiupload Feld'
-  EditableFormField:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Ordner für den Upload auswählen'
+  FieldEditor:
+    ADD: Hinzufügen
+    SELECTAFIELD: 'Feld auswählen'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Seiten
+    SINGULARNAME: Seite
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s ist ein Pflichtfeld'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Zurücksetzen
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Feld hinzufügen'
+    ADD_FIELD_GROUP: 'Gruppe hinzufügen'
+    ADD_PAGE_BREAK: 'Seite hinzufügen'
+    FORMFIELDS: Formularfelder
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Einreichungen filtern...'
+    WHEREVALUEIS: 'nach Wert...'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Hinzufügen
    ADDLabel: 'Option hinzufügen'
    ADDRULE: 'Regel hinzufügen'
@ -76,67 +76,78 @@ de_DE:
    VALIDATION: Validierung
    VALUE: Wert
    WHEN: Wann
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Checkboxen
+    SINGULARNAME: 'Checkbox Feld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Checkbox Gruppen'
+    SINGULARNAME: 'Checkbox Gruppe'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Länder Dropdowns'
+    SINGULARNAME: 'Länder Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: Datumsfelder
+    SINGULARNAME: Datumsfeld
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Feld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'E-Mail Felder'
+    SINGULARNAME: 'E-Mail Feld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Dateiupload Felder'
+    SINGULARNAME: 'Dateiupload Feld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Überschriftsebene auswählen'
    PLURALNAME: Überschriften
    SINGULARNAME: Überschrift
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: Seiten
    SINGULARNAME: Seiten
    STEP_TITLE: 'Seite {page}'
    TITLE_FIRST: 'Erste Seite'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Nicht in Berichten anzeigen?'
    PLURALNAME: 'HTML Blöcke'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Felder'
    SINGULARNAME: 'Member List Feld'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editierbare Multi-Option Felder'
    SINGULARNAME: 'Editierbares Multi-Option Feld'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: Zahlenfelder
    SINGULARNAME: Zahlenfeld
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Option entfernen'
    DRAG: 'Ziehen um Optionen neu zu ordnen'
    LOCKED: 'Diese Felder können nicht verändert werden'
    PLURALNAME: 'Editierbare Optionen'
    SINGULARNAME: 'Editierbare Option'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: Radio-Buttons
    SINGULARNAME: Radio-Button
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Anzahl der Zeilen'
    PLACEHOLDER: Platzhalter
    PLURALNAME: Textfelder
    SINGULARNAME: Textfeld
    TEXTLENGTH: Textlänge
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Ordner für den Upload auswählen'
-  FieldEditor:
-    ADD: Hinzufügen
-    SELECTAFIELD: 'Feld auswählen'
-  Form:
-    FIELDISREQUIRED: '%s ist ein Pflichtfeld'
-  GridField:
-    Filter: Filter
-    ResetFilter: Zurücksetzen
-  SiteTree:
-    PLURALNAME: Seiten
-    SINGULARNAME: Seite
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Anpassbares Formular E-Mail Empfänger'
+    SINGULARNAME: 'Anpassbares Formular E-Mail Empfänger'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Datei herunterladen'
    PLURALNAME: 'Abgesendete Dateifelder'
    SINGULARNAME: 'Abgesendetes Dateifeld'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Abgesendete Formulare'
    SINGULARNAME: 'Abgesendetes Formular'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Abgesendete Formularfelder'
    SINGULARNAME: 'Abgesendetes Formularfeld'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'E-Mail Empfänger hinzufügen'
    CLEARBUTTON: Löschen
    CONFIGURATION: Konfiguration
@ -166,14 +177,3 @@ de_DE:
    SUBMITBUTTON: Senden
    TEXTONCLEAR: 'Text auf der Löschen-Schaltfläche:'
    TEXTONSUBMIT: 'Text auf der Einreich-Schaltfläche:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Anpassbares Formular E-Mail Empfänger'
-    SINGULARNAME: 'Anpassbares Formular E-Mail Empfänger'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Feld hinzufügen'
-    ADD_FIELD_GROUP: 'Gruppe hinzufügen'
-    ADD_PAGE_BREAK: 'Seite hinzufügen'
-    FORMFIELDS: Formularfelder
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Einreichungen filtern...'
-    WHEREVALUEIS: 'nach Wert...'
--- a/lang/en.yml
+++ b/lang/en.yml
@ -13,39 +13,39 @@ en:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Select upload folder'
+  FieldEditor:
+    ADD: Add
+    SELECTAFIELD: 'Select a Field'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Pages
+    SINGULARNAME: Page
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Reset
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Add Field'
+    ADD_FIELD_GROUP: 'Add Field Group'
+    ADD_PAGE_BREAK: 'Add Page Break'
+    FORMFIELDS: 'Form Fields'
+  SilverStripe\UserForms\Extension\UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Required field ''{name}'' cannot be placed within a conditional page'
+    NO_PAGE: 'Field ''{name}'' found before any pages'
+    UNEXPECTED_BREAK: 'Unexpected page break ''{name}'' inside nested field ''{group}'''
+    UNEXPECTED_GROUP_END: '''{name}'' found without a matching group'
+    WRONG_GROUP_END: '''{name}'' found closes the wrong group ''{group}'''
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filter Submissions..'
+    FROM: From
+    TILL: Till
+    WHEREVALUEIS: 'where value is..'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Editable Custom Rules'
    SINGULARNAME: 'Editable Custom Rule'
-  EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFieldGroup:
-    PLURALNAME: 'Editable Field Groups'
-    SINGULARNAME: 'Editable Field Group'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_END: '{group} end'
-    FIELD_GROUP_START: 'Group {group}'
-    PLURALNAME: 'Editable Field Group Ends'
-    SINGULARNAME: 'Editable Field Group End'
-  EditableFileField:
-    PLURALNAME: 'File Upload Fields'
-    SINGULARNAME: 'File Upload Field'
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDLabel: 'Add option'
    ADDRULE: 'Add Rule'
@ -82,8 +82,8 @@ en:
    MAXVALUE: 'Max Value'
    MERGEFIELDNAME: 'Merge field'
    MINVALUE: 'Min Value'
+    NAME: Name
    'NO': 'No'
-    NAME: 'Name'
    NOTBLANK: 'Not Blank'
    NOTVALUE: 'Not Value'
    OPTIONS: Options
@ -105,48 +105,75 @@ en:
    VALUE: Value
    WHEN: When
    'YES': 'Yes'
-  EditableFormFieldValidator:
-    REQUIRED_ERROR: 'Form fields cannot be required and have conditional display rules.'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Checkboxes
+    SINGULARNAME: 'Checkbox Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Checkbox Groups'
+    SINGULARNAME: 'Checkbox Group'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Date Fields'
+    SINGULARNAME: 'Date Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Editable Field Groups'
+    SINGULARNAME: 'Editable Field Group'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_END: '{group} end'
+    FIELD_GROUP_START: 'Group {group}'
+    PLURALNAME: 'Editable Field Group Ends'
+    SINGULARNAME: 'Editable Field Group End'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'File Upload Fields'
+    SINGULARNAME: 'File Upload Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Select Heading Level'
    PLURALNAME: Headings
    SINGULARNAME: Heading
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: 'Page Breaks'
    SINGULARNAME: 'Page Break'
    STEP_TITLE: 'Page {page}'
    TITLE_FIRST: 'First Page'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    CONTENT: HTML
    HIDEFROMREPORT: 'Hide from reports?'
    HIDELABEL: 'Hide ''Title'' label on frontend?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'Selected by default?'
    OPTIONSTAB: Options
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
    TITLE: Title
    VALUE: Value
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numeric Fields'
    RANGE: 'Allowed numeric range'
    RANGE_TO: to
    SINGULARNAME: 'Numeric Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
    PLURALNAME: 'Editable Options'
    SINGULARNAME: 'Editable Option'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Radio Groups'
    SINGULARNAME: 'Radio Group'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    AUTOCOMPLETE: Autocomplete
    AUTOCOMPLETE_DESCRIPTION: 'Supported browsers will attempt to populate this field automatically with the users information, use to set the value populated'
    NUMBERROWS: 'Number of rows'
@ -156,30 +183,31 @@ en:
    RANGE_TO: to
    SINGULARNAME: 'Text Field'
    TEXTLENGTH: 'Allowed text length'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Select upload folder'
-  FieldEditor:
-    ADD: Add
-    SELECTAFIELD: 'Select a Field'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  GridField:
-    Filter: Filter
-    ResetFilter: Reset
-  SiteTree:
-    PLURALNAME: Pages
-    SINGULARNAME: Page
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\EditableFormField\Validator:
+    REQUIRED_ERROR: 'Form fields cannot be required and have conditional display rules.'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    CUSTOMRULESTAB: 'Custom Rules'
+    EMAILADDRESSINVALID: '"EmailAddress" is not valid'
+    EMAILCONTENTTAB: 'Email Content'
+    EMAILDETAILSTAB: 'Email Details'
+    EMAILFROMINVALID: '"Email From" is not valid'
+    EMAILREPLYTOINVALID: '"Email Reply To" is not valid'
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
+    PLURALNAME: 'User Defined Form Email Recipient Conditions'
+    SINGULARNAME: 'User Defined Form Email Recipient Condition'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Add Email Recipient'
    CLEARBUTTON: Clear
    CONFIGURATION: Configuration
@ -230,31 +258,3 @@ en:
    TYPEREPLY: 'Type reply address'
    TYPESUBJECT: 'Type subject'
    TYPETO: 'Type to address'
-  UserDefinedForm_EmailRecipient:
-    CUSTOMRULESTAB: 'Custom Rules'
-    EMAILCONTENTTAB: 'Email Content'
-    EMAILDETAILSTAB: 'Email Details'
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
-    EMAILADDRESSINVALID: '"EmailAddress" is not valid'
-    EMAILFROMINVALID: '"Email From" is not valid'
-    EMAILREPLYTOINVALID: '"Email Reply To" is not valid'
-  UserDefinedForm_EmailRecipientCondition:
-    PLURALNAME: 'User Defined Form Email Recipient Conditions'
-    SINGULARNAME: 'User Defined Form Email Recipient Condition'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Add Field'
-    ADD_FIELD_GROUP: 'Add Field Group'
-    ADD_PAGE_BREAK: 'Add Page Break'
-    FORMFIELDS: 'Form Fields'
-  UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Required field ''{name}'' cannot be placed within a conditional page'
-    NO_PAGE: 'Field ''{name}'' found before any pages'
-    UNEXPECTED_BREAK: 'Unexpected page break ''{name}'' inside nested field ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' found without a matching group'
-    WRONG_GROUP_END: '''{name}'' found closes the wrong group ''{group}'''
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filter Submissions..'
-    FROM: From
-    TILL: Till
-    WHEREVALUEIS: 'where value is..'
--- a/lang/en_GB.yml
+++ b/lang/en_GB.yml
@ -1,15 +1,18 @@
 en_GB:
-  EditableEmailField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
    PLURALNAME: 'Email Fields'
    SINGULARNAME: 'Email Field'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -28,6 +31,3 @@ en_GB:
    SINGULARNAME: 'User Defined Form'
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Text on submit button:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/en_US.yml
+++ b/lang/en_US.yml
@ -1,15 +1,18 @@
 en_US:
-  EditableEmailField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
    PLURALNAME: 'Email Fields'
    SINGULARNAME: 'Email Field'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -30,6 +33,3 @@ en_US:
    SINGULARNAME: 'User Defined Form'
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Text on submit button:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -13,39 +13,39 @@ eo:
    SHOWTHISFIELD: 'Vidigi ĉi tiun kampon'
    VALUE: Valoro
    WHEN: Kiam
-  EditableCheckbox:
-    PLURALNAME: Markobutonoj
-    SINGULARNAME: 'Markobutona kampo'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Markobutonaj grupoj'
-    SINGULARNAME: 'Markobutona grupo'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Landaj fallistoj'
-    SINGULARNAME: 'Landa fallisto'
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Elekti alŝutan dosierujon'
+  FieldEditor:
+    ADD: Aldoni
+    SELECTAFIELD: 'Elekti kampon'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Paĝoj
+    SINGULARNAME: Paĝo
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s estas nepra'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filtri
+    ResetFilter: Restartigi
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Aldoni kampon'
+    ADD_FIELD_GROUP: 'Aldoni kampogrupon'
+    ADD_PAGE_BREAK: 'Aldoni paĝosalton'
+    FORMFIELDS: 'Formularaj kampoj'
+  SilverStripe\UserForms\Extension\UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Ne eblas meti nepran kampon ''{name}'' en kondiĉa paĝo'
+    NO_PAGE: 'Trovis kampon ''{name}'' antaŭ iuj paĝoj'
+    UNEXPECTED_BREAK: 'Neatendita paĝosalto ''{name}'' en ingita kampo ''{group}'''
+    UNEXPECTED_GROUP_END: 'troviĝas ''{name}'' sen kongrua grupo'
+    WRONG_GROUP_END: 'trovita ''{name}'' fermas malĝustan grupon ''{group}'''
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtri sendaĵojn..'
+    FROM: De
+    TILL: Ĝis
+    WHEREVALUEIS: 'kie valoro estas..'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Redakteblaj propraj reguloj'
    SINGULARNAME: 'Redaktebla propra regulo'
-  EditableDateField:
-    PLURALNAME: 'Kampoj por dato'
-    SINGULARNAME: 'Kampo por dato'
-  EditableDropdown:
-    PLURALNAME: Fallistoj
-    SINGULARNAME: 'Fallista kampo'
-  EditableEmailField:
-    PLURALNAME: 'Kampoj por retpoŝto'
-    SINGULARNAME: 'Kampo por retpoŝto'
-  EditableFieldGroup:
-    PLURALNAME: 'Redakteblaj kampaj grupoj'
-    SINGULARNAME: 'Redaktebla kampa grupo'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_END: 'fino de {group}'
-    FIELD_GROUP_START: 'Grupo {group}'
-    PLURALNAME: 'Redakteblaj kampaj grupoj finas'
-    SINGULARNAME: 'Redaktebla kampa grupo finas'
-  EditableFileField:
-    PLURALNAME: 'Kampoj por dosiera alŝuto'
-    SINGULARNAME: 'Kampo por dosiera alŝuto'
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Aldoni
    ADDLabel: 'Aldoni agordon'
    ADDRULE: 'Aldoni regulon'
@ -98,48 +98,75 @@ eo:
    VALUE: Valoro
    WHEN: Kiam
    'YES': Jes
-  EditableFormFieldValidator:
-    REQUIRED_ERROR: 'Formularaj kampoj ne povas esti nepraj kaj havi kondiĉajn vidigoregulojn.'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Markobutonoj
+    SINGULARNAME: 'Markobutona kampo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Markobutonaj grupoj'
+    SINGULARNAME: 'Markobutona grupo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Landaj fallistoj'
+    SINGULARNAME: 'Landa fallisto'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Kampoj por dato'
+    SINGULARNAME: 'Kampo por dato'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Fallistoj
+    SINGULARNAME: 'Fallista kampo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Kampoj por retpoŝto'
+    SINGULARNAME: 'Kampo por retpoŝto'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Redakteblaj kampaj grupoj'
+    SINGULARNAME: 'Redaktebla kampa grupo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_END: 'fino de {group}'
+    FIELD_GROUP_START: 'Grupo {group}'
+    PLURALNAME: 'Redakteblaj kampaj grupoj finas'
+    SINGULARNAME: 'Redaktebla kampa grupo finas'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Kampoj por dosiera alŝuto'
+    SINGULARNAME: 'Kampo por dosiera alŝuto'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Elekti titolan nivelon'
    PLURALNAME: Titoloj
    SINGULARNAME: Titolo
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: Paĝosaltoj
    SINGULARNAME: Paĝosalto
    STEP_TITLE: 'Paĝo {page}'
    TITLE_FIRST: 'Unua paĝo'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    CONTENT: HTML
    HIDEFROMREPORT: 'Ĉu kaŝi de raportoj?'
    HIDELABEL: 'Ĉu kaŝi etikedon ''Titolo'' en fasado?'
    PLURALNAME: HTML-blokoj
    SINGULARNAME: HTML-bloko
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Kampoj por membrolisto'
    SINGULARNAME: 'Kampo por membrolisto'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'Elektita apriore?'
    OPTIONSTAB: Agordoj
    PLURALNAME: 'Redakteblaj plureblaj kampoj'
    SINGULARNAME: 'Redaktebla plurebla kampo'
    TITLE: Titolo
    VALUE: Valoro
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numeraj kampoj'
    RANGE: 'Ebla numera amplekso'
    RANGE_TO: 'al '
    SINGULARNAME: 'Numera kampo'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Forigi ĉi tiun agordon'
    DRAG: 'Ŝovi por rearanĝi ordon de agordoj'
    LOCKED: 'Ne eblas ŝanĝi ĉi tiujn kampojn'
    PLURALNAME: 'Redakteblaj agordoj'
    SINGULARNAME: 'Redaktebla agordo'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Radiobutonaj kampoj'
    SINGULARNAME: 'Radiobutona kampo'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Nombro da vicoj'
    NUMBERROWS_DESCRIPTION: 'Kampoj kun pli ol unu vico generiĝos kiel tekstareo'
    PLACEHOLDER: Lokokupilo
@ -147,30 +174,28 @@ eo:
    RANGE_TO: al
    SINGULARNAME: 'Teksta kampo'
    TEXTLENGTH: 'Longo de teksto'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Elekti alŝutan dosierujon'
-  FieldEditor:
-    ADD: Aldoni
-    SELECTAFIELD: 'Elekti kampon'
-  Form:
-    FIELDISREQUIRED: '%s estas nepra'
-  GridField:
-    Filter: Filtri
-    ResetFilter: Restartigi
-  SiteTree:
-    PLURALNAME: Paĝoj
-    SINGULARNAME: Paĝo
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\EditableFormField\Validator:
+    REQUIRED_ERROR: 'Formularaj kampoj ne povas esti nepraj kaj havi kondiĉajn vidigoregulojn.'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    CUSTOMRULESTAB: 'Propraj reguloj'
+    EMAILCONTENTTAB: 'Retpoŝta enhavo'
+    EMAILDETAILSTAB: 'Retpoŝtaj detaloj'
+    PLURALNAME: 'Propra formularo por retpoŝtaj ricevontoj'
+    SINGULARNAME: 'Propra formularo por retpoŝta ricevonto'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
+    PLURALNAME: 'Retpoŝtaj ricevontaj kondiĉoj de propra formularo'
+    SINGULARNAME: 'Retpoŝta ricevonta kondiĉo de propra formularo'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Elŝuti dosieron'
    PLURALNAME: 'Senditaj dosieraj kampoj'
    SINGULARNAME: 'Sendita dosiera kampo'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Senditaj formularoj'
    SINGULARNAME: 'Sendita formularo'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Senditaj formularaj kampoj'
    SINGULARNAME: 'Sendita formulara kampo'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Aldoni retpoŝtan ricevonton'
    CLEARBUTTON: Vakigi
    CONFIGURATION: Agordaro
@ -221,28 +246,3 @@ eo:
    TYPEREPLY: 'Tajpi respondan adreson'
    TYPESUBJECT: 'Tajpi temon'
    TYPETO: 'Tajpi al-adreson'
-  UserDefinedForm_EmailRecipient:
-    CUSTOMRULESTAB: 'Propraj reguloj'
-    EMAILCONTENTTAB: 'Retpoŝta enhavo'
-    EMAILDETAILSTAB: 'Retpoŝtaj detaloj'
-    PLURALNAME: 'Propra formularo por retpoŝtaj ricevontoj'
-    SINGULARNAME: 'Propra formularo por retpoŝta ricevonto'
-  UserDefinedForm_EmailRecipientCondition:
-    PLURALNAME: 'Retpoŝtaj ricevontaj kondiĉoj de propra formularo'
-    SINGULARNAME: 'Retpoŝta ricevonta kondiĉo de propra formularo'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Aldoni kampon'
-    ADD_FIELD_GROUP: 'Aldoni kampogrupon'
-    ADD_PAGE_BREAK: 'Aldoni paĝosalton'
-    FORMFIELDS: 'Formularaj kampoj'
-  UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Ne eblas meti nepran kampon ''{name}'' en kondiĉa paĝo'
-    NO_PAGE: 'Trovis kampon ''{name}'' antaŭ iuj paĝoj'
-    UNEXPECTED_BREAK: 'Neatendita paĝosalto ''{name}'' en ingita kampo ''{group}'''
-    UNEXPECTED_GROUP_END: 'troviĝas ''{name}'' sen kongrua grupo'
-    WRONG_GROUP_END: 'trovita ''{name}'' fermas malĝustan grupon ''{group}'''
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtri sendaĵojn..'
-    FROM: De
-    TILL: Ĝis
-    WHEREVALUEIS: 'kie valoro estas..'
--- a/lang/es_ES.yml
+++ b/lang/es_ES.yml
@ -13,34 +13,26 @@ es_ES:
    SHOWTHISFIELD: 'Mostrar este campo'
    VALUE: Valor
    WHEN: Cuando
-  EditableCheckbox:
-    PLURALNAME: 'Casillas de verificación'
-    SINGULARNAME: 'Campo de casillas de verificación'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Grupos de casillas de verificación'
-    SINGULARNAME: 'Grupo de casillas de verificación'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Selectores de país'
-    SINGULARNAME: 'Selector de país'
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Seleccionar carpeta de carga'
+  FieldEditor:
+    ADD: Agregar
+    SELECTAFIELD: 'Seleccionar un campo'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Páginas
+    SINGULARNAME: Página
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s es requerido'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filtro
+    ResetFilter: Restablecer
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtrar envíos.'
+    WHEREVALUEIS: 'donde el valor es'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Reglas personalizadas editables'
    SINGULARNAME: 'Regla personalizada editable'
-  EditableDateField:
-    PLURALNAME: 'Campos de fecha'
-    SINGULARNAME: 'Campo de fecha'
-  EditableDropdown:
-    PLURALNAME: 'Listas desplegables'
-  EditableEmailField:
-    PLURALNAME: 'Correos electrónicos'
-    SINGULARNAME: 'Campo de correo electrónico'
-  EditableFieldGroup:
-    PLURALNAME: 'Grupos de campos editables'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_START: 'Grupo {group}'
-  EditableFileField:
-    PLURALNAME: 'Campos subir archivo'
-    SINGULARNAME: 'Campo subir archivo'
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Agregar
    ADDLabel: 'Agregar opción'
    ADDRULE: 'Agregar regla'
@ -82,58 +74,72 @@ es_ES:
    VALUE: Valor
    WHEN: Cuando
    'YES': Sí
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 'Casillas de verificación'
+    SINGULARNAME: 'Campo de casillas de verificación'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Grupos de casillas de verificación'
+    SINGULARNAME: 'Grupo de casillas de verificación'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Selectores de país'
+    SINGULARNAME: 'Selector de país'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Campos de fecha'
+    SINGULARNAME: 'Campo de fecha'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 'Listas desplegables'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Correos electrónicos'
+    SINGULARNAME: 'Campo de correo electrónico'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Grupos de campos editables'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_START: 'Grupo {group}'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Campos subir archivo'
+    SINGULARNAME: 'Campo subir archivo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Selecionar el nivel del encabezado'
    PLURALNAME: Encabezados
    SINGULARNAME: Encabezado
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: '¿Ocultar de los informes?'
    PLURALNAME: 'Bloques HTML'
    SINGULARNAME: 'Bloque HTML'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Listado de miembros'
    SINGULARNAME: 'Listado de miembro'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Campos de opción múltiple'
    SINGULARNAME: 'Campo de opción múltiple'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Campos numéricos'
    SINGULARNAME: 'Campo numérico'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remover esta opción'
    DRAG: 'Arrastrar para reorganizar el orden de las opciones'
    LOCKED: 'Estos campos no pueden ser modificados'
    PLURALNAME: 'Opciones editables'
    SINGULARNAME: 'Opciones editables'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Cantidad de filas'
    PLURALNAME: 'Campos de texto'
    SINGULARNAME: 'Campo de texto'
    TEXTLENGTH: 'Longitud del texto'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Seleccionar carpeta de carga'
-  FieldEditor:
-    ADD: Agregar
-    SELECTAFIELD: 'Seleccionar un campo'
-  Form:
-    FIELDISREQUIRED: '%s es requerido'
-  GridField:
-    Filter: Filtro
-    ResetFilter: Restablecer
-  SiteTree:
-    PLURALNAME: Páginas
-    SINGULARNAME: Página
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Destinatarios definidos por el usuario'
+    SINGULARNAME: 'Destinatario definido por el usuario'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Descargar archivo'
    PLURALNAME: 'Archivos enviados'
    SINGULARNAME: 'Archivo enviado'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Formularios enviados'
    SINGULARNAME: 'Formulario enviado'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Campos enviados en formulario'
    SINGULARNAME: 'Campo enviado en formulario'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Agregar destinatario de email'
    CONFIGURATION: Configuración
    DESCRIPTION: 'Agrega un formulario personalizable.'
@ -161,9 +167,3 @@ es_ES:
    SUBMISSIONS: Propuestas
    SUBMITBUTTON: Enviar
    TEXTONSUBMIT: 'Texto en el botón aceptar/submit:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Destinatarios definidos por el usuario'
-    SINGULARNAME: 'Destinatario definido por el usuario'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtrar envíos.'
-    WHEREVALUEIS: 'donde el valor es'
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@ -13,13 +13,9 @@ es_MX:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ es_MX:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ es_MX:
    SUBMISSIONS: Peticiones
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Texto en el botón de envío:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@ -13,13 +13,9 @@ et_EE:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -48,33 +44,40 @@ et_EE:
    VALUE: Value
    WHEN: When
    'YES': Jah
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -94,6 +97,3 @@ et_EE:
    SUBMISSIONS: Kaastööd
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Kiri saatmise nupul:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@ -1,13 +1,20 @@
 fa_IR:
  CustomRule:
    DELETE: حذف
-  EditableDateField:
-    PLURALNAME: 'فیلدهای تاریخ'
-    SINGULARNAME: 'فیلد تاریخ'
-  EditableEmailField:
-    PLURALNAME: 'فیلدهای ایمیل'
-    SINGULARNAME: 'فیلد ایمیل'
-  EditableFormField:
+  FieldEditor:
+    ADD: افزودن
+    SELECTAFIELD: 'انتخاب یک فیلد'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: صفحات
+    SINGULARNAME: صفحه
+  SilverStripe\Forms\GridField\GridField:
+    Filter: پالایش
+    ResetFilter: 'از نو'
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'افزودن فیلد'
+    ADD_FIELD_GROUP: 'افزودن فیلد گروهی'
+    FORMFIELDS: 'فیلدهای فرم'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: افزودن
    DEFAULTTOTODAY: 'تاریخ پیش فرض به امروز؟'
    DELETE: حذف
@ -18,32 +25,29 @@ fa_IR:
    RIGHTTITLE: 'عنوان سمت راست'
    TITLE: عنوان
    'YES': بله
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'فیلدهای تاریخ'
+    SINGULARNAME: 'فیلد تاریخ'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'فیلدهای ایمیل'
+    SINGULARNAME: 'فیلد ایمیل'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    TITLE_FIRST: 'صفحه نخست'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    PLURALNAME: 'بلوک های HTML'
    SINGULARNAME: 'بلوک HTML'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'انتخاب به عنوان پیش فرض؟'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'فیلد عددی'
    RANGE_TO: به
    SINGULARNAME: 'فیلد عددی'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'تعداد سطر ها'
    RANGE_TO: به
-  FieldEditor:
-    ADD: افزودن
-    SELECTAFIELD: 'انتخاب یک فیلد'
-  GridField:
-    Filter: پالایش
-    ResetFilter: 'از نو'
-  SiteTree:
-    PLURALNAME: صفحات
-    SINGULARNAME: صفحه
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'دانلود فایل'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    CLEARBUTTON: پاک‌کردن
    DISABLECSRFSECURITYTOKEN: 'غیر فعال کردن CSRF'
    EMAILADDRESS: 'ایمیل'
@ -59,7 +63,3 @@ fa_IR:
    SUBMITBUTTON: 'ثبت کردن'
    TEXTONCLEAR: 'متن روی دکمه خالی کردن فرم:'
    TEXTONSUBMIT: 'متن روی دکمه ثبت کردن:'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'افزودن فیلد'
-    ADD_FIELD_GROUP: 'افزودن فیلد گروهی'
-    FORMFIELDS: 'فیلدهای فرم'
--- a/lang/fi_FI.yml
+++ b/lang/fi_FI.yml
@ -13,39 +13,39 @@ fi_FI:
    SHOWTHISFIELD: 'Näytä tämä kenttä'
    VALUE: 'On sama kuin'
    WHEN: Kun
-  EditableCheckbox:
-    PLURALNAME: Valintaruudut
-    SINGULARNAME: Valintaruutukenttä
-  EditableCheckboxGroupField:
-    PLURALNAME: Valintaruutu-ryhmät
-    SINGULARNAME: Valintaruutu-ryhmä
-  EditableCountryDropdownField:
-    PLURALNAME: Maavalikot
-    SINGULARNAME: Maavalikko
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Valitse siirtokansio'
+  FieldEditor:
+    ADD: Lisää
+    SELECTAFIELD: 'Valitse kenttä'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Sivut
+    SINGULARNAME: Sivu
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s vaaditaan'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Suodin
+    ResetFilter: Nollaa
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Lisää kenttä'
+    ADD_FIELD_GROUP: 'Lisää kenttäryhmä'
+    ADD_PAGE_BREAK: 'Lisää sivunvaihto'
+    FORMFIELDS: Lomakekentät
+  SilverStripe\UserForms\Extension\UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Pakollista kenttää ''{name}'' ei voida sijoittaa ehdolliseen sivuun'
+    NO_PAGE: 'Kenttä ''{name}'' löydetty ennen yhtään sivua'
+    UNEXPECTED_BREAK: 'Odottamaton sivunvaihto ''{name}'' sisäkkäisestä kentästä: ''{group}'''
+    UNEXPECTED_GROUP_END: '''{name}'' löydetty ilman vastaavaa ryhmää'
+    WRONG_GROUP_END: '''{name}'' sulkee väärän ryhmän: ''{group}'''
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Suodata lomakkeella lähetettyjä...'
+    FROM: Lähettäjä
+    TILL: Asti
+    WHEREVALUEIS: 'jonka arvo on...'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Muokattavat mukautetut säännöt'
    SINGULARNAME: 'Muokattava mukautettu sääntö'
-  EditableDateField:
-    PLURALNAME: Päivämääräkentät
-    SINGULARNAME: Päivämääräkenttä
-  EditableDropdown:
-    PLURALNAME: Pudotusvalikot
-    SINGULARNAME: Pudotusvalikko
-  EditableEmailField:
-    PLURALNAME: Sähköpostikentät
-    SINGULARNAME: Sähköpostikenttä
-  EditableFieldGroup:
-    PLURALNAME: 'Muokattavat kenttäryhmät'
-    SINGULARNAME: 'Muokattava kenttäryhmä'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_END: '{group} loppu'
-    FIELD_GROUP_START: 'Ryhmä {ryhmä}'
-    PLURALNAME: 'Muokattavien kenttäryhmien loppu'
-    SINGULARNAME: 'Muokattavan kenttäryhmän loppu'
-  EditableFileField:
-    PLURALNAME: Tiedostonlähettämiskentät
-    SINGULARNAME: Tiedostonlähettämiskenttä
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Lisää
    ADDLabel: 'Lisää valinta'
    ADDRULE: 'Lisää sääntö'
@ -98,48 +98,75 @@ fi_FI:
    VALUE: 'On sama kuin'
    WHEN: Kun
    'YES': Kyllä
-  EditableFormFieldValidator:
-    REQUIRED_ERROR: 'Lomakekentät eivät voi olla pakollisia ja sisältää ehdollisia näyttösääntöjä'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Valintaruudut
+    SINGULARNAME: Valintaruutukenttä
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: Valintaruutu-ryhmät
+    SINGULARNAME: Valintaruutu-ryhmä
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: Maavalikot
+    SINGULARNAME: Maavalikko
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: Päivämääräkentät
+    SINGULARNAME: Päivämääräkenttä
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Pudotusvalikot
+    SINGULARNAME: Pudotusvalikko
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: Sähköpostikentät
+    SINGULARNAME: Sähköpostikenttä
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Muokattavat kenttäryhmät'
+    SINGULARNAME: 'Muokattava kenttäryhmä'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_END: '{group} loppu'
+    FIELD_GROUP_START: 'Ryhmä {ryhmä}'
+    PLURALNAME: 'Muokattavien kenttäryhmien loppu'
+    SINGULARNAME: 'Muokattavan kenttäryhmän loppu'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: Tiedostonlähettämiskentät
+    SINGULARNAME: Tiedostonlähettämiskenttä
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Valitse otsikkotaso'
    PLURALNAME: Otsikot
    SINGULARNAME: Otsikko
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: Sivuvaihdot
    SINGULARNAME: Sivunvaihto
    STEP_TITLE: 'Sivu {page}'
    TITLE_FIRST: 'Ensimmäinen sivu'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    CONTENT: HTML
    HIDEFROMREPORT: 'Piilota raporteista?'
    HIDELABEL: 'Piilota ''Otsikko'' näytettävältä lomakkeelta?'
    PLURALNAME: HTML-alueet
    SINGULARNAME: HTML-alue
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: Jäsenlistakentät
    SINGULARNAME: Jäsenlistakenttä
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'Valittu oletuksena?'
    OPTIONSTAB: Valinnat
    PLURALNAME: 'Muokattavat monivalintakentät'
    SINGULARNAME: 'Muokattava monivalintakenttä'
    TITLE: Otsikko
    VALUE: Arvo
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numeeriset kentät'
    RANGE: 'Sallittu numeerinen väli'
    RANGE_TO: –
    SINGULARNAME: 'Numeerinen kenttä'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Poista tämä valinta'
    DRAG: 'Raahaa muuttaaksesi valintojen järjestystä'
    LOCKED: 'Näitä kenttiä ei voi muokata'
    PLURALNAME: 'Muokattavat vaihtoehdot'
    SINGULARNAME: 'Muokattava vaihtoehto'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: Radiopainikkeet
    SINGULARNAME: Radiopainike
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Rivien määrä'
    NUMBERROWS_DESCRIPTION: 'Kenttät, joissa on enemmän kuin yksi rivi, luodaan tekstialueena.'
    PLACEHOLDER: Opastusteksti
@ -147,30 +174,28 @@ fi_FI:
    RANGE_TO: –
    SINGULARNAME: Tekstikenttä
    TEXTLENGTH: 'Tekstin pituus'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Valitse siirtokansio'
-  FieldEditor:
-    ADD: Lisää
-    SELECTAFIELD: 'Valitse kenttä'
-  Form:
-    FIELDISREQUIRED: '%s vaaditaan'
-  GridField:
-    Filter: Suodin
-    ResetFilter: Nollaa
-  SiteTree:
-    PLURALNAME: Sivut
-    SINGULARNAME: Sivu
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\EditableFormField\Validator:
+    REQUIRED_ERROR: 'Lomakekentät eivät voi olla pakollisia ja sisältää ehdollisia näyttösääntöjä'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    CUSTOMRULESTAB: 'Mukautetut säännöt'
+    EMAILCONTENTTAB: 'Sähköpostin sisältö'
+    EMAILDETAILSTAB: 'Sähköpostin tiedot'
+    PLURALNAME: 'Lomakkeen vastaanottosähköpostit'
+    SINGULARNAME: 'Lomakkeen vastaanottosähköposti'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
+    PLURALNAME: 'User Defined Form sähköpostien vastaanoton säännöt'
+    SINGULARNAME: 'User Defined Form sähköpostin vastaanoton sääntö'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Lataa tiedosto'
    PLURALNAME: 'Lähetetyt tiedostokentät'
    SINGULARNAME: 'Lähetetty tiedostokenttä'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Lähetetyt lomakkeet'
    SINGULARNAME: 'Lähetetty lomake'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Lähetetyt lomakekentät'
    SINGULARNAME: 'Lähetetty lomakekenttä'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Lisää sähköpostin vastaanottaja'
    CLEARBUTTON: Tyhjennä
    CONFIGURATION: Asetukset
@ -221,28 +246,3 @@ fi_FI:
    TYPEREPLY: 'Kirjoita vastausosoite'
    TYPESUBJECT: 'Kirjoita otsikko'
    TYPETO: 'Kirjoita vastaanottajan osoite'
-  UserDefinedForm_EmailRecipient:
-    CUSTOMRULESTAB: 'Mukautetut säännöt'
-    EMAILCONTENTTAB: 'Sähköpostin sisältö'
-    EMAILDETAILSTAB: 'Sähköpostin tiedot'
-    PLURALNAME: 'Lomakkeen vastaanottosähköpostit'
-    SINGULARNAME: 'Lomakkeen vastaanottosähköposti'
-  UserDefinedForm_EmailRecipientCondition:
-    PLURALNAME: 'User Defined Form sähköpostien vastaanoton säännöt'
-    SINGULARNAME: 'User Defined Form sähköpostin vastaanoton sääntö'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Lisää kenttä'
-    ADD_FIELD_GROUP: 'Lisää kenttäryhmä'
-    ADD_PAGE_BREAK: 'Lisää sivunvaihto'
-    FORMFIELDS: Lomakekentät
-  UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Pakollista kenttää ''{name}'' ei voida sijoittaa ehdolliseen sivuun'
-    NO_PAGE: 'Kenttä ''{name}'' löydetty ennen yhtään sivua'
-    UNEXPECTED_BREAK: 'Odottamaton sivunvaihto ''{name}'' sisäkkäisestä kentästä: ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' löydetty ilman vastaavaa ryhmää'
-    WRONG_GROUP_END: '''{name}'' sulkee väärän ryhmän: ''{group}'''
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Suodata lomakkeella lähetettyjä...'
-    FROM: Lähettäjä
-    TILL: Asti
-    WHEREVALUEIS: 'jonka arvo on...'
--- a/lang/fr_FR.yml
+++ b/lang/fr_FR.yml
@ -13,13 +13,9 @@ fr_FR:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Champs email'
-    SINGULARNAME: 'Champ email'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ fr_FR:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Champs email'
+    SINGULARNAME: 'Champ email'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -94,6 +97,3 @@ fr_FR:
    SUBMISSIONS: Soumissions
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Texte du bouton Envoyer :'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/hr_HR.yml
+++ b/lang/hr_HR.yml
@ -13,25 +13,12 @@ hr_HR:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableDateField:
-    PLURALNAME: 'Date Fields'
-    SINGULARNAME: 'Date Field'
-  EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  FieldEditor:
+    ADD: Dodaj
+    SELECTAFIELD: 'Select a Field'
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -58,36 +45,52 @@ hr_HR:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Checkboxes
+    SINGULARNAME: 'Checkbox Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Checkbox Groups'
+    SINGULARNAME: 'Checkbox Group'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Date Fields'
+    SINGULARNAME: 'Date Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  FieldEditor:
-    ADD: Dodaj
-    SELECTAFIELD: 'Select a Field'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -107,6 +110,3 @@ hr_HR:
    SUBMISSIONS: Submissions
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Text on submit button:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/id.yml
+++ b/lang/id.yml
@ -9,7 +9,10 @@ id:
    NOTBLANK: 'Tidak Kosong'
    VALUE: Nilai
    WHEN: Ketika
-  EditableFormField:
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Halaman
+    SINGULARNAME: Halaman
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Tambah
    ADDLabel: 'Tambah pilihan'
    BLANK: Kosong
@ -21,6 +24,3 @@ id:
    MINVALUE: 'Nilai Min'
    SHOW: Tampilkan
    VALIDATION: Validasi
-  SiteTree:
-    PLURALNAME: Halaman
-    SINGULARNAME: Halaman
--- a/lang/it.yml
+++ b/lang/it.yml
@ -13,39 +13,39 @@ it:
    SHOWTHISFIELD: 'Mostra questo campo'
    VALUE: Valore
    WHEN: Quando
-  EditableCheckbox:
-    PLURALNAME: 'Caselle di controllo'
-    SINGULARNAME: 'Campo casella di controllo'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Gruppi di caselle di controllo'
-    SINGULARNAME: 'Gruppo di caselle di controllo'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Menù a tendina Nazioni'
-    SINGULARNAME: 'Menù a tendina Nazioni'
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Seleziona la cartella di caricamento'
+  FieldEditor:
+    ADD: Aggiungi
+    SELECTAFIELD: 'Seleziona un campo'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Pagine
+    SINGULARNAME: Pagina
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s è richiesto'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filtro
+    ResetFilter: Reset
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Aggiungi campo'
+    ADD_FIELD_GROUP: 'Aggiungi gruppo di campi'
+    ADD_PAGE_BREAK: 'Aggiungi interruzione di pagina'
+    FORMFIELDS: 'Campi del modulo'
+  SilverStripe\UserForms\Extension\UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Il campo richiesto ''{name}'' non può essere posizionato all''interno di una pagina condizionale'
+    NO_PAGE: 'Il campo ''{name}'' è stato trovato prima di una qualunque pagina'
+    UNEXPECTED_BREAK: 'Interruzione di pagina ''{name}'' inattesa all''interno del campo nidificato ''{group}'''
+    UNEXPECTED_GROUP_END: '''{name}'' trovato senza un gruppo corrispondente'
+    WRONG_GROUP_END: '''{name}'' trovato chiude il gruppo sbagliato ''{group}'''
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtra invii..'
+    FROM: Da
+    TILL: 'Fino a'
+    WHEREVALUEIS: 'dove il valore è..'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Regole personalizzate modificabili'
    SINGULARNAME: 'Regola personalizzata modificabile'
-  EditableDateField:
-    PLURALNAME: 'Campi date'
-    SINGULARNAME: 'Campo data'
-  EditableDropdown:
-    PLURALNAME: 'Menù a tendina'
-    SINGULARNAME: 'Campo menù a tendina'
-  EditableEmailField:
-    PLURALNAME: 'Campi e-mail'
-    SINGULARNAME: 'Campo e-mail'
-  EditableFieldGroup:
-    PLURALNAME: 'Gruppi di campi modificabili'
-    SINGULARNAME: 'Gruppo di campi modificabili'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_END: 'fine {group}'
-    FIELD_GROUP_START: 'Gruppo {group}'
-    PLURALNAME: 'Fine dei gruppi di campi modificabili'
-    SINGULARNAME: 'Fine del gruppo di campi modificabili'
-  EditableFileField:
-    PLURALNAME: 'Campi di caricamento file'
-    SINGULARNAME: 'Campo di caricamento file'
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Aggiungi
    ADDLabel: 'Aggiungi opzione'
    ADDRULE: 'Aggiungi regola'
@ -98,48 +98,75 @@ it:
    VALUE: Valore
    WHEN: Quando
    'YES': Si
-  EditableFormFieldValidator:
-    REQUIRED_ERROR: 'I campi dei form non possono essere obbligatori e avere regole di visualizzazione condizionali.'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 'Caselle di controllo'
+    SINGULARNAME: 'Campo casella di controllo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Gruppi di caselle di controllo'
+    SINGULARNAME: 'Gruppo di caselle di controllo'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Menù a tendina Nazioni'
+    SINGULARNAME: 'Menù a tendina Nazioni'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Campi date'
+    SINGULARNAME: 'Campo data'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 'Menù a tendina'
+    SINGULARNAME: 'Campo menù a tendina'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Campi e-mail'
+    SINGULARNAME: 'Campo e-mail'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Gruppi di campi modificabili'
+    SINGULARNAME: 'Gruppo di campi modificabili'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_END: 'fine {group}'
+    FIELD_GROUP_START: 'Gruppo {group}'
+    PLURALNAME: 'Fine dei gruppi di campi modificabili'
+    SINGULARNAME: 'Fine del gruppo di campi modificabili'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Campi di caricamento file'
+    SINGULARNAME: 'Campo di caricamento file'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Seleziona livello di intestazione'
    PLURALNAME: Intestazioni
    SINGULARNAME: Intestazione
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: 'Interruzioni di pagina'
    SINGULARNAME: 'Interruzione di pagina'
    STEP_TITLE: 'Pagina {page}'
    TITLE_FIRST: 'Prima pagina'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    CONTENT: HTML
    HIDEFROMREPORT: 'Nascondi dai rapporti?'
    HIDELABEL: 'Nascondi etichetta ''Titolo'' dal frontend?'
    PLURALNAME: 'Blocchi HTML'
    SINGULARNAME: 'Blocco HTML'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Campi lista membri'
    SINGULARNAME: 'Campo lista membri'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'Selezionato di default?'
    OPTIONSTAB: Opzioni
    PLURALNAME: 'Campi a opzione multipla editabili'
    SINGULARNAME: 'Campo a opzione multipla editabili'
    TITLE: Titolo
    VALUE: Valore
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Campi numerici'
    RANGE: 'Intervallo numerico ammesso'
    RANGE_TO: 'fino a'
    SINGULARNAME: 'Campo numerico'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Rimuovi questa opzione'
    DRAG: 'Trascina per modificare l''ordine delle opzioni'
    LOCKED: 'Questi campi non possono essere modificati'
    PLURALNAME: 'Opzioni modificabili'
    SINGULARNAME: 'Opzione modificabile'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Gruppi di pulsanti a scelta singola'
    SINGULARNAME: 'Gruppo di pulsanti a scelta singola'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Numero di righe'
    NUMBERROWS_DESCRIPTION: 'Campi con più di una riga verranno generati come area testo'
    PLACEHOLDER: Segnaposto
@ -147,30 +174,28 @@ it:
    RANGE_TO: a
    SINGULARNAME: 'Campo testo'
    TEXTLENGTH: 'Lunghezza testo consentita'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Seleziona la cartella di caricamento'
-  FieldEditor:
-    ADD: Aggiungi
-    SELECTAFIELD: 'Seleziona un campo'
-  Form:
-    FIELDISREQUIRED: '%s è richiesto'
-  GridField:
-    Filter: Filtro
-    ResetFilter: Reset
-  SiteTree:
-    PLURALNAME: Pagine
-    SINGULARNAME: Pagina
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\EditableFormField\Validator:
+    REQUIRED_ERROR: 'I campi dei form non possono essere obbligatori e avere regole di visualizzazione condizionali.'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    CUSTOMRULESTAB: 'Regole personalizzate'
+    EMAILCONTENTTAB: 'Contenuto dell''e-mail'
+    EMAILDETAILSTAB: 'Dettagli dell''e-mail'
+    PLURALNAME: 'Destinatari e-mail del modulo definito dall''utente'
+    SINGULARNAME: 'Destinatario e-mail del modulo definito dall''utente'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
+    PLURALNAME: 'Condizioni per il destinatario del modulo definito dall''utente'
+    SINGULARNAME: 'Condizione per il destinatario del modulo definito dall''utente'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Scarica file'
    PLURALNAME: 'Campi file inviati'
    SINGULARNAME: 'Campo file inviati'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Moduli inviati'
    SINGULARNAME: 'Modulo inviato'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Campi moduli inviati'
    SINGULARNAME: 'Campo modulo inviato'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Aggiungi destinatario e-mail'
    CLEARBUTTON: Azzera
    CONFIGURATION: Configurazione
@ -221,28 +246,3 @@ it:
    TYPEREPLY: 'Inserisci l''e-mail di risposta'
    TYPESUBJECT: 'Inserisci l''oggetto'
    TYPETO: 'Inserisci l''e-mail destinatario'
-  UserDefinedForm_EmailRecipient:
-    CUSTOMRULESTAB: 'Regole personalizzate'
-    EMAILCONTENTTAB: 'Contenuto dell''e-mail'
-    EMAILDETAILSTAB: 'Dettagli dell''e-mail'
-    PLURALNAME: 'Destinatari e-mail del modulo definito dall''utente'
-    SINGULARNAME: 'Destinatario e-mail del modulo definito dall''utente'
-  UserDefinedForm_EmailRecipientCondition:
-    PLURALNAME: 'Condizioni per il destinatario del modulo definito dall''utente'
-    SINGULARNAME: 'Condizione per il destinatario del modulo definito dall''utente'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Aggiungi campo'
-    ADD_FIELD_GROUP: 'Aggiungi gruppo di campi'
-    ADD_PAGE_BREAK: 'Aggiungi interruzione di pagina'
-    FORMFIELDS: 'Campi del modulo'
-  UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Il campo richiesto ''{name}'' non può essere posizionato all''interno di una pagina condizionale'
-    NO_PAGE: 'Il campo ''{name}'' è stato trovato prima di una qualunque pagina'
-    UNEXPECTED_BREAK: 'Interruzione di pagina ''{name}'' inattesa all''interno del campo nidificato ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' trovato senza un gruppo corrispondente'
-    WRONG_GROUP_END: '''{name}'' trovato chiude il gruppo sbagliato ''{group}'''
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtra invii..'
-    FROM: Da
-    TILL: 'Fino a'
-    WHEREVALUEIS: 'dove il valore è..'
--- a/lang/ja.yml
+++ b/lang/ja.yml
@ -1,15 +1,18 @@
 ja:
-  EditableEmailField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
    PLURALNAME: メールフィールド
    SINGULARNAME: メールフィールド
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'レポートから隠しますか?'
    PLURALNAME: HTMLブロック
    SINGULARNAME: HTMLブロック
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 編集可能なマルチオプションフィールド
    SINGULARNAME: 編集可能なマルチオプションフィールド
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'ユーザー定義フォームのメール受信者'
+    SINGULARNAME: 'ユーザー定義フォームのメール受信者'
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: メール
    EMAILBODY: ボディ
    EMAILFROM: '送信者'
@ -29,6 +32,3 @@ ja:
    SINGULARNAME: 'ユーザー定義フォーム'
    SUBMITBUTTON: 送信
    TEXTONSUBMIT: '送信ボタンのテキスト:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'ユーザー定義フォームのメール受信者'
-    SINGULARNAME: 'ユーザー定義フォームのメール受信者'
--- a/lang/mi.yml
+++ b/lang/mi.yml
@ -13,28 +13,21 @@ mi:
    SHOWTHISFIELD: 'Whakaaturia Tēnei Āpure'
    VALUE: Uara
    WHEN: Ina
-  EditableCheckbox:
-    PLURALNAME: 'Ngā Pouakataki'
-    SINGULARNAME: 'Āpure Pouakataki'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Ngā Rōpū Pouakataki'
-    SINGULARNAME: 'Rōpū Pouakataki'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Ngā Takaiho Whenua'
-    SINGULARNAME: 'Takaiho Whenua'
-  EditableDateField:
-    PLURALNAME: 'Ngā Āpure Rā'
-    SINGULARNAME: 'Āpure Rā'
-  EditableDropdown:
-    PLURALNAME: 'Ngā Takaiho'
-    SINGULARNAME: 'Āpure Takaiho'
-  EditableEmailField:
-    PLURALNAME: 'Ngā Āpure Īmēra'
-    SINGULARNAME: 'Āpure Īmēra'
-  EditableFileField:
-    PLURALNAME: 'Ngā Āpure Tukuatu Kōnae'
-    SINGULARNAME: 'Āpure Tukuatu Kōnae'
-  EditableFormField:
+  FieldEditor:
+    ADD: Tāpiri
+    SELECTAFIELD: 'Tīpakohia tētahi Āpure'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: 'Ngā Whārangi'
+    SINGULARNAME: Whārangi
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: 'Kei te hiahiatia te %s'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Tātari
+    ResetFilter: 'Tautuhi Anō'
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Ngā Tukunga Tātari...'
+    WHEREVALUEIS: 'ko te uara ko...'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Tāpiri
    ADDRULE: 'Tāpiri Ture'
    BLANK: Pātea
@ -71,56 +64,69 @@ mi:
    VALIDATION: Manatokonga
    VALUE: Uara
    WHEN: Ina
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 'Ngā Pouakataki'
+    SINGULARNAME: 'Āpure Pouakataki'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Ngā Rōpū Pouakataki'
+    SINGULARNAME: 'Rōpū Pouakataki'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Ngā Takaiho Whenua'
+    SINGULARNAME: 'Takaiho Whenua'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Ngā Āpure Rā'
+    SINGULARNAME: 'Āpure Rā'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 'Ngā Takaiho'
+    SINGULARNAME: 'Āpure Takaiho'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Ngā Āpure Īmēra'
+    SINGULARNAME: 'Āpure Īmēra'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Ngā Āpure Tukuatu Kōnae'
+    SINGULARNAME: 'Āpure Tukuatu Kōnae'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Kōwhiri Taumata Pane'
    PLURALNAME: 'Ngā Pane'
    SINGULARNAME: Pane
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hunaia i ngā pūrongo?'
    PLURALNAME: 'Ngā Poraka HTML'
    SINGULARNAME: 'Poraka HTML'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Ngā Āpure Rārangi Mema'
    SINGULARNAME: 'Āpure Rārangi Mema'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Ngā Āpure Kōwhiringa Maha Whakatika'
    SINGULARNAME: 'Āpure Kōwhiringa Maha Whakatika'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Tangohia tēnei kōwhiringa'
    DRAG: 'Tōia hei hurinaha i te raupapa kōwhiringa'
    LOCKED: 'Kāore e taea te whakakē ēnei āpure'
    PLURALNAME: 'Ngā Kōwhiringa Whakatika'
    SINGULARNAME: 'Kōwhiringa Whakatika'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Ngā āpure irirangi'
    SINGULARNAME: 'Āpure irirangi'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Maha kapa'
    PLURALNAME: 'Ngā Āpure Tuhinga'
    SINGULARNAME: 'Āpure Tuhinga'
    TEXTLENGTH: 'Roa tuhinga'
-  FieldEditor:
-    ADD: Tāpiri
-    SELECTAFIELD: 'Tīpakohia tētahi Āpure'
-  Form:
-    FIELDISREQUIRED: 'Kei te hiahiatia te %s'
-  GridField:
-    Filter: Tātari
-    ResetFilter: 'Tautuhi Anō'
-  SiteTree:
-    PLURALNAME: 'Ngā Whārangi'
-    SINGULARNAME: Whārangi
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Ngā Kaiwhiwhi Īmēra Puka Tautuhi ā-Kaiwhakamahi'
+    SINGULARNAME: 'Kaiwhiwhi Īmēra Puka Tautuhi ā-Kaiwhakamahi'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Tikiake Kōnae'
    PLURALNAME: 'Ngā Āpure Kōnae Kua Tukuna'
    SINGULARNAME: 'Āpure Kōnae Kua Tukuna'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Ngā Puka Kua Tukuna'
    SINGULARNAME: 'Puka Kua Tukuna'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Ngā Āpure Puka Kua Tukuna'
    SINGULARNAME: 'Āpure Puka Kua Tukuna'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Tāpiri Kaiwhirhi Īmēra'
    CONFIGURATION: Whirihoranga
    DESCRIPTION: 'Ka tāpiri i te puka ka taea te whakarite.'
@ -146,9 +152,3 @@ mi:
    SUBMISSIONS: 'Ngā Tukunga'
    SUBMITBUTTON: Tuku
    TEXTONSUBMIT: 'Kuputuhi i te pātene tuku:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Ngā Kaiwhiwhi Īmēra Puka Tautuhi ā-Kaiwhakamahi'
-    SINGULARNAME: 'Kaiwhiwhi Īmēra Puka Tautuhi ā-Kaiwhakamahi'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Ngā Tukunga Tātari...'
-    WHEREVALUEIS: 'ko te uara ko...'
--- a/lang/ms_MY.yml
+++ b/lang/ms_MY.yml
@ -13,13 +13,9 @@ ms_MY:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ ms_MY:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ ms_MY:
    SUBMISSIONS: Kiriman
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Teks di atas butang hantar:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@ -13,28 +13,21 @@ nb_NO:
    SHOWTHISFIELD: 'Vis dette feltet'
    VALUE: Verdi
    WHEN: Når
-  EditableCheckbox:
-    PLURALNAME: Avkrysningsbokser
-    SINGULARNAME: 'Avkrysningsboks felt'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Avkrysningsboks grupper'
-    SINGULARNAME: 'Avkrysningsboks gruppe'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Land nedfellsmenyer'
-    SINGULARNAME: 'Land nedfellsmeny'
-  EditableDateField:
-    PLURALNAME: Datofelter
-    SINGULARNAME: Datofelt
-  EditableDropdown:
-    PLURALNAME: Nedfellsmeny
-    SINGULARNAME: 'Nedfellsmeny felt'
-  EditableEmailField:
-    PLURALNAME: 'Epost felt'
-    SINGULARNAME: 'Epost felt'
-  EditableFileField:
-    PLURALNAME: Filopplastingsfelter
-    SINGULARNAME: Filopplastingsfelt
-  EditableFormField:
+  FieldEditor:
+    ADD: 'Legg til'
+    SELECTAFIELD: 'Velg et felt'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Sider
+    SINGULARNAME: Side
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%er er påkrevd'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Reset
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtrer innsendte...'
+    WHEREVALUEIS: 'hvor verdi er...'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: 'Legg til'
    ADDLabel: 'Legt til alternativ'
    ADDRULE: 'Legg til regel'
@ -72,56 +65,69 @@ nb_NO:
    VALIDATION: Validering
    VALUE: Verdi
    WHEN: Når
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Avkrysningsbokser
+    SINGULARNAME: 'Avkrysningsboks felt'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Avkrysningsboks grupper'
+    SINGULARNAME: 'Avkrysningsboks gruppe'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Land nedfellsmenyer'
+    SINGULARNAME: 'Land nedfellsmeny'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: Datofelter
+    SINGULARNAME: Datofelt
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Nedfellsmeny
+    SINGULARNAME: 'Nedfellsmeny felt'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Epost felt'
+    SINGULARNAME: 'Epost felt'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: Filopplastingsfelter
+    SINGULARNAME: Filopplastingsfelt
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Velg overskrift nivå'
    PLURALNAME: Overskrifter
    SINGULARNAME: Overskrift
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Skjul fra rapporter?'
    PLURALNAME: 'HTML blokker'
    SINGULARNAME: 'HTML blokk'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Medlemliste felt'
    SINGULARNAME: 'Medlemliste felt'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Redigerbare flervalgfelt'
    SINGULARNAME: 'Redigerbare flervalgfelt'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Fjern alternativ'
    DRAG: 'Dra for endre rekkefølge på alternativene'
    LOCKED: 'Disse feltene kan ikke endres'
    PLURALNAME: 'Redigerbart alternativer'
    SINGULARNAME: 'Redigerbart alternativ'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: Radiofelt
    SINGULARNAME: Radiofelt
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Antall rader'
    PLURALNAME: Tekstfelt
    SINGULARNAME: Tekstfelt
    TEXTLENGTH: 'Tekst lengde'
-  FieldEditor:
-    ADD: 'Legg til'
-    SELECTAFIELD: 'Velg et felt'
-  Form:
-    FIELDISREQUIRED: '%er er påkrevd'
-  GridField:
-    Filter: Filter
-    ResetFilter: Reset
-  SiteTree:
-    PLURALNAME: Sider
-    SINGULARNAME: Side
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Bruker definert e-post mottakere'
+    SINGULARNAME: 'Bruker definert e-post mottaker'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Last ned fil'
    PLURALNAME: 'Sendte fil felter'
    SINGULARNAME: 'Sendte fil felt'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Sendte skjema'
    SINGULARNAME: 'Sendte skjema'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Sendt skjema felter'
    SINGULARNAME: 'Sendt skjema felt'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Legg til e-post mottaker'
    CONFIGURATION: Konfigurasjon
    DESCRIPTION: 'Legg til konfigurerbart skjema'
@ -147,9 +153,3 @@ nb_NO:
    SUBMISSIONS: Innsendte
    SUBMITBUTTON: Send
    TEXTONSUBMIT: 'Tekst på "send" knapp'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Bruker definert e-post mottakere'
-    SINGULARNAME: 'Bruker definert e-post mottaker'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtrer innsendte...'
-    WHEREVALUEIS: 'hvor verdi er...'
--- a/lang/nl_NL.yml
+++ b/lang/nl_NL.yml
@ -13,28 +13,23 @@ nl_NL:
    SHOWTHISFIELD: 'Toon dit veld'
    VALUE: Waarde
    WHEN: Wanneer
-  EditableCheckbox:
-    PLURALNAME: Selectievakjes
-    SINGULARNAME: Selectievakje
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Groepen van selectievakjes'
-    SINGULARNAME: 'Groep van selectievakje'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Vervolgkeuzelijsten van landen'
-    SINGULARNAME: 'Vervolgkeuzelijst van landen'
-  EditableDateField:
-    PLURALNAME: Datumvelden
-    SINGULARNAME: Datumveld
-  EditableDropdown:
-    PLURALNAME: Vervolgkeuzelijsten
-    SINGULARNAME: 'Vervolgkeuzelijst veld'
-  EditableEmailField:
-    PLURALNAME: 'Email velden'
-    SINGULARNAME: 'Email veld'
-  EditableFileField:
-    PLURALNAME: 'Velden voor bestand uploaden'
-    SINGULARNAME: 'Veld voor bestand uploaden'
-  EditableFormField:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Selecteer upload locatie'
+  FieldEditor:
+    ADD: Toevoegen
+    SELECTAFIELD: 'Kies een veld'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Paginas
+    SINGULARNAME: Pagina
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is verplicht'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Herstel
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Inzendingen filteren'
+    WHEREVALUEIS: 'waar waarde is...'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Toevoegen
    ADDLabel: 'Optie toevoegen'
    ADDRULE: 'Regel toevoegen'
@ -72,61 +67,72 @@ nl_NL:
    VALIDATION: Validatie
    VALUE: Waarde
    WHEN: Wanneer
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Selectievakjes
+    SINGULARNAME: Selectievakje
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Groepen van selectievakjes'
+    SINGULARNAME: 'Groep van selectievakje'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Vervolgkeuzelijsten van landen'
+    SINGULARNAME: 'Vervolgkeuzelijst van landen'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: Datumvelden
+    SINGULARNAME: Datumveld
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Vervolgkeuzelijsten
+    SINGULARNAME: 'Vervolgkeuzelijst veld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email velden'
+    SINGULARNAME: 'Email veld'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Velden voor bestand uploaden'
+    SINGULARNAME: 'Veld voor bestand uploaden'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Kies grootte van kopje'
    PLURALNAME: Kopjes
    SINGULARNAME: Kopje
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Verberg van rapporten?'
    PLURALNAME: 'HTML Blokken'
    SINGULARNAME: 'HTML Blok'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Ledenlijst velden'
    SINGULARNAME: 'Ledenlijst veld'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Bewerkbare meerdere optie velden'
    SINGULARNAME: 'Bewerkbare meerdere optie veld'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numerieke velden'
    SINGULARNAME: 'Numerieke veld'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Verwijder optie'
    DRAG: 'Sleep om volgorde van de opties te herschikken'
    LOCKED: 'Deze velden zijn niet aanpasbaar'
    PLURALNAME: 'Bewerkbare opties'
    SINGULARNAME: 'Bewerkbare optie'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Keuzerondje velden'
    SINGULARNAME: 'Keuzerondje veld'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Aantal rijen'
    PLURALNAME: 'Tekst velden'
    SINGULARNAME: 'Tekst veld'
    TEXTLENGTH: 'Tekst lengte'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Selecteer upload locatie'
-  FieldEditor:
-    ADD: Toevoegen
-    SELECTAFIELD: 'Kies een veld'
-  Form:
-    FIELDISREQUIRED: '%s is verplicht'
-  GridField:
-    Filter: Filter
-    ResetFilter: Herstel
-  SiteTree:
-    PLURALNAME: Paginas
-    SINGULARNAME: Pagina
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Email Ontvangers'
+    SINGULARNAME: 'Email Ontvanger'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download bestand'
    PLURALNAME: 'Ingediende bestandsvelden'
    SINGULARNAME: 'Ingediende bestandsveld'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Ingediende formulieren'
    SINGULARNAME: 'Ingediende formulier'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Ingediende formvelden'
    SINGULARNAME: 'Ingediende formveld'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Email ontvanger toevoegen'
    CLEARBUTTON: Herstellen
    CONFIGURATION: Instellingen
@ -154,9 +160,3 @@ nl_NL:
    SUBMITBUTTON: Verzenden
    TEXTONCLEAR: 'Tekst op herstel button:'
    TEXTONSUBMIT: 'Tekst op Verzend-button'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Email Ontvangers'
-    SINGULARNAME: 'Email Ontvanger'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Inzendingen filteren'
-    WHEREVALUEIS: 'waar waarde is...'
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@ -13,28 +13,23 @@ pl_PL:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCheckbox:
-    PLURALNAME: Checkboxes
-    SINGULARNAME: 'Checkbox Field'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Checkbox Groups'
-    SINGULARNAME: 'Checkbox Group'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableDateField:
-    PLURALNAME: 'Pola daty'
-    SINGULARNAME: 'Pole daty'
-  EditableDropdown:
-    PLURALNAME: Dropdowns
-    SINGULARNAME: 'Dropdown Field'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFileField:
-    PLURALNAME: 'Pola przesyłania plików'
-    SINGULARNAME: 'Pole przesyłania pliku'
-  EditableFormField:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Wybierz folder dla przesyłanych plików'
+  FieldEditor:
+    ADD: Dodaj
+    SELECTAFIELD: 'Wybierz pole'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Strony
+    SINGULARNAME: Strona
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Resetuj
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Zgłoszenia filtrów ..'
+    WHEREVALUEIS: 'których wartość jest ..'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDLabel: 'Dodaj opcję'
    ADDRULE: 'Add Rule'
@ -76,61 +71,72 @@ pl_PL:
    VALUE: Value
    WHEN: When
    'YES': Tak
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Checkboxes
+    SINGULARNAME: 'Checkbox Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Checkbox Groups'
+    SINGULARNAME: 'Checkbox Group'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Pola daty'
+    SINGULARNAME: 'Pole daty'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Dropdowns
+    SINGULARNAME: 'Dropdown Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Pola przesyłania plików'
+    SINGULARNAME: 'Pole przesyłania pliku'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Wybierzpoziom nagłówka'
    PLURALNAME: Nagłówki
    SINGULARNAME: Nagłówek
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Pola numeryczne'
    SINGULARNAME: 'Pole numeryczne'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
    PLURALNAME: 'Edytowalne opcje'
    SINGULARNAME: 'Edytowalna opcja'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Pola wyboru'
    SINGULARNAME: 'Pole wyboru'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Liczba wierszy'
    PLURALNAME: 'Pola tekstowe'
    SINGULARNAME: 'Pole tekstowe'
    TEXTLENGTH: 'Długość tekstu'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Wybierz folder dla przesyłanych plików'
-  FieldEditor:
-    ADD: Dodaj
-    SELECTAFIELD: 'Wybierz pole'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  GridField:
-    Filter: Filter
-    ResetFilter: Resetuj
-  SiteTree:
-    PLURALNAME: Strony
-    SINGULARNAME: Strona
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Dodaj e-mail odbiorcy'
    CLEARBUTTON: Czyść
    CONFIGURATION: Ustawienia
@ -161,9 +167,3 @@ pl_PL:
    SUBMITBUTTON: Submit
    TEXTONCLEAR: 'Tekst na przycisku czyść: '
    TEXTONSUBMIT: 'Napis na przycisku ''submit'':'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Zgłoszenia filtrów ..'
-    WHEREVALUEIS: 'których wartość jest ..'
--- a/lang/pt_PT.yml
+++ b/lang/pt_PT.yml
@ -13,13 +13,12 @@ pt_PT:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  FieldEditor:
+    ADD: Adicionar
+    SELECTAFIELD: 'Select a Field'
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,36 +45,40 @@ pt_PT:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  FieldEditor:
-    ADD: Adicionar
-    SELECTAFIELD: 'Select a Field'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -95,6 +98,3 @@ pt_PT:
    SUBMISSIONS: Submissions
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Texto no botão "Enviar"'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/ru_RU.yml
+++ b/lang/ru_RU.yml
@ -13,13 +13,9 @@ ru_RU:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ ru_RU:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ ru_RU:
    SUBMISSIONS: Полученное
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Текст на кнопке отправки'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/sk.yml
+++ b/lang/sk.yml
@ -13,39 +13,39 @@ sk:
    SHOWTHISFIELD: 'Zobraziť toto pole'
    VALUE: 'Zadanú hodnotu'
    WHEN: 'ak pole'
-  EditableCheckbox:
-    PLURALNAME: 'Zaškrtávacie polia (checkbox)'
-    SINGULARNAME: 'Zaškrtávacie pole (checkbox)'
-  EditableCheckboxGroupField:
-    PLURALNAME: 'Skupiny zaškrtávacích polí'
-    SINGULARNAME: 'Skupina zaškrtávacích polí'
-  EditableCountryDropdownField:
-    PLURALNAME: 'Rozbaľovacie polia (výber krajiny)'
-    SINGULARNAME: 'Rozbaľovacie pole (výber krajiny)'
-  EditableCustomRule:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Priečinok na nahrávanie súborov'
+  FieldEditor:
+    ADD: Pridať
+    SELECTAFIELD: 'Vyberte pole'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Stránky
+    SINGULARNAME: Stránka
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s je vyžadované'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Reset
+  SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
+    ADD_FIELD: 'Pridať políčko'
+    ADD_FIELD_GROUP: 'Pridať obaľovaciu skupinu'
+    ADD_PAGE_BREAK: 'Pridať ďalšiu stranu'
+    FORMFIELDS: Formulár
+  SilverStripe\UserForms\Extension\UserFormValidator:
+    CONDITIONAL_REQUIRED: 'Vyžadované pole ''{name}'' nemôže byť umiestnené do podmienenej stránky'
+    NO_PAGE: 'Pole ''{name}'' nájdené pred akoukoľvek stránkou'
+    UNEXPECTED_BREAK: 'Neočakávaný zlom strany ''{name}'' vnútri obaľovacej skupiny ''{group}'''
+    UNEXPECTED_GROUP_END: '''{name}'' nájdený bez odpovedajúcho začiatku'
+    WRONG_GROUP_END: '''{name}'' nájdený vrámci zle uzatvorenej obaľovacej skupiny ''{group}'''
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtrovať ...'
+    FROM: Od
+    TILL: Do
+    WHEREVALUEIS: 'kde hodnota je ...'
+  SilverStripe\UserForms\Model\EditableCustomRule:
    PLURALNAME: 'Vlastné pravidlá'
    SINGULARNAME: 'Vlastne pravidlo'
-  EditableDateField:
-    PLURALNAME: 'Dátumové polia'
-    SINGULARNAME: 'Dátumové pole'
-  EditableDropdown:
-    PLURALNAME: 'Rozbaľovacie polia'
-    SINGULARNAME: 'Rozbaľovacie pole'
-  EditableEmailField:
-    PLURALNAME: 'E-mailové polia'
-    SINGULARNAME: 'E-mailové pole'
-  EditableFieldGroup:
-    PLURALNAME: 'Skupiny polí'
-    SINGULARNAME: 'Skupina polí'
-  EditableFieldGroupEnd:
-    FIELD_GROUP_END: 'Koniec {group}'
-    FIELD_GROUP_START: 'Skupina {group}'
-    PLURALNAME: 'Konce skupiny polí'
-    SINGULARNAME: 'Koniec skupiny polí'
-  EditableFileField:
-    PLURALNAME: 'Polia pre nahratie súboru'
-    SINGULARNAME: 'Pole pre nahratie súboru'
-  EditableFormField:
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Pridať
    ADDLabel: 'Pridať voľbu/možnosť'
    ADDRULE: 'Pridať pravidlo'
@ -98,48 +98,75 @@ sk:
    VALUE: 'Zadanú hodnotu'
    WHEN: 'ak pole'
    'YES': Áno
-  EditableFormFieldValidator:
-    REQUIRED_ERROR: 'Formulárové polia nemôžu byť vyžadované, ak majú podmienené pravidlá zobrazenia.'
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 'Zaškrtávacie polia (checkbox)'
+    SINGULARNAME: 'Zaškrtávacie pole (checkbox)'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 'Skupiny zaškrtávacích polí'
+    SINGULARNAME: 'Skupina zaškrtávacích polí'
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Rozbaľovacie polia (výber krajiny)'
+    SINGULARNAME: 'Rozbaľovacie pole (výber krajiny)'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 'Dátumové polia'
+    SINGULARNAME: 'Dátumové pole'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 'Rozbaľovacie polia'
+    SINGULARNAME: 'Rozbaľovacie pole'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'E-mailové polia'
+    SINGULARNAME: 'E-mailové pole'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup:
+    PLURALNAME: 'Skupiny polí'
+    SINGULARNAME: 'Skupina polí'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd:
+    FIELD_GROUP_END: 'Koniec {group}'
+    FIELD_GROUP_START: 'Skupina {group}'
+    PLURALNAME: 'Konce skupiny polí'
+    SINGULARNAME: 'Koniec skupiny polí'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: 'Polia pre nahratie súboru'
+    SINGULARNAME: 'Pole pre nahratie súboru'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Úroveň nadpisu'
    PLURALNAME: Nadpisy
    SINGULARNAME: Nadpis
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    PLURALNAME: 'Zlomy strán'
    SINGULARNAME: 'Zlom strany'
    STEP_TITLE: 'Strana {page}'
    TITLE_FIRST: 'Prvá strana'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    CONTENT: HTML
    HIDEFROMREPORT: 'Skryť z reportu?'
    HIDELABEL: 'Skryť ''Názov'' na FrontEnd-e?'
    PLURALNAME: 'HTML bloky'
    SINGULARNAME: 'HTML blok'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Polia zoznamu členov'
    SINGULARNAME: 'Pole zoznamu členov'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    DEFAULT: 'Vybrané v predvolenom režime?'
    OPTIONSTAB: Možnosti
    PLURALNAME: 'Polia s viacerými možnosťami'
    SINGULARNAME: 'Pole s viacerými možnosťami'
    TITLE: Názov
    VALUE: Hodnota
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numerické/číselné polia'
    RANGE: 'Povolený rozsah'
    RANGE_TO: do
    SINGULARNAME: 'Numerické/číselné pole'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Odstráň túto možnosť'
    DRAG: 'Ťahaním preskupiť poradie polí'
    LOCKED: 'Tieto polia nie je možné meniť'
    PLURALNAME: Možnosti
    SINGULARNAME: Možnosť
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 'Prepínacie polia (radio)'
    SINGULARNAME: 'Prepínacie pole (radio)'
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Počet riadkov'
    NUMBERROWS_DESCRIPTION: 'Políčka s viac ako jedným riadkom sú generované ako textarea.'
    PLACEHOLDER: 'Zástupná/Ukážková hodnota (placeholder)'
@ -147,30 +174,28 @@ sk:
    RANGE_TO: do
    SINGULARNAME: 'Textové pole'
    TEXTLENGTH: 'Povolená dĺžka textu'
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Priečinok na nahrávanie súborov'
-  FieldEditor:
-    ADD: Pridať
-    SELECTAFIELD: 'Vyberte pole'
-  Form:
-    FIELDISREQUIRED: '%s je vyžadované'
-  GridField:
-    Filter: Filter
-    ResetFilter: Reset
-  SiteTree:
-    PLURALNAME: Stránky
-    SINGULARNAME: Stránka
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\EditableFormField\Validator:
+    REQUIRED_ERROR: 'Formulárové polia nemôžu byť vyžadované, ak majú podmienené pravidlá zobrazenia.'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    CUSTOMRULESTAB: 'Vlastné pravidlá'
+    EMAILCONTENTTAB: 'Obsah e-mailu'
+    EMAILDETAILSTAB: 'Detaily e-mailu'
+    PLURALNAME: 'Užívateľom definovaný formulár - príjemcovia e-mailu'
+    SINGULARNAME: 'Užívateľom definovaný formulár - príjemca e-mailu'
+  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
+    PLURALNAME: 'Užívateľom definovaný formulár - podmienky príjemcu e-mailu'
+    SINGULARNAME: 'Užívateľom definovaný formulár - podmienka príjemcu e-mailu'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Stiahnuť súbor'
    PLURALNAME: 'Pole s odoslanými súbormi'
    SINGULARNAME: 'Pole s odoslaným súborom'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Odoslané formuláre'
    SINGULARNAME: 'Odoslaný formulár'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Odoslané formulárové polia'
    SINGULARNAME: 'Odoslané formulárove pole'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Pridať príjemcu'
    CLEARBUTTON: Vyčistiť
    CONFIGURATION: Konfigurácia
@ -221,28 +246,3 @@ sk:
    TYPEREPLY: 'Napíšte adresu'
    TYPESUBJECT: 'Napíšte predmet'
    TYPETO: 'Napíšte adresu'
-  UserDefinedForm_EmailRecipient:
-    CUSTOMRULESTAB: 'Vlastné pravidlá'
-    EMAILCONTENTTAB: 'Obsah e-mailu'
-    EMAILDETAILSTAB: 'Detaily e-mailu'
-    PLURALNAME: 'Užívateľom definovaný formulár - príjemcovia e-mailu'
-    SINGULARNAME: 'Užívateľom definovaný formulár - príjemca e-mailu'
-  UserDefinedForm_EmailRecipientCondition:
-    PLURALNAME: 'Užívateľom definovaný formulár - podmienky príjemcu e-mailu'
-    SINGULARNAME: 'Užívateľom definovaný formulár - podmienka príjemcu e-mailu'
-  UserFormFieldEditorExtension:
-    ADD_FIELD: 'Pridať políčko'
-    ADD_FIELD_GROUP: 'Pridať obaľovaciu skupinu'
-    ADD_PAGE_BREAK: 'Pridať ďalšiu stranu'
-    FORMFIELDS: Formulár
-  UserFormValidator:
-    CONDITIONAL_REQUIRED: 'Vyžadované pole ''{name}'' nemôže byť umiestnené do podmienenej stránky'
-    NO_PAGE: 'Pole ''{name}'' nájdené pred akoukoľvek stránkou'
-    UNEXPECTED_BREAK: 'Neočakávaný zlom strany ''{name}'' vnútri obaľovacej skupiny ''{group}'''
-    UNEXPECTED_GROUP_END: '''{name}'' nájdený bez odpovedajúcho začiatku'
-    WRONG_GROUP_END: '''{name}'' nájdený vrámci zle uzatvorenej obaľovacej skupiny ''{group}'''
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtrovať ...'
-    FROM: Od
-    TILL: Do
-    WHEREVALUEIS: 'kde hodnota je ...'
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@ -13,13 +13,12 @@ sr_RS:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  FieldEditor:
+    ADD: Додај
+    SELECTAFIELD: 'Select a Field'
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -45,36 +44,40 @@ sr_RS:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  FieldEditor:
-    ADD: Додај
-    SELECTAFIELD: 'Select a Field'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -94,6 +97,3 @@ sr_RS:
    SUBMISSIONS: Submissions
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Text on submit button:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -13,28 +13,23 @@ sv:
    SHOWTHISFIELD: 'Visa detta fält'
    VALUE: Värde
    WHEN: När
-  EditableCheckbox:
-    PLURALNAME: Kryssrutor
-    SINGULARNAME: Kryssrutefält
-  EditableCheckboxGroupField:
-    PLURALNAME: Kryssrutegrupper
-    SINGULARNAME: Kryssrutegrupp
-  EditableCountryDropdownField:
-    PLURALNAME: 'Rullgardinsmenyer för länder'
-    SINGULARNAME: 'Rullgardinsmeny för länder'
-  EditableDateField:
-    PLURALNAME: Datumfält
-    SINGULARNAME: Datumfält
-  EditableDropdown:
-    PLURALNAME: Rullgardinsmenyer
-    SINGULARNAME: Rullgardinsmenyfält
-  EditableEmailField:
-    PLURALNAME: E-postfält
-    SINGULARNAME: E-postfält
-  EditableFileField:
-    PLURALNAME: Filuppladdningsfält
-    SINGULARNAME: Filuppladdningsfält
-  EditableFormField:
+  EditableUploadField:
+    SELECTUPLOADFOLDER: 'Välj uppladdningsmapp'
+  FieldEditor:
+    ADD: 'Lägg till'
+    SELECTAFIELD: 'Välj ett fält'
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: Sidor
+    SINGULARNAME: Sida
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s är obligatoriskt'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
+    ResetFilter: Rensa
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 'Filtrera inskickade svar'
+    WHEREVALUEIS: 'när värdet är..'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: 'Lägg till'
    ADDLabel: 'Lägg till alternativ'
    ADDRULE: 'Lägg till regel'
@ -75,63 +70,74 @@ sv:
    VALIDATION: Validering
    VALUE: Värde
    WHEN: När
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: Kryssrutor
+    SINGULARNAME: Kryssrutefält
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: Kryssrutegrupper
+    SINGULARNAME: Kryssrutegrupp
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Rullgardinsmenyer för länder'
+    SINGULARNAME: 'Rullgardinsmeny för länder'
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: Datumfält
+    SINGULARNAME: Datumfält
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: Rullgardinsmenyer
+    SINGULARNAME: Rullgardinsmenyfält
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: E-postfält
+    SINGULARNAME: E-postfält
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: Filuppladdningsfält
+    SINGULARNAME: Filuppladdningsfält
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: 'Välj rubrikstorlek'
    PLURALNAME: Rubriker
    SINGULARNAME: Rubrik
-  EditableFormStep:
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
    STEP_TITLE: 'Sida {page}'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Göm från rapport?'
    PLURALNAME: HTML-block
    SINGULARNAME: HTML-block
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: Medlemsfält
    SINGULARNAME: Medlemsfält
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Redigeringsbart multialternativfält'
    SINGULARNAME: 'Redigeringsbart multialternativfält'
-  EditableNumericField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableNumericField:
    PLURALNAME: 'Numeriska fält'
    SINGULARNAME: 'Numeriskt fält'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Radera alternativ'
    DRAG: 'Dra och släpp för att ordna om alternativ'
    LOCKED: 'Dessa fält kan inte modifieras'
    PLURALNAME: 'Redigeringsbara alternativ'
    SINGULARNAME: 'Redigeringsbart alternativ'
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: Radiofält
    SINGULARNAME: Radiofält
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 'Antal rader'
    PLURALNAME: Textfält
    SINGULARNAME: Textfält
    TEXTLENGTH: Textlängd
-  EditableUploadField:
-    SELECTUPLOADFOLDER: 'Välj uppladdningsmapp'
-  FieldEditor:
-    ADD: 'Lägg till'
-    SELECTAFIELD: 'Välj ett fält'
-  Form:
-    FIELDISREQUIRED: '%s är obligatoriskt'
-  GridField:
-    Filter: Filter
-    ResetFilter: Rensa
-  SiteTree:
-    PLURALNAME: Sidor
-    SINGULARNAME: Sida
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'Mottagare av formulär'
+    SINGULARNAME: 'Mottagare av formulär'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Ladda ner fil'
    PLURALNAME: 'Inskickade filfält'
    SINGULARNAME: 'Inskickat filfält'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Inskickade formulär'
    SINGULARNAME: 'Inskickat formulär'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Inskickade formulärfält'
    SINGULARNAME: 'Inskickat formulärfält'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: 'Lägg till e-postmottagare'
    CLEARBUTTON: Rensa
    CONFIGURATION: Konfiguration
@ -162,9 +168,3 @@ sv:
    SUBMITBUTTON: Skicka
    TEXTONCLEAR: 'Text på Rensa-knapp:'
    TEXTONSUBMIT: 'Text på Skicka-knapp:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'Mottagare av formulär'
-    SINGULARNAME: 'Mottagare av formulär'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 'Filtrera inskickade svar'
-    WHEREVALUEIS: 'när värdet är..'
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@ -13,13 +13,9 @@ tr_TR:
    SHOWTHISFIELD: 'Show This Field'
    VALUE: Value
    WHEN: When
-  EditableCountryDropdownField:
-    PLURALNAME: 'Country Dropdowns'
-    SINGULARNAME: 'Country Dropdown'
-  EditableEmailField:
-    PLURALNAME: 'Email Fields'
-    SINGULARNAME: 'Email Field'
-  EditableFormField:
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s is required'
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: Add
    ADDRULE: 'Add Rule'
    BLANK: Blank
@ -46,33 +42,40 @@ tr_TR:
    VALIDATION: Validation
    VALUE: Value
    WHEN: When
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 'Country Dropdowns'
+    SINGULARNAME: 'Country Dropdown'
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 'Email Fields'
+    SINGULARNAME: 'Email Field'
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 'Hide from reports?'
    PLURALNAME: 'HTML Blocks'
    SINGULARNAME: 'HTML Block'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 'Member List Fields'
    SINGULARNAME: 'Member List Field'
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 'Editable Multiple Option Fields'
    SINGULARNAME: 'Editable Multiple Option Field'
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: 'Remove this option'
    DRAG: 'Drag to rearrange order of options'
    LOCKED: 'These fields cannot be modified'
-  Form:
-    FIELDISREQUIRED: '%s is required'
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: 'User Defined Form Email Recipients'
+    SINGULARNAME: 'User Defined Form Email Recipient'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 'Download File'
    PLURALNAME: 'Submitted File Fields'
    SINGULARNAME: 'Submitted File Field'
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: 'Submitted Forms'
    SINGULARNAME: 'Submitted Form'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: 'Submitted Form Fields'
    SINGULARNAME: 'Submitted Form Field'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    EMAILADDRESS: Email
    EMAILBODY: Body
    EMAILFROM: From
@ -92,6 +95,3 @@ tr_TR:
    SUBMISSIONS: Gönderiler
    SUBMITBUTTON: Submit
    TEXTONSUBMIT: 'Gönder düğmesi üzerindeki yazı:'
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: 'User Defined Form Email Recipients'
-    SINGULARNAME: 'User Defined Form Email Recipient'
--- a/lang/zh.yml
+++ b/lang/zh.yml
@ -13,28 +13,21 @@ zh:
    SHOWTHISFIELD: 显示这个字段
    VALUE: 值
    WHEN: 当
-  EditableCheckbox:
-    PLURALNAME: 复选框
-    SINGULARNAME: 复选框字段
-  EditableCheckboxGroupField:
-    PLURALNAME: 复选框组
-    SINGULARNAME: 复选框组
-  EditableCountryDropdownField:
-    PLURALNAME: 国家下拉列表
-    SINGULARNAME: 国家下拉列表
-  EditableDateField:
-    PLURALNAME: 日期字段
-    SINGULARNAME: 日期字段
-  EditableDropdown:
-    PLURALNAME: 下拉列表
-    SINGULARNAME: 下拉列表字段
-  EditableEmailField:
-    PLURALNAME: 电子邮件字段
-    SINGULARNAME: 电子邮件字段
-  EditableFileField:
-    PLURALNAME: '文件上传字段'
-    SINGULARNAME: '文件上传字段'
-  EditableFormField:
+  FieldEditor:
+    ADD: '添加'
+    SELECTAFIELD: 选择一个字段
+  SilverStripe\CMS\Model\SiteTree:
+    PLURALNAME: 页面
+    SINGULARNAME: 页面
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '%s 是必须的'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: 筛选器
+    ResetFilter: 重设
+  SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader:
+    FILTERSUBMISSIONS: 筛选器提交……
+    WHEREVALUEIS: 当值为……
+  SilverStripe\UserForms\Model\EditableFormField:
    ADD: '添加'
    ADDRULE: '添加规则'
    BLANK: 空白
@ -71,56 +64,69 @@ zh:
    VALIDATION: 验证
    VALUE: 值
    WHEN: 当
-  EditableFormHeading:
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
+    PLURALNAME: 复选框
+    SINGULARNAME: 复选框字段
+  SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField:
+    PLURALNAME: 复选框组
+    SINGULARNAME: 复选框组
+  SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField:
+    PLURALNAME: 国家下拉列表
+    SINGULARNAME: 国家下拉列表
+  SilverStripe\UserForms\Model\EditableFormField\EditableDateField:
+    PLURALNAME: 日期字段
+    SINGULARNAME: 日期字段
+  SilverStripe\UserForms\Model\EditableFormField\EditableDropdown:
+    PLURALNAME: 下拉列表
+    SINGULARNAME: 下拉列表字段
+  SilverStripe\UserForms\Model\EditableFormField\EditableEmailField:
+    PLURALNAME: 电子邮件字段
+    SINGULARNAME: 电子邮件字段
+  SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+    PLURALNAME: '文件上传字段'
+    SINGULARNAME: '文件上传字段'
+  SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading:
    LEVEL: '选择标题级别'
    PLURALNAME: '标题'
    SINGULARNAME: '标题'
-  EditableLiteralField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
    HIDEFROMREPORT: 从报告中隐藏？
    PLURALNAME: 'HTML 模块'
    SINGULARNAME: 'HTML 模块'
-  EditableMemberListField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
    PLURALNAME: 成员列表字段
    SINGULARNAME: 成员列表字段
-  EditableMultipleOptionField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField:
    PLURALNAME: 可编辑的多个选项字段
    SINGULARNAME: 可编辑的多个选项字段
-  EditableOption:
+  SilverStripe\UserForms\Model\EditableFormField\EditableOption:
    DELETE: '删除这个选项'
    DRAG: 拖放来对选项进行重新排序
    LOCKED: 这些字段不能被修改
    PLURALNAME: 可编辑的选项
    SINGULARNAME: 可编辑的选项
-  EditableRadioField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
    PLURALNAME: 广播字段
    SINGULARNAME: 广播字段
-  EditableTextField:
+  SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
    NUMBERROWS: 行数
    PLURALNAME: 文本字段
    SINGULARNAME: 文本字段
    TEXTLENGTH: 文本长度
-  FieldEditor:
-    ADD: '添加'
-    SELECTAFIELD: 选择一个字段
-  Form:
-    FIELDISREQUIRED: '%s 是必须的'
-  GridField:
-    Filter: 筛选器
-    ResetFilter: 重设
-  SiteTree:
-    PLURALNAME: 页面
-    SINGULARNAME: 页面
-  SubmittedFileField:
+  SilverStripe\UserForms\Model\Recipient\EmailRecipient:
+    PLURALNAME: '用户定义的表格电子邮件接受者'
+    SINGULARNAME: '用户定义的表格电子邮件接受者'
+  SilverStripe\UserForms\Model\Submission\SubmittedFileField:
    DOWNLOADFILE: 下载文件
    PLURALNAME: 已提交的文件字段
    SINGULARNAME: 已提交的文件字段
-  SubmittedForm:
+  SilverStripe\UserForms\Model\Submission\SubmittedForm:
    PLURALNAME: '已提交的表格'
    SINGULARNAME: '已提交的表格'
-  SubmittedFormField:
+  SilverStripe\UserForms\Model\Submission\SubmittedFormField:
    PLURALNAME: '已提交的表格字段'
    SINGULARNAME: '已提交的表格字段'
-  UserDefinedForm:
+  SilverStripe\UserForms\Model\UserDefinedForm:
    ADDEMAILRECIPIENT: '添加电子邮件收件人'
    CONFIGURATION: '配置'
    DESCRIPTION: '添加一个可定制的表格。'
@ -147,9 +153,3 @@ zh:
    SUBMISSIONS: 提交
    SUBMITBUTTON: 提交
    TEXTONSUBMIT: 提交按钮上的文本
-  UserDefinedForm_EmailRecipient:
-    PLURALNAME: '用户定义的表格电子邮件接受者'
-    SINGULARNAME: '用户定义的表格电子邮件接受者'
-  UserFormsGridFieldFilterHeader:
-    FILTERSUBMISSIONS: 筛选器提交……
-    WHEREVALUEIS: 当值为……