diff --git a/lang/ar.yml b/lang/ar.yml
index dc91b8a..72af4e4 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -1,12 +1,16 @@
 ar:
   ASSETADMIN:
     SUBSITENOTICE: 'يمكن الوصول إلى المجلدات والملفات التي تم إنشاؤها في الموقع الرئيسي من طرف كل المواقع الفرعية.'
-  FileSubsites:
-    AllSitesDropdownOpt: 'كافة المواقع'
-    SubsiteFieldLabel: 'الموقع الفرعي'
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'اضف جديد من القالب'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: 'مواقع فرعية'
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: 'المراقب XHR للموقع الفرعي'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'كافة المواقع'
+    SubsiteFieldLabel: 'الموقع الفرعي'
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'كل المواقع الفرعية'
     ACCESSONLY: 'فقط هذه المواقع الفرعية'
     ACCESSRADIOTITLE: 'امنح هذه المجموعة تصريح الولوج إلى'
@@ -14,12 +18,12 @@ ar:
     MANAGE_SUBSITES: 'إدارة مواقع فرعية للمجموعات'
     MANAGE_SUBSITES_HELP: 'القدرة على الحد من أذونات مجموعة ما على موقع فرعي واحدة أو أكثر.'
     SECURITYTABTITLE: 'مواقع فرعية'
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'تمّ الحفظ، يرجى تحديث الصفحات ذات الصلة.'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: نسخ
     CopyToSubsite: 'نسخ الصفحة في موقع فرعي'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'نسخ الهيكل من:'
     CopyMessage: 'إنشاء نسخة من {title}'
     CustomExtraMeta: 'العلامات الوصفية المخصصة'
@@ -38,16 +42,16 @@ ar:
     SiteConfigTitle: 'اسم موقعك'
     TabTitleConfig: 'المواصفات'
     ValidateTitle: 'الرجاء إضافة "عنوان"'
-  SubsiteAdmin:
-    MENUTITLE: 'مواقع فرعية'
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: نطاق
     PLURALNAME: 'نطاقات موقع فرعي'
     SINGULARNAME: 'نطاق موقع فرعي'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'يعرض محتوى صفحة على موقع فرعي آخر'
+    SINGULARNAME: 'الصفحة الإفتراضية للمواقع الفرعية'
+    SubsiteField: 'الموقع الفرعي'
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 'المواقع'
-  SubsiteXHRController:
-    MENUTITLE: 'المراقب XHR للموقع الفرعي'
   Subsites:
     DefaultSiteFieldLabel: 'الموقع الافتراضي'
     DomainFieldLabel: النطاق
@@ -59,7 +63,3 @@ ar:
     RedirectURLFieldLabel: 'إعادة توجيه عنوان موقع الويب'
     ThemeFieldLabel: 'المحور'
     TitleFieldLabel: 'اسم الموقع الفرعي'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'يعرض محتوى صفحة على موقع فرعي آخر'
-    SINGULARNAME: 'الصفحة الإفتراضية للمواقع الفرعية'
-    SubsiteField: 'الموقع الفرعي'
diff --git a/lang/cs.yml b/lang/cs.yml
index 2bdc42b..868ab0d 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -2,9 +2,11 @@ cs:
   LeftAndMain_Menu:
     Hello: Ahoj
     LOGOUT: 'Odhlásit se'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsites
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopírovat
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     CustomExtraMeta: 'Vlastní meta tagy'
     CustomMetaDescription: Popis
     CustomMetaKeywords: 'Klíčová slova'
@@ -16,13 +18,13 @@ cs:
     SiteConfigTitle: 'Název Vašeho webu'
     TabTitleConfig: Konfigurace
     ValidateTitle: 'Prosím vložte "Název"'
-  SubsiteAdmin:
-    MENUTITLE: Subsites
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Doména
     PLURALNAME: 'Domény webů'
     SINGULARNAME: 'Doména webu'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    PLURALNAME: 'Základní stránky'
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Weby
   Subsites:
     DefaultSiteFieldLabel: 'Výchozí web'
@@ -30,5 +32,3 @@ cs:
     LanguageFieldLabel: Jazyk
     ThemeFieldLabel: Téma
     TitleFieldLabel: 'Název subsite'
-  SubsitesVirtualPage:
-    PLURALNAME: 'Základní stránky'
diff --git a/lang/de.yml b/lang/de.yml
index 3977ef1..c61fa0c 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -3,12 +3,21 @@ de:
     SUBSITENOTICE: 'Auf Ordner und Dateien der Hauptseite kann von allen Subsites zugegriffen werden.'
   DomainNameField:
     INVALID_DOMAIN: 'Ungültige Domain'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Alle Subseiten'
-    SubsiteFieldLabel: Subseite
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Neu hinzufügen von Template'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Hallo
+    LOGOUT: Abmelden
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Klicken Sie hier, um den Inhalt zu bearbeiten'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsites
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Alle Subseiten'
+    SubsiteFieldLabel: Subseite
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Alle Subsites'
     ACCESSONLY: 'Nur diese Subsites'
     ACCESSRADIOTITLE: 'Dieser Gruppe Zugriff geben auf'
@@ -16,15 +25,12 @@ de:
     MANAGE_SUBSITES: 'Subseiten für jede Gruppe bearbeiten'
     MANAGE_SUBSITES_HELP: 'Möglichkeit, die Berechtigungen einer Gruppe auf bestimmte Subsites zu beschränken.'
     SECURITYTABTITLE: Subsites
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: Gespeichert.
-  LeftAndMain_Menu:
-    Hello: Hallo
-    LOGOUT: Abmelden
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopieren
     CopyToSubsite: 'Seite auf Subseite Kopieren'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Struktur kopieren von:'
     CopyMessage: 'Kopie von {title} erstellt'
     CustomExtraMeta: 'Benutzerdefinierte Meta-Tags'
@@ -43,9 +49,7 @@ de:
     SiteConfigTitle: 'Name Ihrer Website'
     TabTitleConfig: Einstellungen
     ValidateTitle: 'Bitte geben Sie einen Titel an'
-  SubsiteAdmin:
-    MENUTITLE: Subsites
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     DOMAIN_DESCRIPTION: 'Hostname dieser Subsite (ohne Protokol). Joker (*) ist erlaubt.'
     IS_PRIMARY: 'Ist Hauptdomain?'
@@ -55,10 +59,13 @@ de:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protokoll
     SINGULARNAME: 'Subsite Domain'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Zeigt den Inhalt einer anderen Seite von einer anderen Subsite an'
+    PLURALNAME: 'Basis Seiten'
+    SINGULARNAME: 'Subsites Virtuelle Seite'
+    SubsiteField: Subsite
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Seiten
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Standard Seite'
     DomainFieldLabel: Domäne
@@ -70,10 +77,3 @@ de:
     RedirectURLFieldLabel: Weierleitungs-URL
     ThemeFieldLabel: Theme
     TitleFieldLabel: 'Name der Subsite'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Zeigt den Inhalt einer anderen Seite von einer anderen Subsite an'
-    PLURALNAME: 'Basis Seiten'
-    SINGULARNAME: 'Subsites Virtuelle Seite'
-    SubsiteField: Subsite
-  VirtualPage:
-    EDITCONTENT: 'Klicken Sie hier, um den Inhalt zu bearbeiten'
diff --git a/lang/en.yml b/lang/en.yml
index e496829..dd9bb64 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -3,12 +3,21 @@ en:
     SUBSITENOTICE: 'Folders and files created in the main site are accessible by all subsites.'
   DomainNameField:
     INVALID_DOMAIN: 'Invalid domain name'
-  FileSubsites:
-    AllSitesDropdownOpt: 'All sites'
-    SubsiteFieldLabel: Subsite
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Add New from Template'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Hi
+    LOGOUT: 'Log out'
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Click here to edit the content'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsites
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'All sites'
+    SubsiteFieldLabel: Subsite
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'All subsites'
     ACCESSONLY: 'Only these subsites'
     ACCESSRADIOTITLE: 'Give this group access to'
@@ -16,17 +25,14 @@ en:
     MANAGE_SUBSITES: 'Manage subsites for groups'
     MANAGE_SUBSITES_HELP: 'Ability to limit the permissions for a group to one or more subsites.'
     SECURITYTABTITLE: Subsites
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Saved, please update related pages.'
-  LeftAndMain_Menu:
-    Hello: Hi
-    LOGOUT: 'Log out'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Copy
     CopyToSubsite: 'Copy page to subsite'
     CopyToSubsiteWithChildren: 'Include children pages?'
     SubsiteOperations: 'Subsite Operations'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Copy structure from:'
     CopyMessage: 'Created a copy of {title}'
     CustomExtraMeta: 'Custom Meta Tags'
@@ -45,9 +51,7 @@ en:
     SiteConfigTitle: 'Your Site Name'
     TabTitleConfig: Configuration
     ValidateTitle: 'Please add a "Title"'
-  SubsiteAdmin:
-    MENUTITLE: Subsites
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     DOMAIN_DESCRIPTION: 'Hostname of this subsite (exclude protocol). Allows wildcards (*).'
     IS_PRIMARY: 'Is Primary Domain?'
@@ -58,10 +62,13 @@ en:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protocol
     SINGULARNAME: 'Subsite Domain'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Displays the content of a page on another subsite'
+    PLURALNAME: 'Base Pages'
+    SINGULARNAME: 'Subsites Virtual Page'
+    SubsiteField: Subsite
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sites
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Default site'
     DomainFieldLabel: Domain
@@ -71,13 +78,6 @@ en:
     PageTypeBlacklistFieldLabel: 'Page Type Blacklist'
     PrimaryDomainFieldLabel: 'Primary Domain'
     RedirectURLFieldLabel: 'Redirect URL'
-    ThemeFieldLabel: Theme
     ThemeFieldEmptyString: ''
+    ThemeFieldLabel: Theme
     TitleFieldLabel: 'Subsite Name'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Displays the content of a page on another subsite'
-    PLURALNAME: 'Base Pages'
-    SINGULARNAME: 'Subsites Virtual Page'
-    SubsiteField: Subsite
-  VirtualPage:
-    EDITCONTENT: 'Click here to edit the content'
diff --git a/lang/eo.yml b/lang/eo.yml
index b02b296..0d5fef5 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -3,12 +3,21 @@ eo:
     SUBSITENOTICE: 'Dosierujoj kaj dosieroj kreitaj en la ĉefa retejo estas alireblaj de ĉiuj retejoj'
   DomainNameField:
     INVALID_DOMAIN: 'Nevalida domajna nomo'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Ĉiuj retejoj'
-    SubsiteFieldLabel: Subretejo
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Aldoni novan el ŝablono'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Saluton
+    LOGOUT: Elsaluti
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Alklaku ĉi tie por redakti la enhavon'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subretejoj
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Ĉiuj retejoj'
+    SubsiteFieldLabel: Subretejo
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Ĉiuj subretejoj'
     ACCESSONLY: 'Nur ĉi tiuj subretejoj'
     ACCESSRADIOTITLE: 'Doni ĉi tiun grupon aliron al'
@@ -16,17 +25,14 @@ eo:
     MANAGE_SUBSITES: 'Administri subretejojn por grupoj'
     MANAGE_SUBSITES_HELP: 'Eblo limigi la permesojn por grupo al unu aŭ pluaj subretejoj.'
     SECURITYTABTITLE: Subsites
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Konservita, bonvole ĝisdatigi rilatajn paĝojn.'
-  LeftAndMain_Menu:
-    Hello: Saluton
-    LOGOUT: Elsaluti
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopio
     CopyToSubsite: 'Kopii paĝon al subretejo'
     CopyToSubsiteWithChildren: 'Ĉu inkluzivi  paĝidojn?'
     SubsiteOperations: 'Subretejaj operacioj'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Kopii strukturon de:'
     CopyMessage: 'Kreis kopion de {title}'
     CustomExtraMeta: 'Propraj meta-etikedoj'
@@ -45,9 +51,7 @@ eo:
     SiteConfigTitle: 'Nomo de via retejo'
     TabTitleConfig: Agordaro
     ValidateTitle: 'Bonvole aldonu "Titolon"'
-  SubsiteAdmin:
-    MENUTITLE: Subretejoj
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domajno
     DOMAIN_DESCRIPTION: 'Gastiga nomo de ĉi tiu subretejo (ellasu protokolon). Permesas ĵokerojn (*).'
     IS_PRIMARY: 'Ĉu unuaranga domajno?'
@@ -58,10 +62,13 @@ eo:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protokolo
     SINGULARNAME: 'Subreteja domajno'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Vidigas la enhavon de paĝo en alia subretejo'
+    PLURALNAME: 'Bazaj paĝoj'
+    SINGULARNAME: 'Virtuala paĝo de subretejoj'
+    SubsiteField: Subretejo
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Retejoj
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Apriora retejo'
     DomainFieldLabel: Domajno
@@ -73,10 +80,3 @@ eo:
     RedirectURLFieldLabel: 'Redirekti je URL'
     ThemeFieldLabel: Etoso
     TitleFieldLabel: 'Nomo de subretejo'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Vidigas la enhavon de paĝo en alia subretejo'
-    PLURALNAME: 'Bazaj paĝoj'
-    SINGULARNAME: 'Virtuala paĝo de subretejoj'
-    SubsiteField: Subretejo
-  VirtualPage:
-    EDITCONTENT: 'Alklaku ĉi tie por redakti la enhavon'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 265d84d..5bc1b13 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,17 +1,21 @@
 fa_IR:
   DomainNameField:
     INVALID_DOMAIN: 'نام دامنه نامعتبر'
-  FileSubsites:
-    AllSitesDropdownOpt: 'تمامی سایت ها'
-    SubsiteFieldLabel: 'زیر سایت ها'
-  GroupSubsites:
-    ACCESSALL: 'تمامی زیر سایت ها'
-    ACCESSONLY: 'فقط این زیر سایت ها'
-    SECURITYTABTITLE: 'زیر سایت ها'
   LeftAndMain_Menu:
     Hello: 'سلام'
     LOGOUT: خروج
-  Subsite:
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'برای ویرایش محتوا اینجا را کلیک کنید'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: 'زیر سایت ها'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'تمامی سایت ها'
+    SubsiteFieldLabel: 'زیر سایت ها'
+  SilverStripe\Subsites\Extensions\GroupSubsites:
+    ACCESSALL: 'تمامی زیر سایت ها'
+    ACCESSONLY: 'فقط این زیر سایت ها'
+    SECURITYTABTITLE: 'زیر سایت ها'
+  SilverStripe\Subsites\Model\Subsite:
     CustomMetaKeywords: 'کلید واژه ها'
     CustomMetaTitle: عنوان
     DomainsHeadline: 'دامنه های این زیر سایت'
@@ -22,15 +26,16 @@ fa_IR:
     SINGULARNAME: 'زیر سایت'
     SiteConfigTitle: 'نام سایت شما'
     TabTitleConfig: پیکربندی
-  SubsiteAdmin:
-    MENUTITLE: 'زیر سایت ها'
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: 'دامنه'
     PLURALNAME: 'دامنه های زیر سایت'
     PROTOCOL_AUTOMATIC: 'به صورت خودکار'
     Protocol: پروتکل
     SINGULARNAME: 'دمنه زیرسایت'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    PLURALNAME: 'صفحه اصلی'
+    SubsiteField: 'زیر سایت'
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 'سایت ها'
   Subsites:
     DefaultSiteFieldLabel: 'سایت پیش فرض'
@@ -39,8 +44,3 @@ fa_IR:
     PrimaryDomainFieldLabel: 'دامنه اولیه'
     ThemeFieldLabel: پوسته
     TitleFieldLabel: 'نام زیر سایت'
-  SubsitesVirtualPage:
-    PLURALNAME: 'صفحه اصلی'
-    SubsiteField: 'زیر سایت'
-  VirtualPage:
-    EDITCONTENT: 'برای ویرایش محتوا اینجا را کلیک کنید'
diff --git a/lang/fi.yml b/lang/fi.yml
index 3f3459a..b95f85e 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -3,12 +3,21 @@ fi:
     SUBSITENOTICE: 'Kansiot ja tiedostot, jotka on luotu pääsivustolla, ovat käytettävissä kaikissa alisivustoissa.'
   DomainNameField:
     INVALID_DOMAIN: 'Virheellinen domain-nimi'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Kaikki sivustot'
-    SubsiteFieldLabel: Alisivusto
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Lisää uusi sivupohjasta'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Hei
+    LOGOUT: 'Kirjaudu ulos'
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Napsauta tästä muokataksesi sisältöä'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Alasivustot
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Kaikki sivustot'
+    SubsiteFieldLabel: Alisivusto
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Kaikki alasivustot'
     ACCESSONLY: 'Vain nämä alasivustot'
     ACCESSRADIOTITLE: 'Anna tälle ryhmälle pääsy kohteeseen'
@@ -16,17 +25,14 @@ fi:
     MANAGE_SUBSITES: 'Hallinnoi ryhmien alisivustoja'
     MANAGE_SUBSITES_HELP: 'Mahdollisuus rajoittaa ryhmän oikeuksia yhdelle tai useammalle alisivustolle.'
     SECURITYTABTITLE: Alisivustot
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Tallennettu, ole hyvä ja päivitä liittyvät sivut.'
-  LeftAndMain_Menu:
-    Hello: Hei
-    LOGOUT: 'Kirjaudu ulos'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopioi
     CopyToSubsite: 'Kopioi sivu alisivustolle'
     CopyToSubsiteWithChildren: 'Sisällytä alasivut?'
     SubsiteOperations: Alisivustotoiminnot
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Kopioi rakenne kohteesta:'
     CopyMessage: 'Luotiin kopio lähteestä {title}'
     CustomExtraMeta: 'Omat Meta-tagit'
@@ -45,9 +51,7 @@ fi:
     SiteConfigTitle: 'Sivuston nimi'
     TabTitleConfig: Asetukset
     ValidateTitle: 'Lisää "Otsikko"'
-  SubsiteAdmin:
-    MENUTITLE: Alasivustot
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     DOMAIN_DESCRIPTION: 'Tämä alisivuston isäntänimi (ilman protokollaa). Sallii wildcard-merkit (*).'
     IS_PRIMARY: 'On päädomain?'
@@ -58,10 +62,13 @@ fi:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protokolla
     SINGULARNAME: 'Alisivuston domain-osoite'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Näyttää sisällön toisen alisivuston sivulta'
+    PLURALNAME: Pohjasivut
+    SINGULARNAME: 'Alisivuston Virtuaalisivu'
+    SubsiteField: Alisivu
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sivustot
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: Oletussivusto
     DomainFieldLabel: Domain
@@ -73,10 +80,3 @@ fi:
     RedirectURLFieldLabel: 'Edelleenohjaus URL'
     ThemeFieldLabel: Teema
     TitleFieldLabel: 'Alisivuston nimi'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Näyttää sisällön toisen alisivuston sivulta'
-    PLURALNAME: Pohjasivut
-    SINGULARNAME: 'Alisivuston Virtuaalisivu'
-    SubsiteField: Alisivu
-  VirtualPage:
-    EDITCONTENT: 'Napsauta tästä muokataksesi sisältöä'
diff --git a/lang/hr.yml b/lang/hr.yml
index 558c59d..0c85182 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -3,12 +3,21 @@ hr:
     SUBSITENOTICE: 'Direktoriji i datoteke kreirane u glavnom sajtu su dostupne svim podsajtovima.'
   DomainNameField:
     INVALID_DOMAIN: 'Netočan naziv domene'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Svi sajtovi'
-    SubsiteFieldLabel: Podsajt
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Dodaj novi iz predloška'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Pozdrav
+    LOGOUT: Odjava
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Klikni ovdje za uređivanje sadržaja'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Podsajtovi
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Svi sajtovi'
+    SubsiteFieldLabel: Podsajt
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Svi podsajtovi'
     ACCESSONLY: 'Samo ovi podsajtovi'
     ACCESSRADIOTITLE: 'Dodijeli ovoj grupi pristup za'
@@ -16,15 +25,12 @@ hr:
     MANAGE_SUBSITES: 'Upravljaj podsajtove za grupe'
     MANAGE_SUBSITES_HELP: 'Mogućnost limitiranja prava za grupu za jedan ili više podsajtova.'
     SECURITYTABTITLE: Podsajtovi
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Spremljeno, molimo osvježite povezane stranice.'
-  LeftAndMain_Menu:
-    Hello: Pozdrav
-    LOGOUT: Odjava
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopiraj
     CopyToSubsite: 'Kopiraj stranicu u podsajt'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Kopiraj strukturu od:'
     CopyMessage: 'Kreirana kopija od {title}'
     CustomExtraMeta: 'Prilagođeni Meta tagovi'
@@ -43,9 +49,7 @@ hr:
     SiteConfigTitle: 'Naziv vašeg weba'
     TabTitleConfig: Konfiguracija
     ValidateTitle: 'Molimo dodajte "Naslov"'
-  SubsiteAdmin:
-    MENUTITLE: Podsajtovi
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domena
     DOMAIN_DESCRIPTION: 'Hostname ovog podsajta (bez protokola). Omogućava wildcard (*).'
     IS_PRIMARY: 'Da li je glavna domena?'
@@ -56,10 +60,13 @@ hr:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Protokol
     SINGULARNAME: 'Domena podsajta'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Prikazuje sadržaj stranice na drugom podsajtu'
+    PLURALNAME: 'Bazna stranica'
+    SINGULARNAME: 'Virtualna stranica podsajta'
+    SubsiteField: Podsajt
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sajtovi
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Zadani sajt'
     DomainFieldLabel: Domena
@@ -71,10 +78,3 @@ hr:
     RedirectURLFieldLabel: 'Link preusmjeravanja'
     ThemeFieldLabel: Tema
     TitleFieldLabel: 'Naziv podsajta'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Prikazuje sadržaj stranice na drugom podsajtu'
-    PLURALNAME: 'Bazna stranica'
-    SINGULARNAME: 'Virtualna stranica podsajta'
-    SubsiteField: Podsajt
-  VirtualPage:
-    EDITCONTENT: 'Klikni ovdje za uređivanje sadržaja'
diff --git a/lang/id.yml b/lang/id.yml
index 5ae82e6..7f4eef3 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -1,19 +1,19 @@
 id:
-  FileSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsitus
+  SilverStripe\Subsites\Extensions\FileSubsites:
     SubsiteFieldLabel: Subsitus
-  GroupSubsites:
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     SECURITYTABTITLE: Subsitus
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     CustomMetaDescription: Deskripsi
     CustomMetaKeywords: 'Kata kunci'
     CustomMetaTitle: Judul
     PLURALNAME: Subsitus
     SINGULARNAME: Subsitus
-  SubsiteAdmin:
-    MENUTITLE: Subsitus
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    SubsiteField: Subsitus
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Situs
   Subsites:
     LanguageFieldLabel: Bahasa
-  SubsitesVirtualPage:
-    SubsiteField: Subsitus
diff --git a/lang/ja.yml b/lang/ja.yml
index e8ac3c1..faef278 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -1,16 +1,16 @@
 ja:
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'テンプレートから新しく追加'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: サブサイト
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: '全てのサブサイト'
     ACCESSONLY: これらのサブサイトのみ
     ACCESSRADIOTITLE: 'このグループに選択先へのアクセス権を与える'
     SECURITYTABTITLE: サブサイト
-  SubsiteAdmin:
-    MENUTITLE: サブサイト
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: ドメイン
     PLURALNAME: サブサイトのドメイン
     SINGULARNAME: サブサイトのドメイン
-  SubsitesVirtualPage:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: サブサイトの仮想ページ
diff --git a/lang/lt.yml b/lang/lt.yml
index 92eb136..19131fb 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -1,17 +1,19 @@
 lt:
-  FileSubsites:
-    AllSitesDropdownOpt: 'Visos svetainės'
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Sukurti naują pagal šabloną'
-  LeftAndMainSubsites:
-    Saved: 'Išsaugota, prašome atnaujinti susijusius puslapius'
   LeftAndMain_Menu:
     Hello: Sveiki
     LOGOUT: Atsijungti
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Visos svetainės'
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
+    Saved: 'Išsaugota, prašome atnaujinti susijusius puslapius'
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Kopijuoti
     CopyToSubsite: 'Kopijuoti puslapį į kitą svetainę'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Kopijuoti struktūrą iš:'
     CopyMessage: 'Sukurta {title} kopija'
     CustomExtraMeta: 'Kitos meta žymės'
@@ -26,12 +28,12 @@ lt:
     SiteConfigTitle: 'Jūsų svetainės pavadinimas'
     TabTitleConfig: Nustatymai
     ValidateTitle: 'Prašome įvesti "Pavadinimą"'
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domenas
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    PLURALNAME: 'Baziniai puslapiai'
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Svetainės
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Pagrindinė svetainė'
     DomainFieldLabel: Domenas
@@ -41,5 +43,3 @@ lt:
     PrimaryDomainFieldLabel: 'Pagrindinis domenas'
     RedirectURLFieldLabel: 'Nukreipimo nuoroda'
     ThemeFieldLabel: Tema
-  SubsitesVirtualPage:
-    PLURALNAME: 'Baziniai puslapiai'
diff --git a/lang/mi.yml b/lang/mi.yml
index ae74684..7fa67d6 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -1,12 +1,16 @@
 mi:
   ASSETADMIN:
     SUBSITENOTICE: 'Ka taea ngā kōpaki me ngā kōnae kua hangaia i te pae matua te uru mā ngā pae iti katoa.'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Ngā pae katoa'
-    SubsiteFieldLabel: 'Pae iti'
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Tāpiri Hōu mai i te Tātauira'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: 'Ngā pae iti'
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: ManaXHRPaeiti
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Ngā pae katoa'
+    SubsiteFieldLabel: 'Pae iti'
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Ngā pae iti katoa'
     ACCESSONLY: 'Ko ēnei pae iti anake'
     ACCESSRADIOTITLE: 'Tukuna tēnei rōpū kia uru ki'
@@ -14,12 +18,12 @@ mi:
     MANAGE_SUBSITES: 'Whakahaere pae iti mō ngā rōpū'
     MANAGE_SUBSITES_HELP: 'Te āheinga ki te whakawhāiti whakaaetanga mō tētahi rōpū ki tētahi neke atu rānei o ngā pae iti.'
     SECURITYTABTITLE: 'Ngā pae iti'
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Kua tiakina, whakahoutia ngā whārangi pāhono.'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Tārua
     CopyToSubsite: 'Tāruatia te whārangi ki te pae iti'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Tāurutia te hanganga mai i:'
     CopyMessage: 'I hangaia he tārua o {title}'
     CustomExtraMeta: 'Ngā Tūtohu Meta Ritenga'
@@ -38,16 +42,16 @@ mi:
     SiteConfigTitle: 'Tō Ingoa Pae'
     TabTitleConfig: Whirihoranga
     ValidateTitle: 'Tāurua he "Taitara"'
-  SubsiteAdmin:
-    MENUTITLE: 'Ngā pae iti'
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Rohe
     PLURALNAME: 'Ngā Rohe Pae Iti'
     SINGULARNAME: 'Rohe Pae Iti'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi whārangi ki tētahi atu pae iti'
+    SINGULARNAME: 'Whārangi Mariko Pae Iti'
+    SubsiteField: 'Pae iti'
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 'Ngā Pae'
-  SubsiteXHRController:
-    MENUTITLE: ManaXHRPaeiti
   Subsites:
     DefaultSiteFieldLabel: 'Pae taunoa'
     DomainFieldLabel: Rohe
@@ -59,7 +63,3 @@ mi:
     RedirectURLFieldLabel: 'Tukua anō te URL'
     ThemeFieldLabel: Kaupapa
     TitleFieldLabel: 'Ingoa Pae Iti'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi whārangi ki tētahi atu pae iti'
-    SINGULARNAME: 'Whārangi Mariko Pae Iti'
-    SubsiteField: 'Pae iti'
diff --git a/lang/nb_NO.yml b/lang/nb_NO.yml
index 4522c69..8df3c80 100644
--- a/lang/nb_NO.yml
+++ b/lang/nb_NO.yml
@@ -1,16 +1,16 @@
 nb_NO:
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Add New from Template'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Underdomener
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'All subsites'
     ACCESSONLY: 'Only these subsites'
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: subdomener
-  SubsiteAdmin:
-    MENUTITLE: Underdomener
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     PLURALNAME: 'Subsite Domains'
     SINGULARNAME: 'Subsite Domain'
-  SubsitesVirtualPage:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Subdomeners Virtuelle Side'
diff --git a/lang/nl.yml b/lang/nl.yml
index 3f30468..4ff823f 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,32 +1,32 @@
 nl:
-  FileSubsites:
-    SubsiteFieldLabel: Subsite
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Nieuwe toevegen vanaf template'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Subsites
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    SubsiteFieldLabel: Subsite
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Alle subsites'
     ACCESSONLY: 'Alleen deze subsites'
     ACCESSRADIOTITLE: 'Geef deze groep rechten aan'
     SECURITYTABTITLE: Subsites
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     CustomMetaDescription: Omschrijving
     CustomMetaTitle: Titel
     PLURALNAME: Subsites
     SINGULARNAME: Subsite
     SiteConfigTitle: 'Jouw Site Naam'
     TabTitleConfig: Configuratie
-  SubsiteAdmin:
-    MENUTITLE: Subsites
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domein
     PLURALNAME: 'Subsite Domeinen'
     SINGULARNAME: 'Subsite Domein'
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    SINGULARNAME: 'Subsites Virtuele pagina'
+    SubsiteField: Subsite
   Subsites:
     DefaultSiteFieldLabel: 'Standaard Site'
     LanguageFieldLabel: Taal
     PrimaryDomainFieldLabel: 'Primaire domein'
     ThemeFieldLabel: Thema
     TitleFieldLabel: 'Subsite naam'
-  SubsitesVirtualPage:
-    SINGULARNAME: 'Subsites Virtuele pagina'
-    SubsiteField: Subsite
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 5fd0b19..cee1553 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -1,16 +1,16 @@
 pl_PL:
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Dodaj nową na podstawie szablonu'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Podwitryny
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Wszystkie podwitryny'
     ACCESSONLY: 'Tylko te podwitryny'
     ACCESSRADIOTITLE: 'Daj tej grupie dostęp do'
     SECURITYTABTITLE: Podwitryny
-  SubsiteAdmin:
-    MENUTITLE: Podwitryny
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domena
     PLURALNAME: 'Domeny podwitryny'
     SINGULARNAME: 'Domena podwitryny'
-  SubsitesVirtualPage:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Wirtualna strona dla podwitryn'
diff --git a/lang/ru.yml b/lang/ru.yml
index fa9223e..f5b2859 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -3,12 +3,21 @@ ru:
     SUBSITENOTICE: 'Папки и файлы созданные на основном сайте так же доступны для под-сайтов.'
   DomainNameField:
     INVALID_DOMAIN: 'Неверный домен'
-  FileSubsites:
-    AllSitesDropdownOpt: 'Все сайты'
-    SubsiteFieldLabel: Подсайт
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Добавить из шаблона'
-  GroupSubsites:
+  LeftAndMain_Menu:
+    Hello: Здравствуйте
+    LOGOUT: 'Выход'
+  SilverStripe\CMS\Model\VirtualPage:
+    EDITCONTENT: 'Нажмите для изменения содержимого'
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: Подсайты
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: SubsiteXHRController
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 'Все сайты'
+    SubsiteFieldLabel: Подсайт
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'Все подсайты'
     ACCESSONLY: 'Только эти подсайты'
     ACCESSRADIOTITLE: 'Разрешить этой группе доступ к'
@@ -16,17 +25,14 @@ ru:
     MANAGE_SUBSITES: 'Управление подсайтами для групп'
     MANAGE_SUBSITES_HELP: 'Возможность ограничить права доступа для группы к одному и более подсайтам'
     SECURITYTABTITLE: Подсайты
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: 'Сохранено, пожалуйста обновите связанные группы'
-  LeftAndMain_Menu:
-    Hello: Здравствуйте
-    LOGOUT: 'Выход'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Копировать
     CopyToSubsite: 'Копировать страницу на подсайт'
     CopyToSubsiteWithChildren: 'Включая под-страницы?'
     SubsiteOperations: 'Операции над подсайтами'
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 'Скопировать структуры из:'
     CopyMessage: 'Создана копия {title}'
     CustomExtraMeta: 'Пользовательские мета-тэги'
@@ -45,9 +51,7 @@ ru:
     SiteConfigTitle: 'Название сайта'
     TabTitleConfig: Конфигурация
     ValidateTitle: 'Пожалуйста, добавьте "Заголовок"'
-  SubsiteAdmin:
-    MENUTITLE: Подсайты
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Домен
     DOMAIN_DESCRIPTION: 'Домен подсайта (без указания протоколов: http:// и https://). Разрешены (*) для обозначения поддоменов.'
     IS_PRIMARY: 'Это основной домен?'
@@ -58,10 +62,13 @@ ru:
     PROTOCOL_HTTPS: 'https://'
     Protocol: Протокол
     SINGULARNAME: 'Домен подсайта'
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: 'Отображает содержимое выбранной страницы на другом подсайте'
+    PLURALNAME: 'Базовые страницы'
+    SINGULARNAME: 'Виртуальная страница подсайта'
+    SubsiteField: Подсайт
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Сайты
-  SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
   Subsites:
     DefaultSiteFieldLabel: 'Основной сайт'
     DomainFieldLabel: Домен
@@ -73,10 +80,3 @@ ru:
     RedirectURLFieldLabel: 'Ссылка для перенаправления'
     ThemeFieldLabel: Оформление
     TitleFieldLabel: 'Название Подсайта'
-  SubsitesVirtualPage:
-    DESCRIPTION: 'Отображает содержимое выбранной страницы на другом подсайте'
-    PLURALNAME: 'Базовые страницы'
-    SINGULARNAME: 'Виртуальная страница подсайта'
-    SubsiteField: Подсайт
-  VirtualPage:
-    EDITCONTENT: 'Нажмите для изменения содержимого'
diff --git a/lang/tr_TR.yml b/lang/tr_TR.yml
index 29c51f9..1412b37 100644
--- a/lang/tr_TR.yml
+++ b/lang/tr_TR.yml
@@ -1,16 +1,16 @@
 tr_TR:
   GridFieldAddFromTemplateButton:
     AddFromTemplate: 'Add New from Template'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: 'Alt Siteler'
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 'All subsites'
     ACCESSONLY: 'Only these subsites'
     ACCESSRADIOTITLE: 'Give this group access to'
     SECURITYTABTITLE: 'Alt Siteler'
-  SubsiteAdmin:
-    MENUTITLE: 'Alt Siteler'
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     PLURALNAME: 'Subsite Domains'
     SINGULARNAME: 'Subsite Domain'
-  SubsitesVirtualPage:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     SINGULARNAME: 'Alt Site Sanal Sayfa'
diff --git a/lang/zh.yml b/lang/zh.yml
index 86bc366..215be1e 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,12 +1,16 @@
 zh:
   ASSETADMIN:
     SUBSITENOTICE: 主网站上创建的文件夹和文件可以被所有子网站访问。
-  FileSubsites:
-    AllSitesDropdownOpt: 所有网站
-    SubsiteFieldLabel: 子网站
   GridFieldAddFromTemplateButton:
     AddFromTemplate: '从模板中取出新加入'
-  GroupSubsites:
+  SilverStripe\Subsites\Admin\SubsiteAdmin:
+    MENUTITLE: 多个子网站
+  SilverStripe\Subsites\Controller\SubsiteXHRController:
+    MENUTITLE: '子网站 XHR 控制器'
+  SilverStripe\Subsites\Extensions\FileSubsites:
+    AllSitesDropdownOpt: 所有网站
+    SubsiteFieldLabel: 子网站
+  SilverStripe\Subsites\Extensions\GroupSubsites:
     ACCESSALL: 所有子网站
     ACCESSONLY: '仅这些子网站'
     ACCESSRADIOTITLE: '准许该群进入'
@@ -14,12 +18,12 @@ zh:
     MANAGE_SUBSITES: 管理小组的子网站
     MANAGE_SUBSITES_HELP: 能够将权限限制在一个小组、一个或多个子网站。
     SECURITYTABTITLE: 多个子网站
-  LeftAndMainSubsites:
+  SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     Saved: '已保存，请更新相关的页面。'
-  SiteTreeSubsites:
+  SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: 复制
     CopyToSubsite: 将页面复制到子网站
-  Subsite:
+  SilverStripe\Subsites\Model\Subsite:
     COPYSTRUCTURE: 复制结构来自：
     CopyMessage: '已创建一个 {title} 的副本'
     CustomExtraMeta: '自定义 Meta 标签'
@@ -38,16 +42,16 @@ zh:
     SiteConfigTitle: 您的网站名称
     TabTitleConfig: '配置'
     ValidateTitle: '请添加一个“标题”'
-  SubsiteAdmin:
-    MENUTITLE: 多个子网站
-  SubsiteDomain:
+  SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: 域名
     PLURALNAME: 多个子网站域名
     SINGULARNAME: 子网站域名
-  SubsiteReportWrapper:
+  SilverStripe\Subsites\Pages\SubsitesVirtualPage:
+    DESCRIPTION: '显示另一个子网站上一个页面的内容'
+    SINGULARNAME: 子网站虚拟页面
+    SubsiteField: 子网站
+  SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: 网站
-  SubsiteXHRController:
-    MENUTITLE: '子网站 XHR 控制器'
   Subsites:
     DefaultSiteFieldLabel: 默认网站
     DomainFieldLabel: 域名
@@ -59,7 +63,3 @@ zh:
     RedirectURLFieldLabel: '重定向 URL'
     ThemeFieldLabel: 主题
     TitleFieldLabel: 子网站名称
-  SubsitesVirtualPage:
-    DESCRIPTION: '显示另一个子网站上一个页面的内容'
-    SINGULARNAME: 子网站虚拟页面
-    SubsiteField: 子网站
diff --git a/src/Extension/FileSubsites.php b/src/Extension/FileSubsites.php
index 43a3a9b..fbaa5f7 100644
--- a/src/Extension/FileSubsites.php
+++ b/src/Extension/FileSubsites.php
@@ -50,16 +50,17 @@ class FileSubsites extends DataExtension
         if ($this->owner instanceof Folder) {
             $sites = Subsite::accessible_sites('CMS_ACCESS_AssetAdmin');
             $values = [];
-            $values[0] = _t('FileSubsites.AllSitesDropdownOpt', 'All sites');
+            $values[0] = _t(__CLASS__ . '.AllSitesDropdownOpt', 'All sites');
             foreach ($sites as $site) {
                 $values[$site->ID] = $site->Title;
             }
             ksort($values);
             if ($sites) {
                 //Dropdown needed to move folders between subsites
+                /** @var @skipUpgrade */
                 $dropdown = new DropdownField(
                     'SubsiteID',
-                    _t('FileSubsites.SubsiteFieldLabel', Subsite::class),
+                    _t(__CLASS__ . '.SubsiteFieldLabel', 'Subsite'),
                     $values
                 );
                 $dropdown->addExtraClass('subsites-move-dropdown');
diff --git a/src/Extension/GroupSubsites.php b/src/Extension/GroupSubsites.php
index a0290a2..0e4921e 100644
--- a/src/Extension/GroupSubsites.php
+++ b/src/Extension/GroupSubsites.php
@@ -78,7 +78,7 @@ class GroupSubsites extends DataExtension implements PermissionProvider
     {
         if ($this->owner->canEdit()) {
             // i18n tab
-            $fields->findOrMakeTab('Root.Subsites', _t('GroupSubsites.SECURITYTABTITLE', 'Subsites'));
+            $fields->findOrMakeTab('Root.Subsites', _t(__CLASS__ . '.SECURITYTABTITLE', 'Subsites'));
 
             $subsites = Subsite::accessible_sites(['ADMIN', 'SECURITY_SUBSITE_GROUP'], true);
             $subsiteMap = $subsites->map();
@@ -91,10 +91,10 @@ class GroupSubsites extends DataExtension implements PermissionProvider
             if (isset($subsiteMap[0])) {
                 $fields->addFieldToTab('Root.Subsites', new OptionsetField(
                     'AccessAllSubsites',
-                    _t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
+                    _t(__CLASS__ . '.ACCESSRADIOTITLE', 'Give this group access to'),
                     [
-                        1 => _t('GroupSubsites.ACCESSALL', 'All subsites'),
-                        0 => _t('GroupSubsites.ACCESSONLY', 'Only these subsites'),
+                        1 => _t(__CLASS__ . '.ACCESSALL', 'All subsites'),
+                        0 => _t(__CLASS__ . '.ACCESSONLY', 'Only these subsites'),
                     ]
                 ));
 
@@ -108,13 +108,13 @@ class GroupSubsites extends DataExtension implements PermissionProvider
                 if (sizeof($subsiteMap) <= 1) {
                     $fields->addFieldToTab('Root.Subsites', new ReadonlyField(
                         'SubsitesHuman',
-                        _t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
+                        _t(__CLASS__ . '.ACCESSRADIOTITLE', 'Give this group access to'),
                         reset($subsiteMap)
                     ));
                 } else {
                     $fields->addFieldToTab('Root.Subsites', new CheckboxSetField(
                         'Subsites',
-                        _t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
+                        _t(__CLASS__ . '.ACCESSRADIOTITLE', 'Give this group access to'),
                         $subsiteMap
                     ));
                 }
@@ -131,7 +131,7 @@ class GroupSubsites extends DataExtension implements PermissionProvider
     public function updateTreeTitle(&$title)
     {
         if ($this->owner->AccessAllSubsites) {
-            $title = _t('GroupSubsites.GlobalGroup', 'global group');
+            $title = _t(__CLASS__ . '.GlobalGroup', 'global group');
             $title = htmlspecialchars($this->owner->Title, ENT_QUOTES) . ' <i>(' . $title . ')</i>';
         } else {
             $subsites = Convert::raw2xml(implode(', ', $this->owner->Subsites()->column('Title')));
@@ -229,10 +229,10 @@ class GroupSubsites extends DataExtension implements PermissionProvider
     {
         return [
             'SECURITY_SUBSITE_GROUP' => [
-                'name' => _t('GroupSubsites.MANAGE_SUBSITES', 'Manage subsites for groups'),
-                'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
+                'name' => _t(__CLASS__ . '.MANAGE_SUBSITES', 'Manage subsites for groups'),
+                'category' => _t('SilverStripe\\Security\\Permission.PERMISSIONS_CATEGORY', 'Roles and access permissions'),
                 'help' => _t(
-                    'GroupSubsites.MANAGE_SUBSITES_HELP',
+                    __CLASS__ . '.MANAGE_SUBSITES_HELP',
                     'Ability to limit the permissions for a group to one or more subsites.'
                 ),
                 'sort' => 200
diff --git a/src/Extension/LeftAndMainSubsites.php b/src/Extension/LeftAndMainSubsites.php
index f9e94e1..f4c3ad9 100644
--- a/src/Extension/LeftAndMainSubsites.php
+++ b/src/Extension/LeftAndMainSubsites.php
@@ -54,7 +54,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
     public function getCMSTreeTitle()
     {
         $subsite = Subsite::currentSubsite();
-        return $subsite ? Convert::raw2xml($subsite->Title) : _t('LeftAndMain.SITECONTENTLEFT');
+        return $subsite ? Convert::raw2xml($subsite->Title) : _t('SilverStripe\\Admin\\LeftAndMain.SITECONTENTLEFT');
     }
 
     public function updatePageOptions(&$fields)
@@ -368,7 +368,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
         if ($record->hasMethod('NormalRelated') && ($record->NormalRelated() || $record->ReverseRelated())) {
             $this->owner->response->addHeader(
                 'X-Status',
-                rawurlencode(_t('LeftAndMainSubsites.Saved', 'Saved, please update related pages.'))
+                rawurlencode(_t(__CLASS__ . '.Saved', 'Saved, please update related pages.'))
             );
         }
     }
diff --git a/src/Extension/SiteTreeSubsites.php b/src/Extension/SiteTreeSubsites.php
index 7df6d24..a1f3e39 100644
--- a/src/Extension/SiteTreeSubsites.php
+++ b/src/Extension/SiteTreeSubsites.php
@@ -116,19 +116,19 @@ class SiteTreeSubsites extends DataExtension
                 'Root.Main',
                 ToggleCompositeField::create(
                     'SubsiteOperations',
-                    _t('SiteTreeSubsites.SubsiteOperations', 'Subsite Operations'),
+                    _t(__CLASS__ . '.SubsiteOperations', 'Subsite Operations'),
                     [
                         new DropdownField('CopyToSubsiteID', _t(
-                            'SiteTreeSubsites.CopyToSubsite',
+                            __CLASS__ . '.CopyToSubsite',
                             'Copy page to subsite'
                         ), $subsitesMap),
                         new CheckboxField(
                             'CopyToSubsiteWithChildren',
-                            _t('SiteTreeSubsites.CopyToSubsiteWithChildren', 'Include children pages?')
+                            _t(__CLASS__ . '.CopyToSubsiteWithChildren', 'Include children pages?')
                         ),
                         $copyAction = new FormAction(
                             'copytosubsite',
-                            _t('SiteTreeSubsites.CopyAction', 'Copy')
+                            _t(__CLASS__ . '.CopyAction', 'Copy')
                         )
                     ]
                 )->setHeadingLevel(4)
@@ -250,8 +250,8 @@ class SiteTreeSubsites extends DataExtension
         if (!$sc) {
             $sc = new SiteConfig();
             $sc->SubsiteID = $this->owner->SubsiteID;
-            $sc->Title = _t('Subsite.SiteConfigTitle', 'Your Site Name');
-            $sc->Tagline = _t('Subsite.SiteConfigSubtitle', 'Your tagline here');
+            $sc->Title = _t('SilverStripe\\Subsites\\Model\\Subsite.SiteConfigTitle', 'Your Site Name');
+            $sc->Tagline = _t('SilverStripe\\Subsites\\Model\\Subsite.SiteConfigSubtitle', 'Your tagline here');
             $sc->write();
         }
         return $sc;
diff --git a/src/Forms/GridFieldSubsiteDetailForm.php b/src/Forms/GridFieldSubsiteDetailForm.php
index 2f103a2..35efc4e 100644
--- a/src/Forms/GridFieldSubsiteDetailForm.php
+++ b/src/Forms/GridFieldSubsiteDetailForm.php
@@ -6,5 +6,5 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm;
 
 class GridFieldSubsiteDetailForm extends GridFieldDetailForm
 {
-    protected $itemRequestClass = 'GridFieldSubsiteDetailForm_ItemRequest';
+    protected $itemRequestClass = GridFieldSubsiteDetailFormItemRequest::class;
 }
diff --git a/src/Model/Subsite.php b/src/Model/Subsite.php
index 9320a83..b6239da 100644
--- a/src/Model/Subsite.php
+++ b/src/Model/Subsite.php
@@ -653,7 +653,7 @@ class Subsite extends DataObject
         if ($this->ID != 0) {
             $domainTable = new GridField(
                 'Domains',
-                _t('Subsite.DomainsListTitle', 'Domains'),
+                _t(__CLASS__ . '.DomainsListTitle', 'Domains'),
                 $this->Domains(),
                 GridFieldConfig_RecordEditor::create(10)
             );
@@ -661,7 +661,7 @@ class Subsite extends DataObject
             $domainTable = new LiteralField(
                 'Domains',
                 '<p>' . _t(
-                    'Subsite.DOMAINSAVEFIRST',
+                    __CLASS__ . '.DOMAINSAVEFIRST',
                     'You can only add domains after saving for the first time'
                 ) . '</p>'
             );
@@ -685,12 +685,12 @@ class Subsite extends DataObject
                 'Root',
                 new Tab(
                     'Configuration',
-                    _t('Subsite.TabTitleConfig', 'Configuration'),
+                    _t(__CLASS__ . '.TabTitleConfig', 'Configuration'),
                     HeaderField::create('ConfigForSubsiteHeaderField', 'Subsite Configuration'),
                     TextField::create('Title', $this->fieldLabel('Title'), $this->Title),
                     HeaderField::create(
                         'DomainsForSubsiteHeaderField',
-                        _t('Subsite.DomainsHeadline', 'Domains for this subsite')
+                        _t(__CLASS__ . '.DomainsHeadline', 'Domains for this subsite')
                     ),
                     $domainTable,
                     $languageSelector,
@@ -701,7 +701,7 @@ class Subsite extends DataObject
                         'PageTypeBlacklistToggle',
                         sprintf(
                             '<div class="field"><a href="#" id="PageTypeBlacklistToggle">%s</a></div>',
-                            _t('Subsite.PageTypeBlacklistField', 'Disallow page types?')
+                            _t(__CLASS__ . '.PageTypeBlacklistField', 'Disallow page types?')
                         )
                     ),
                     CheckboxSetField::create(
@@ -721,7 +721,7 @@ class Subsite extends DataObject
             $fields->addFieldToTab(
                 'Root.Configuration',
                 DropdownField::create('Theme', $this->fieldLabel('Theme'), $this->allowedThemes(), $this->Theme)
-                ->setEmptyString(_t('Subsite.ThemeFieldEmptyString', '-')),
+                ->setEmptyString(_t(__CLASS__ . '.ThemeFieldEmptyString', '-')),
                 'PageTypeBlacklistToggle'
             );
         }
@@ -798,7 +798,7 @@ class Subsite extends DataObject
     {
         $result = parent::validate();
         if (!$this->Title) {
-            $result->addError(_t('Subsite.ValidateTitle', 'Please add a "Title"'));
+            $result->addError(_t(__CLASS__ . '.ValidateTitle', 'Please add a "Title"'));
         }
         return $result;
     }
@@ -879,7 +879,7 @@ class Subsite extends DataObject
     {
         $newItem = $this->duplicate();
         $message = _t(
-            'Subsite.CopyMessage',
+            __CLASS__ . '.CopyMessage',
             'Created a copy of {title}',
             ['title' => Convert::raw2js($this->Title)]
         );
diff --git a/src/Model/SubsiteDomain.php b/src/Model/SubsiteDomain.php
index 1a23904..660da6f 100644
--- a/src/Model/SubsiteDomain.php
+++ b/src/Model/SubsiteDomain.php
@@ -106,25 +106,25 @@ class SubsiteDomain extends DataObject
     public function getCMSFields()
     {
         $protocols = [
-            self::PROTOCOL_HTTP => _t('SubsiteDomain.PROTOCOL_HTTP', 'http://'),
-            self::PROTOCOL_HTTPS => _t('SubsiteDomain.PROTOCOL_HTTPS', 'https://'),
-            self::PROTOCOL_AUTOMATIC => _t('SubsiteDomain.PROTOCOL_AUTOMATIC', 'Automatic')
+            self::PROTOCOL_HTTP => _t(__CLASS__ . '.PROTOCOL_HTTP', 'http://'),
+            self::PROTOCOL_HTTPS => _t(__CLASS__ . '.PROTOCOL_HTTPS', 'https://'),
+            self::PROTOCOL_AUTOMATIC => _t(__CLASS__ . '.PROTOCOL_AUTOMATIC', 'Automatic')
         ];
         $fields = new FieldList(
             WildcardDomainField::create('Domain', $this->fieldLabel('Domain'), null, 255)
                 ->setDescription(_t(
-                    'SubsiteDomain.DOMAIN_DESCRIPTION',
+                    __CLASS__ . '.DOMAIN_DESCRIPTION',
                     'Hostname of this subsite (exclude protocol). Allows wildcards (*).'
                 )),
             OptionsetField::create('Protocol', $this->fieldLabel('Protocol'), $protocols)
                 ->setDescription(_t(
-                    'SubsiteDomain.PROTOCOL_DESCRIPTION',
+                    __CLASS__ . '.PROTOCOL_DESCRIPTION',
                     'When generating links to this subsite, use the selected protocol. <br />' .
                     'Selecting \'Automatic\' means subsite links will default to the current protocol.'
                 )),
             CheckboxField::create('IsPrimary', $this->fieldLabel('IsPrimary'))
                 ->setDescription(_t(
-                    'SubsiteDomain.PROTOCOL_DESCRIPTION',
+                    __CLASS__ . '.PROTOCOL_DESCRIPTION',
                     'Mark this as the default domain for this subsite'
                 ))
         );
@@ -141,9 +141,9 @@ class SubsiteDomain extends DataObject
     public function fieldLabels($includerelations = true)
     {
         $labels = parent::fieldLabels($includerelations);
-        $labels['Domain'] = _t('SubsiteDomain.DOMAIN', 'Domain');
-        $labels['Protocol'] = _t('SubsiteDomain.Protocol', 'Protocol');
-        $labels['IsPrimary'] = _t('SubsiteDomain.IS_PRIMARY', 'Is Primary Domain?');
+        $labels['Domain'] = _t(__CLASS__ . '.DOMAIN', 'Domain');
+        $labels['Protocol'] = _t(__CLASS__ . '.Protocol', 'Protocol');
+        $labels['IsPrimary'] = _t(__CLASS__ . '.IS_PRIMARY', 'Is Primary Domain?');
 
         return $labels;
     }
diff --git a/src/Pages/SubsitesVirtualPage.php b/src/Pages/SubsitesVirtualPage.php
index ce01a6e..013083a 100644
--- a/src/Pages/SubsitesVirtualPage.php
+++ b/src/Pages/SubsitesVirtualPage.php
@@ -52,8 +52,7 @@ class SubsitesVirtualPage extends VirtualPage
             'Root.Main',
             DropdownField::create(
                 'CopyContentFromID_SubsiteID',
-                /** @skipUpgrade */
-                _t('SubsitesVirtualPage.SubsiteField', 'Subsite'),
+                _t(__CLASS__ . '.SubsiteField', 'Subsite'),
                 $subsites->map('ID', 'Title')
             )->addExtraClass('subsitestreedropdownfield-chooser no-change-track'),
             'CopyContentFromID'
@@ -62,7 +61,7 @@ class SubsitesVirtualPage extends VirtualPage
         // Setup the linking to the original page.
         $pageSelectionField = new SubsitesTreeDropdownField(
             'CopyContentFromID',
-            _t('VirtualPage.CHOOSE', 'Choose a page to link to'),
+            _t('SilverStripe\\CMS\\Model\\VirtualPage.CHOOSE', 'Choose a page to link to'),
             "SilverStripe\\CMS\\Model\\SiteTree",
             'ID',
             'MenuTitle'
@@ -79,7 +78,7 @@ class SubsitesVirtualPage extends VirtualPage
             $editLink = "admin/pages/edit/show/$this->CopyContentFromID/?SubsiteID=" . $this->CopyContentFrom()->SubsiteID;
             $linkToContent = "
 				<a class=\"cmsEditlink\" href=\"$editLink\">" .
-                _t('VirtualPage.EDITCONTENT', 'Click here to edit the content') .
+                _t('SilverStripe\\CMS\\Model\\VirtualPage.EDITCONTENT', 'Click here to edit the content') .
                 '</a>';
             $fields->removeByName('VirtualPageContentLinkLabel');
             $fields->addFieldToTab(
@@ -96,7 +95,7 @@ class SubsitesVirtualPage extends VirtualPage
             TextField::create(
                 'CustomMetaTitle',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
+            )->setDescription(_t(__CLASS__ . '.OverrideNote', 'Overrides inherited value from the source')),
             'MetaTitle'
         );
         $fields->addFieldToTab(
@@ -104,7 +103,7 @@ class SubsitesVirtualPage extends VirtualPage
             TextareaField::create(
                 'CustomMetaKeywords',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
+            )->setDescription(_t(__CLASS__ . '.OverrideNote', 'Overrides inherited value from the source')),
             'MetaKeywords'
         );
         $fields->addFieldToTab(
@@ -112,7 +111,7 @@ class SubsitesVirtualPage extends VirtualPage
             TextareaField::create(
                 'CustomMetaDescription',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
+            )->setDescription(_t(__CLASS__ . '.OverrideNote', 'Overrides inherited value from the source')),
             'MetaDescription'
         );
         $fields->addFieldToTab(
@@ -120,7 +119,7 @@ class SubsitesVirtualPage extends VirtualPage
             TextField::create(
                 'CustomExtraMeta',
                 $this->fieldLabel('CustomMetaTitle')
-            )->setDescription(_t('SubsitesVirtualPage.OverrideNote', 'Overrides inherited value from the source')),
+            )->setDescription(_t(__CLASS__ . '.OverrideNote', 'Overrides inherited value from the source')),
             'ExtraMeta'
         );
 
@@ -130,10 +129,10 @@ class SubsitesVirtualPage extends VirtualPage
     public function fieldLabels($includerelations = true)
     {
         $labels = parent::fieldLabels($includerelations);
-        $labels['CustomMetaTitle'] = _t('Subsite.CustomMetaTitle', 'Title');
-        $labels['CustomMetaKeywords'] = _t('Subsite.CustomMetaKeywords', 'Keywords');
-        $labels['CustomMetaDescription'] = _t('Subsite.CustomMetaDescription', 'Description');
-        $labels['CustomExtraMeta'] = _t('Subsite.CustomExtraMeta', 'Custom Meta Tags');
+        $labels['CustomMetaTitle'] = _t('SilverStripe\\Subsites\\Model\\Subsite.CustomMetaTitle', 'Title');
+        $labels['CustomMetaKeywords'] = _t('SilverStripe\\Subsites\\Model\\Subsite.CustomMetaKeywords', 'Keywords');
+        $labels['CustomMetaDescription'] = _t('SilverStripe\\Subsites\\Model\\Subsite.CustomMetaDescription', 'Description');
+        $labels['CustomExtraMeta'] = _t('SilverStripe\\Subsites\\Model\\Subsite.CustomExtraMeta', 'Custom Meta Tags');
 
         return $labels;
     }
diff --git a/src/Reports/SubsiteReportWrapper.php b/src/Reports/SubsiteReportWrapper.php
index 783b6fe..0e11d1d 100644
--- a/src/Reports/SubsiteReportWrapper.php
+++ b/src/Reports/SubsiteReportWrapper.php
@@ -22,9 +22,9 @@ class SubsiteReportWrapper extends ReportWrapper
         $subsites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', true);
         $options = $subsites->toDropdownMap('ID', 'Title');
 
-        $subsiteField = new TreeMultiselectField(
+        $subsiteField = TreeMultiselectField::create(
             'Subsites',
-            _t('SubsiteReportWrapper.ReportDropdown', 'Sites'),
+            _t(__CLASS__ . '.ReportDropdown', 'Sites'),
             $options
         );
         $subsiteField->setValue(array_keys($options));
@@ -38,7 +38,7 @@ class SubsiteReportWrapper extends ReportWrapper
         if ($fields) {
             $fields->insertBefore($subsiteField, $fields->First()->Name());
         } else {
-            $fields = new FieldList($subsiteField);
+            $fields = FieldList::create($subsiteField);
         }
         return $fields;
     }