diff --git a/typo3/sysext/about/Classes/Controller/ModulesController.php b/typo3/sysext/about/Classes/Controller/ModulesController.php
index 76c7cb9ab4df32b3667a43ecf21e656cd3414cf0..63fe527c657fb87459eb6e680de2a9f15b597832 100644
--- a/typo3/sysext/about/Classes/Controller/ModulesController.php
+++ b/typo3/sysext/about/Classes/Controller/ModulesController.php
@@ -98,7 +98,7 @@ class ModulesController extends ActionController
                 'TYPO3Version' => TYPO3_version,
                 'copyRightNotice' => BackendUtility::TYPO3_copyRightNotice(),
                 'warningMessages' => $securityWarnings,
-                'warningTitle' => $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:warning.header'),
+                'warningTitle' => $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.header'),
                 'modules' => $this->getModulesData()
             ]
         );
diff --git a/typo3/sysext/about/Resources/Private/Partials/About.html b/typo3/sysext/about/Resources/Private/Partials/About.html
index 15bde9e05918452d0c4d3eb3b064d8c39cbdefca..f8b250ca316786c831f556fad5525a2fc04737f7 100644
--- a/typo3/sysext/about/Resources/Private/Partials/About.html
+++ b/typo3/sysext/about/Resources/Private/Partials/About.html
@@ -1,5 +1,5 @@
 <p>
-	{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:cms_description',
+	{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:cms_description',
 		arguments: '{
 			0: TYPO3Version,
 			1: "&copy; {TYPO3CopyrightYear}",
diff --git a/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html b/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
index 8bf7a651f6eae2624f3df501bbe43824e0dbdc29..da4ca7c1ebf0c9614168cb0d31f1498d0bc93455 100644
--- a/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
+++ b/typo3/sysext/about/Resources/Private/Partials/CoreTeam.html
@@ -1,10 +1,10 @@
 <div class="panel panel-default">
 	<div class="panel-body panel-body-highlightlinks">
 		<h2 class="h4">
-			<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:coredevs" />
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:coredevs" />
 		</h2>
 		<p>
-			{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:coredevs_detail') -> f:format.raw()}
+			{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:coredevs_detail') -> f:format.raw()}
 		</p>
 	</div>
 </div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Credits.html b/typo3/sysext/about/Resources/Private/Partials/Credits.html
index 444c33fe7aa4bd60cf3b4416072828e15758a78f..046720382a332913f579f15bcb4af600448c16f2 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Credits.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Credits.html
@@ -1,10 +1,10 @@
 <div class="panel panel-default">
 	<div class="panel-body panel-body-highlightlinks">
 		<h2 class="h4">
-			{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:community_credits') -> f:format.raw()}
+			{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:community_credits') -> f:format.raw()}
 		</h2>
 		<p>
-			{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:information_detail') -> f:format.raw()}
+			{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:information_detail') -> f:format.raw()}
 		</p>
 	</div>
 </div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Donation.html b/typo3/sysext/about/Resources/Private/Partials/Donation.html
index f4a72a0167ff9b6711b761a562a38858bad05b30..820dc66a91ed54fbe126cd96055373079392acaa 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Donation.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Donation.html
@@ -1,13 +1,13 @@
 <div class="panel panel-default">
 	<div class="panel-body panel-body-highlightlinks">
 		<h2 class="h4">
-			<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:donation_header" />
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_header" />
 		</h2>
 		<p>
-			{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:donation_message') -> f:format.raw()}
+			{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_message') -> f:format.raw()}
 		</p>
-		<a href="{TYPO3UrlDonate}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:donation_button')}" target="_blank">
-			<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:donation_button" />
+		<a href="{TYPO3UrlDonate}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_button')}" target="_blank">
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_button" />
 		</a>
 	</div>
 </div>
diff --git a/typo3/sysext/about/Resources/Private/Partials/Extensions.html b/typo3/sysext/about/Resources/Private/Partials/Extensions.html
index 21dee19c19731749630aca9e1d03e8cccb9b0628..99368b6605242d9337a21b532b4fb131e26023ab 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Extensions.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Extensions.html
@@ -2,17 +2,17 @@
 	<div class="panel panel-default">
 		<div class="panel-body panel-body-highlightlinks">
 			<h2 class="h3">
-				<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_authors" />
+				<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_authors" />
 			</h2>
 			<p>
-				<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_list_info" />
+				<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_list_info" />
 			</p>
 		</div>
 		<table class="table panel-table">
 			<thead>
 				<tr>
-					<th width="35%"><f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension" /></th>
-					<th><f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_author" /></th>
+					<th width="35%"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension" /></th>
+					<th><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_author" /></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html b/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
index ed4c205d3d3b6c63a54f87446dc806f8d37945fa..65048bb761ac7a28d6060bedc13c14a7c30fb8ed 100644
--- a/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
+++ b/typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
@@ -1,10 +1,10 @@
 <div class="panel panel-default">
 	<div class="panel-body panel-body-highlightlinks">
 		<h2 class="h3">
-			<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:external_libraries" />
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:external_libraries" />
 		</h2>
 		<p>
-			<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:external_thanks" />
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:external_thanks" />
 		</p>
 	</div>
 	<table class="table panel-table">
diff --git a/typo3/sysext/about/Resources/Private/Partials/Logo.html b/typo3/sysext/about/Resources/Private/Partials/Logo.html
index fb99937bb6df46c9bafd1cca37fa76ebfbf3d36e..619b44a0496b4993a0fb7e1895873e239249dc63 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Logo.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Logo.html
@@ -1,8 +1,8 @@
 <img src="{f:uri.resource(path: 'Images/typo3-transparent@2x.png', extensionName: 'backend')}" width="150"
-	alt="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:typo3_logo')}" />
+	alt="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:typo3_logo')}" />
 <br>
 <br>
 <h1>
 	TYPO3 CMS {TYPO3Version}<br>
-	<f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext" />
+	<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext" />
 </h1>
diff --git a/typo3/sysext/about/Resources/Private/Templates/Modules/Index.html b/typo3/sysext/about/Resources/Private/Templates/Modules/Index.html
index 703b0e5117484bff1d20fbc12ddfdcf5fbaba6aa..833bfd41083e863a924467bfe14ffd6499ce0818 100644
--- a/typo3/sysext/about/Resources/Private/Templates/Modules/Index.html
+++ b/typo3/sysext/about/Resources/Private/Templates/Modules/Index.html
@@ -5,7 +5,7 @@
 	<div class="container-small">
 		<f:render partial="Logo" arguments="{_all}" />
 		<p>
-			<f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext2" />
+			<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext2" />
 		</p>
 		<f:if condition="{warningMessages}">
 			<f:be.infobox title="{warningTitle}" state="2">{warningMessages -> f:format.raw()}</f:be.infobox>
@@ -57,7 +57,7 @@
 				</div>
 			</f:if>
 		</f:for>
-		<p><em class="text-muted"><f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:endText" /></em></p>
+		<p><em class="text-muted"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:endText" /></em></p>
 		<p>{copyRightNotice -> f:format.raw()}</p>
 	</div>
 
diff --git a/typo3/sysext/about/ext_tables.php b/typo3/sysext/about/ext_tables.php
index a9b6f46d4bc0d94e2b07679032e801effad0ae2d..8db305f1c8f530aa609aacb14fb95b3702b87c64 100644
--- a/typo3/sysext/about/ext_tables.php
+++ b/typo3/sysext/about/ext_tables.php
@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
         [
             'access' => 'user,group',
             'icon' => 'EXT:about/Resources/Public/Icons/module-about.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_help_about.xlf'
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf'
         ]
     );
 
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
index df33469e40acd733a2dc52a1969d139cc81459e1..7b3e22ebfda8373742c52519ebf3f0b5ff4846ec 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
@@ -60,8 +60,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
         if ($backendUser->isAdmin() || $backendUser->getTSConfigVal('options.clearCache.pages')) {
             $this->cacheActions[] = [
                 'id' => 'pages',
-                'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesTitle')),
-                'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesDescription')),
+                'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesTitle')),
+                'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesDescription')),
                 'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'pages']),
                 'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-low', Icon::SIZE_SMALL)->render()
             ];
@@ -74,8 +74,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
         if ($backendUser->getTSConfigVal('options.clearCache.all') || ($backendUser->isAdmin() && $backendUser->getTSConfigVal('options.clearCache.all') !== '0')) {
             $this->cacheActions[] = [
                 'id' => 'all',
-                'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesTitle2')),
-                'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesDescription2')),
+                'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesTitle2')),
+                'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesDescription2')),
                 'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'all']),
                 'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-high', Icon::SIZE_SMALL)->render()
             ];
@@ -126,7 +126,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
             $templateReference = 'ClearCacheToolbarItem.html';
             $icon = $this->iconFactory->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render('inline');
             $variables = [
-                'title' => 'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
+                'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
                 'icon' => $icon
             ];
         } else {
@@ -151,7 +151,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
     {
         $view = $this->getFluidTemplateObject('ClearCacheToolbarItemDropDown.html');
         $view->assignMultiple([
-                'title' =>  'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
+                'title' =>  'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
                 'cacheActions' => $this->cacheActions,
             ]
         );
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/HelpToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/HelpToolbarItem.php
index 244d637d2107f2bcc9a9a7b9d6fa3e9e1e9589e7..3b55abf9c4e7227e29cd9965dcb2a89f4b107937 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/HelpToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/HelpToolbarItem.php
@@ -73,7 +73,7 @@ class HelpToolbarItem implements ToolbarItemInterface
 
         $view = $this->getFluidTemplateObject('HelpToolbarItem.html');
         $view->assignMultiple([
-                'title' => 'LLL:EXT:lang/locallang_core.xlf:toolbarItems.help',
+                'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.help',
                 'icon' => $icon
             ]
         );
@@ -90,7 +90,7 @@ class HelpToolbarItem implements ToolbarItemInterface
     {
         $view = $this->getFluidTemplateObject('HelpToolbarItemDropDown.html');
         $view->assignMultiple([
-                'title' =>  'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
+                'title' =>  'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
                 'modules' => $this->helpModuleMenu->getChildren()
             ]
         );
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
index de040e0b3f89a4019b78c2d81b84937f2cbe05c7..f33244f27d9bf7ccaf6764e79344118dc0ac1754 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
@@ -72,7 +72,7 @@ class LiveSearchToolbarItem implements ToolbarItemInterface
                         <div class="form-control-icon">
                             ' . $this->iconFactory->getIcon('apps-toolbar-menu-search', Icon::SIZE_SMALL)->render('inline') . '
                         </div>
-					    <input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field" placeholder="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.search')) . '" id="live-search-box" autocomplete="off">
+					    <input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field" placeholder="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.search')) . '" id="live-search-box" autocomplete="off">
                     </div>
 				</div>
 			</form>
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
index 1457ea49a23df43954b92f7ef1a349e8cbc38fe2..cf8151999c2116eafe9343ce4ad024f480b07620 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
@@ -86,7 +86,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
     public function __construct()
     {
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         // Needed to get the correct icons when reloading the menu after saving it
         $this->moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
         $this->moduleLoader->load($GLOBALS['TBE_MODULES']);
@@ -105,11 +105,11 @@ class ShortcutToolbarItem implements ToolbarItemInterface
         $this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/Toolbar/ShortcutMenu');
         $languageService = $this->getLanguageService();
         $this->getPageRenderer()->addInlineLanguageLabelArray([
-            'bookmark.delete' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksDelete'),
-            'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
-            'bookmark.create' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.createBookmark'),
-            'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
-            'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
+            'bookmark.delete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'),
+            'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
+            'bookmark.create' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.createBookmark'),
+            'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
+            'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
         ]);
     }
 
@@ -130,7 +130,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
      */
     public function getItem()
     {
-        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks'));
+        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks'));
         $icon = $this->iconFactory->getIcon('apps-toolbar-menu-shortcut', Icon::SIZE_SMALL)->render('inline');
         return '
             <span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
@@ -146,15 +146,15 @@ class ShortcutToolbarItem implements ToolbarItemInterface
     public function getDropDown()
     {
         $languageService = $this->getLanguageService();
-        $shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksEdit'));
-        $shortcutDelete = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksDelete'));
+        $shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit'));
+        $shortcutDelete = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'));
         $editIcon = '<a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit" title="' . $shortcutEdit . '">'
             . $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL)->render('inline') . '</a>';
         $deleteIcon = '<a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete" title="' . $shortcutDelete . '">'
             . $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)->render('inline') . '</a>';
 
         $shortcutMenu = [];
-        $shortcutMenu[] = '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks')) . '</h3>';
+        $shortcutMenu[] = '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')) . '</h3>';
         $shortcutMenu[] = '<hr>';
 
         // Render groups and the contained shortcuts
@@ -193,9 +193,9 @@ class ShortcutToolbarItem implements ToolbarItemInterface
         $compiledShortcutMenu = implode(LF, $shortcutMenu);
         if (count($shortcutMenu) === 2) {
             // No shortcuts added yet, show a small help message how to add shortcuts
-            $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks'));
+            $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks'));
             $icon = '<span title="' . $title . '">' . $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render('inline') . '</span>';
-            $label = str_replace('%icon%', $icon, htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmarkDescription')));
+            $label = str_replace('%icon%', $icon, htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmarkDescription')));
             $compiledShortcutMenu .= '<p>' . $label . '</p>';
         }
 
@@ -461,7 +461,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
             $groupId = (int)$groupId;
             $label = $groupLabel;
             if ($groupLabel == '1') {
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmark_group_' . abs($groupId)));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_group_' . abs($groupId)));
                 if (empty($label)) {
                     // Fallback label
                     $label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId);
@@ -469,7 +469,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
             }
             if ($groupId < 0) {
                 // Global group
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId));
                 if ($groupId === self::SUPERGLOBAL_GROUP) {
                     $label = htmlspecialchars($languageService->getLL('bookmark_global')) . ': ' . htmlspecialchars($languageService->getLL('bookmark_all'));
                 }
@@ -509,7 +509,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
         $content = '
 			<form class="shortcut-form" role="form" data-shortcutid="' . (int)$selectedShortcutId . '">
                 <h3 class="dropdown-headline">
-                    ' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksEdit')) . '
+                    ' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')) . '
                 </h3>
                 <hr>
 				<div class="form-group">
@@ -847,7 +847,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
     protected function getShortcutIcon($row, $shortcut)
     {
         $languageService = $this->getLanguageService();
-        $titleAttribute = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.shortcut'));
+        $titleAttribute = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.shortcut'));
         switch ($row['module_name']) {
             case 'xMOD_alt_doc.php':
                 $table = $shortcut['table'];
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
index 4240d498fc1f6618f7d10244730fd54698a4be77..1beb1211731634e199c78ebea768b613c7cececc 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
@@ -156,7 +156,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
     protected function getPhpVersion()
     {
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.phpversion')),
+            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.phpversion')),
             'value' => PHP_VERSION,
             'icon' => $this->iconFactory->getIcon('sysinfo-php-version', Icon::SIZE_SMALL)->render()
         ];
@@ -172,7 +172,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
         foreach (GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionNames() as $connectionName) {
             $this->systemInformation[] = [
                 'title' => $this->getLanguageService()
-                    ->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.database')
+                    ->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.database')
                     . ' (' . htmlspecialchars($connectionName) . ')',
                 'value' => GeneralUtility::makeInstance(ConnectionPool::class)
                     ->getConnectionByName($connectionName)
@@ -191,7 +191,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
     {
         $applicationContext = GeneralUtility::getApplicationContext();
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext')),
+            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext')),
             'value' => (string)$applicationContext,
             'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING,
             'icon' => $this->iconFactory->getIcon('sysinfo-application-context', Icon::SIZE_SMALL)->render()
@@ -209,8 +209,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
 
         $languageService = $this->getLanguageService();
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.composerMode')),
-            'value' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.enabled')),
+            'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.composerMode')),
+            'value' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled')),
             'icon' => $this->iconFactory->getIcon('sysinfo-composer-mode', Icon::SIZE_SMALL)->render()
         ];
     }
@@ -236,7 +236,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
         $branch = trim(CommandUtility::exec('git rev-parse --abbrev-ref HEAD'));
         if (!empty($revision) && !empty($branch)) {
             $this->systemInformation[] = [
-                'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.gitrevision')),
+                'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.gitrevision')),
                 'value' => sprintf('%s [%s]', $revision, $branch),
                 'icon' => $this->iconFactory->getIcon('sysinfo-git', Icon::SIZE_SMALL)->render()
             ];
@@ -262,7 +262,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
                 $icon = 'windows';
         }
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem')),
+            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem')),
             'value' => $kernelName . ' ' . php_uname('r'),
             'icon' => $this->iconFactory->getIcon('sysinfo-os-' . $icon, Icon::SIZE_SMALL)->render()
         ];
@@ -274,7 +274,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
     protected function getWebServer()
     {
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.webserver')),
+            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.webserver')),
             'value' => htmlspecialchars($_SERVER['SERVER_SOFTWARE']),
             'icon' => $this->iconFactory->getIcon('sysinfo-webserver', Icon::SIZE_SMALL)->render()
         ];
@@ -286,7 +286,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
     protected function getTypo3Version()
     {
         $this->systemInformation[] = [
-            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.typo3-version')),
+            'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.typo3-version')),
             'value' => htmlspecialchars(VersionNumberUtility::getCurrentTypo3Version()),
             'icon' => $this->iconFactory->getIcon('sysinfo-typo3-version', Icon::SIZE_SMALL)->render()
         ];
@@ -376,7 +376,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
      */
     public function getItem()
     {
-        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo'));
+        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo'));
         $icon = $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render('inline');
         return '
             <span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index f1cc1fdda4b616209a81a14ab5aa9d81ad8a513c..05a1092a6979c308c089a15e87067e45ae78ab55 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -538,10 +538,10 @@ class ClickMenu
             . $this->frameLocation($loc . '.document') . '.search);';
 
         if ($this->backendUser->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
-            $title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:clip_paste');
+            $title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:clip_paste');
             $lllKey = ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_' . $type;
             $confirmMessage = sprintf(
-                $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.' . $lllKey),
+                $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.' . $lllKey),
                 $elInfo[0],
                 $elInfo[1]
             );
@@ -797,7 +797,7 @@ class ClickMenu
      *
      * @param string $table Table name
      * @param int $uid UID for the current record.
-     * @param array $elInfo Label for including in the confirmation message, EXT:lang/locallang_core.xlf:mess.delete
+     * @param array $elInfo Label for including in the confirmation message, EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete
      * @return array Item array, element in $menuItems
      * @internal
      */
@@ -817,20 +817,20 @@ class ClickMenu
         }
 
         if ($this->backendUser->jsConfirmation(JsConfirmation::DELETE)) {
-            $title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete');
+            $title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:delete');
             $confirmMessage = sprintf(
-                $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.delete'),
+                $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete'),
                 $elInfo[0]
             );
             $confirmMessage .= BackendUtility::referenceCount(
                 $table,
                 $uid,
-                ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToRecord')
+                ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToRecord')
             );
             $confirmMessage .= BackendUtility::translationCount(
                 $table,
                 $uid,
-                ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.translationsOfRecord')
+                ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.translationsOfRecord')
             );
             $jsCode = 'top.TYPO3.Modal.confirm(' . GeneralUtility::quoteJSvalue($title) . ', '
                 . GeneralUtility::quoteJSvalue($confirmMessage) . ')'
@@ -1144,15 +1144,15 @@ class ClickMenu
             );
         if ($this->backendUser->jsConfirmation(JsConfirmation::DELETE)) {
             $fileOrFolderObject = ResourceFactory::getInstance()->retrieveFileOrFolderObject($path);
-            $title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete');
+            $title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:delete');
             $confirmMessage = sprintf(
-                $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.delete'),
+                $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete'),
                 $fileOrFolderObject->getName()
             );
             if ($fileOrFolderObject instanceof Folder) {
-                $confirmMessage .= BackendUtility::referenceCount('_FILE', $fileOrFolderObject->getIdentifier(), ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFolder'));
+                $confirmMessage .= BackendUtility::referenceCount('_FILE', $fileOrFolderObject->getIdentifier(), ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFolder'));
             } else {
-                $confirmMessage .= BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFile'));
+                $confirmMessage .= BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFile'));
             }
             $jsCode = 'top.TYPO3.Modal.confirm(' . GeneralUtility::quoteJSvalue($title) . ', '
                 . GeneralUtility::quoteJSvalue($confirmMessage) . ')'
@@ -1187,10 +1187,10 @@ class ClickMenu
             . '.pathname+' . $this->frameLocation($loc . '.document') . '.search); top.nav.refresh();';
 
         if ($this->backendUser->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
-            $title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:clip_paste');
+            $title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:clip_paste');
 
             $confirmMessage = sprintf(
-                $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.'
+                $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.'
                     . ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_into'),
                 $elInfo[0],
                 $elInfo[1]
@@ -1582,7 +1582,7 @@ class ClickMenu
      */
     public function label($label)
     {
-        return htmlspecialchars($this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.' . $label));
+        return htmlspecialchars($this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.' . $label));
     }
 
     /**
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index 6d275fd904f328f3df4bf20d9b4e0fbf858fc33c..e7842adc0dd3915f8218c193d8e1c26c80ad8e59 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -256,8 +256,8 @@ class Clipboard
         $elementCount = count($this->elFromTable($this->fileMode ? '_FILE' : ''));
         // Copymode Selector menu
         $copymodeUrl = GeneralUtility::linkThisScript();
-        $moveLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:moveElements'));
-        $copyLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:copyElements'));
+        $moveLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:moveElements'));
+        $copyLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:copyElements'));
 
         $copymodeSelector = '
 			<div class="btn-group">
@@ -295,16 +295,16 @@ class Clipboard
                 $confirmationCheck = true;
             }
             $confirmationMessage = sprintf(
-                $languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.deleteClip'),
+                $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.deleteClip'),
                 $elementCount
             );
             $title = $languageService
-                ->sL('LLL:EXT:lang/locallang_core.xlf:labels.clipboard.delete_elements');
+                ->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.delete_elements');
             $returnUrl = $this->deleteUrl(1, ($this->fileMode ? 1 : 0));
             $btnOkText = $languageService
-                ->sL('LLL:EXT:lang/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes');
+                ->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes');
             $btnCancelText = $languageService
-                ->sL('LLL:EXT:lang/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no');
+                ->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no');
             $optionArray[] = '<li><a'
                 . (($confirmationCheck) ? ' class="t3js-modal-trigger"' : '')
                 . ' href="' . htmlspecialchars($returnUrl) . '"'
@@ -316,8 +316,8 @@ class Clipboard
                 . htmlspecialchars($title) . '</a></li>';
 
             // Clear clipboard
-            $optionArray[] = '<li><a href="' . htmlspecialchars($removeAllUrl) . '#clip_head">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.clipboard.clear_clipboard')) . '</a></li>';
-            $deleteLink = '<a class="btn btn-danger" href="' . htmlspecialchars($removeAllUrl) . '#clip_head" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:buttons.clear')) . '">' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render(SvgIconProvider::MARKUP_IDENTIFIER_INLINE) . '</a>';
+            $optionArray[] = '<li><a href="' . htmlspecialchars($removeAllUrl) . '#clip_head">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.clear_clipboard')) . '</a></li>';
+            $deleteLink = '<a class="btn btn-danger" href="' . htmlspecialchars($removeAllUrl) . '#clip_head" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.clear')) . '">' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render(SvgIconProvider::MARKUP_IDENTIFIER_INLINE) . '</a>';
 
             // menuSelector
             $menuSelector = '
@@ -751,7 +751,7 @@ class Clipboard
     public function confirmMsgText($table, $rec, $type, $clElements, $columnLabel = '')
     {
         if ($this->getBackendUser()->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
-            $labelKey = 'LLL:EXT:lang/locallang_core.xlf:mess.' . ($this->currentMode() == 'copy' ? 'copy' : 'move') . ($this->current == 'normal' ? '' : 'cb') . '_' . $type;
+            $labelKey = 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.' . ($this->currentMode() == 'copy' ? 'copy' : 'move') . ($this->current == 'normal' ? '' : 'cb') . '_' . $type;
             $msg = $this->getLanguageService()->sL($labelKey . ($columnLabel ? '_colPos': ''));
             if ($table == '_FILE') {
                 $thisRecTitle = basename($rec);
@@ -792,7 +792,7 @@ class Clipboard
     }
 
     /**
-     * Clipboard label - getting from "EXT:lang/locallang_core.xlf:"
+     * Clipboard label - getting from "EXT:lang/Resources/Private/Language/locallang_core.xlf:"
      *
      * @param string $key Label Key
      * @param string $Akey Alternative key to "labels
@@ -800,7 +800,7 @@ class Clipboard
      */
     public function clLabel($key, $Akey = 'labels')
     {
-        return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:' . $Akey . '.' . $key));
+        return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:' . $Akey . '.' . $key));
     }
 
     /**
diff --git a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
index 547f3e20268acb68f2658c5ff32c099831e62509..a458fcf3b33e19211b83eb151d78c2bb34fc37f4 100644
--- a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
+++ b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
@@ -249,9 +249,9 @@ class TranslationConfigurationProvider
     protected function getDefaultLanguageLabel(array $modSharedTSconfig)
     {
         if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) {
-            $defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
+            $defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')';
         } else {
-            $defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
+            $defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage');
         }
         return $defaultLanguageLabel;
     }
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index 9731da8bb1c324befa08277c9d16afb643493005..d2929018778d3f8fa8437156e0e4a3bcae8ffba4 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -100,7 +100,7 @@ class BackendController
      */
     public function __construct()
     {
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $this->backendModuleRepository = GeneralUtility::makeInstance(BackendModuleRepository::class);
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
 
@@ -479,23 +479,23 @@ class BackendController
     {
         $lang = $this->getLanguageService();
         $coreLabels = [
-            'waitTitle' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logging_in'),
-            'refresh_login_failed' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed'),
-            'refresh_login_failed_message' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed_message'),
-            'refresh_login_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_title'),
-            'login_expired' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_expired'),
-            'refresh_login_username' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_username'),
-            'refresh_login_password' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_password'),
-            'refresh_login_emptyPassword' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_emptyPassword'),
-            'refresh_login_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_button'),
-            'refresh_exit_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_exit_button'),
-            'please_wait' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.please_wait'),
-            'be_locked' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.be_locked'),
-            'login_about_to_expire' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire'),
-            'login_about_to_expire_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire_title'),
-            'refresh_login_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logout_button'),
-            'refresh_login_refresh_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_refresh_button'),
-            'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:csh_tooltip_loading')
+            'waitTitle' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_logging_in'),
+            'refresh_login_failed' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_failed'),
+            'refresh_login_failed_message' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_failed_message'),
+            'refresh_login_title' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_title'),
+            'login_expired' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.login_expired'),
+            'refresh_login_username' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_username'),
+            'refresh_login_password' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_password'),
+            'refresh_login_emptyPassword' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_emptyPassword'),
+            'refresh_login_button' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_button'),
+            'refresh_exit_button' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_exit_button'),
+            'please_wait' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.please_wait'),
+            'be_locked' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.be_locked'),
+            'login_about_to_expire' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.login_about_to_expire'),
+            'login_about_to_expire_title' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.login_about_to_expire_title'),
+            'refresh_login_logout_button' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_logout_button'),
+            'refresh_login_refresh_button' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refresh_login_refresh_button'),
+            'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:csh_tooltip_loading')
         ];
         $labels = [
             'fileUpload' => [
@@ -667,7 +667,7 @@ class BackendController
             // Warning about page editing:
             require(["TYPO3/CMS/Backend/Modal", "TYPO3/CMS/Backend/Severity"], function(Modal, Severity) {
                 Modal.show("", ' . GeneralUtility::quoteJSvalue(sprintf($this->getLanguageService()->getLL('noEditPage'), $editId)) . ', Severity.notice, [{
-                    text: ' . GeneralUtility::quoteJSvalue($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:close')) . ',
+                    text: ' . GeneralUtility::quoteJSvalue($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:close')) . ',
                     active: true,
                     btnClass: "btn-info",
                     name: "cancel",
diff --git a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
index 6e2ec02d19befff8011175c27834901cc67cbaa0..dc689a1fc18093b0a6446b8eac888a6e90dd73d6 100644
--- a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
+++ b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
@@ -31,7 +31,7 @@ class ClickMenuController
      */
     public function __construct()
     {
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $GLOBALS['SOBE'] = $this;
         // Setting pseudo module name
         $this->MCONF['name'] = 'xMOD_alt_clickmenu.php';
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
index 7e39350765ae71f1eae726429b2596b2f64fcefc..9b924521f8782e8caf77ce75250be67253895a3f 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
@@ -53,7 +53,7 @@ class ElementHistoryController extends AbstractModule
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_show_rechis.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
@@ -154,7 +154,7 @@ class ElementHistoryController extends AbstractModule
         if ($returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
                 ->setHref($returnUrl)
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton, ButtonBar::BUTTON_POSITION_LEFT, 10);
         }
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 9d06db979cb38384af43e5b6d96dc19bfd2a031e..45890b2d11500de9d135b0bab7e11d1e8b92e9a9 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -243,7 +243,7 @@ class ElementInformationController
     {
         $title = strip_tags(BackendUtility::getRecordTitle($this->table, $this->row));
         if ($this->type === 'folder') {
-            $table = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:folder');
+            $table = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:folder');
             $icon = $this->iconFactory->getIconForResource($this->folderObject, Icon::SIZE_SMALL)->render();
         } elseif ($this->type === 'file') {
             $table = $this->getLanguageService()->sL($GLOBALS['TCA'][$this->table]['ctrl']['title']);
@@ -278,7 +278,7 @@ class ElementInformationController
         // check if file is marked as missing
         if ($this->fileObject->isMissing()) {
             $previewTag .= '<span class="label label-danger">'
-                . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                 . '</span>&nbsp;' . htmlspecialchars($this->fileObject->getName()) . '<br />';
         } else {
 
@@ -323,7 +323,7 @@ class ElementInformationController
                 $showLink .= '
 					<a class="btn btn-primary" href="' . htmlspecialchars($url) . '" target="_blank">
 						' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render('inline') . '
-						' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.show')) . '
+						' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.show')) . '
 					</a>';
             }
         }
@@ -345,15 +345,15 @@ class ElementInformationController
         $lang = $this->getLanguageService();
         if (in_array($this->type, ['folder', 'file'], true)) {
             if ($this->type === 'file') {
-                $extraFields['creation_date'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.creationDate'));
-                $extraFields['modification_date'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.timestamp'));
+                $extraFields['creation_date'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.creationDate'));
+                $extraFields['modification_date'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.timestamp'));
             }
-            $extraFields['storage'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_tca.xlf:sys_file.storage'));
-            $extraFields['folder'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_common.xlf:folder'));
+            $extraFields['storage'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.storage'));
+            $extraFields['folder'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:folder'));
         } else {
-            $extraFields['crdate'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.creationDate'));
-            $extraFields['cruser_id'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.creationUserId'));
-            $extraFields['tstamp'] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.timestamp'));
+            $extraFields['crdate'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.creationDate'));
+            $extraFields['cruser_id'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.creationUserId'));
+            $extraFields['tstamp'] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.timestamp'));
 
             // check if the special fields are defined in the TCA ctrl section of the table
             foreach ($extraFields as $fieldName => $fieldLabel) {
@@ -423,7 +423,7 @@ class ElementInformationController
 
             // format file size as bytes/kilobytes/megabytes
             if ($this->type === 'file' && $name === 'size') {
-                $this->row[$name] = GeneralUtility::formatSize($this->row[$name], htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:byteSizeUnits')));
+                $this->row[$name] = GeneralUtility::formatSize($this->row[$name], htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:byteSizeUnits')));
             }
 
             $isExcluded = !(!$GLOBALS['TCA'][$this->table]['columns'][$name]['exclude'] || $this->getBackendUser()->check('non_exclude_fields', $this->table . ':' . $name));
@@ -461,13 +461,13 @@ class ElementInformationController
             case 'db': {
                 $references = $this->makeRef($this->table, $this->row['uid']);
                 if (!empty($references)) {
-                    $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.referencesToThisItem')) . '</h3>';
+                    $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesToThisItem')) . '</h3>';
                     $content .= $references;
                 }
 
                 $referencesFrom = $this->makeRefFrom($this->table, $this->row['uid']);
                 if (!empty($referencesFrom)) {
-                    $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.referencesFromThisItem')) . '</h3>';
+                    $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesFromThisItem')) . '</h3>';
                     $content .= $referencesFrom;
                 }
                 break;
@@ -478,7 +478,7 @@ class ElementInformationController
                     $references = $this->makeRef('_FILE', $this->fileObject);
 
                     if (!empty($references)) {
-                        $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.referencesToThisItem')) . '</h3>';
+                        $content .= '<h3>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.referencesToThisItem')) . '</h3>';
                         $content .= $references;
                     }
                 }
@@ -502,7 +502,7 @@ class ElementInformationController
             $backLink .= '
 				<a class="btn btn-primary" href="' . htmlspecialchars($returnUrl) . '">
 					' . $this->iconFactory->getIcon('actions-view-go-back', Icon::SIZE_SMALL)->render() . '
-					' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:back')) . '
+					' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:back')) . '
 				</a>';
         }
         return $backLink;
@@ -610,14 +610,14 @@ class ElementInformationController
             // Recordlist button
             $url = BackendUtility::getModuleUrl('web_list', ['id' => $uid, 'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')]);
             $pageActionIcons .= '
-				<a class="btn btn-default btn-sm" href="' . htmlspecialchars($url) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList') . '">
+				<a class="btn btn-default btn-sm" href="' . htmlspecialchars($url) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showList') . '">
 					' . $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . '
 				</a>';
 
             // View page button
             $viewOnClick = BackendUtility::viewOnClick($uid, '', BackendUtility::BEgetRootLine($uid));
             $pageActionIcons .= '
-				<a class="btn btn-default btn-sm" href="#" onclick="' . htmlspecialchars($viewOnClick) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">
+				<a class="btn btn-default btn-sm" href="#" onclick="' . htmlspecialchars($viewOnClick) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">
 					' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '
 				</a>';
         }
@@ -675,13 +675,13 @@ class ElementInformationController
             $infoDataHeader = '
 				<tr>
 					<th class="col-icon"></th>
-					<th class="col-title">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.title') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.table') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.uid') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.field') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.flexpointer') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.softrefKey') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.sorting') . '</th>
+					<th class="col-title">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.title') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.table') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.uid') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.field') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting') . '</th>
 					<th class="col-control"></th>
 				</tr>';
         }
@@ -723,7 +723,7 @@ class ElementInformationController
 					</td>
 					<td>' . htmlspecialchars($lang->sL($GLOBALS['TCA'][$row['tablename']]['ctrl']['title'])) . '</td>
 					<td>
-						<span title="' . $lang->sL('LLL:EXT:lang/locallang_common.xlf:page') . ': '
+						<span title="' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:page') . ': '
                             . htmlspecialchars($parentRecordTitle) . ' (uid=' . $record['pid'] . ')">
 							' . $record['uid'] . '
 						</span>
@@ -738,7 +738,7 @@ class ElementInformationController
                 $infoData[] = '
 				<tr>
 					<td class="col-icon"></td>
-					<td class="col-title">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.missing_record') . ' (uid=' . (int)$row['recuid'] . ')</td>
+					<td class="col-title">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.missing_record') . ' (uid=' . (int)$row['recuid'] . ')</td>
 					<td>' . htmlspecialchars($lang->sL($GLOBALS['TCA'][$row['tablename']]['ctrl']['title']) ?: $row['tablename']) . '</td>
 					<td></td>
 					<td>' . htmlspecialchars($this->getLabelForTableColumn($row['tablename'], $row['field'])) . '</td>
@@ -798,14 +798,14 @@ class ElementInformationController
             $infoDataHeader = '
 				<tr>
 					<th class="col-icon"></th>
-					<th class="col-title">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.title') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.table') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.uid') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.field') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.flexpointer') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.softrefKey') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.sorting') . '</th>
-					<th>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.refString') . '</th>
+					<th class="col-title">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.title') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.table') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.uid') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.field') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.flexpointer') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.softrefKey') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.sorting') . '</th>
+					<th>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.refString') . '</th>
 					<th class="col-control"></th>
 				</tr>';
         }
@@ -849,7 +849,7 @@ class ElementInformationController
                 $infoData[] = '
 				<tr>
 					<td class="col-icon"></td>
-					<td class="col-title">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:show_item.php.missing_record') . ' (uid=' . (int)$row['recuid'] . ')</td>
+					<td class="col-title">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:show_item.php.missing_record') . ' (uid=' . (int)$row['recuid'] . ')</td>
 					<td>' . htmlspecialchars($lang->sL($GLOBALS['TCA'][$row['ref_table']]['ctrl']['title'])) . '</td>
 					<td></td>
 					<td>' . htmlspecialchars($this->getLabelForTableColumn($table, $row['field'])) . '</td>
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
index edcf3ac218a92035fee4e1b755f76318e25f3121..96c4394d596bb0d0bc6dfd3830c54762cf8c1521 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
@@ -83,7 +83,7 @@ class MoveElementController extends AbstractModule
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $GLOBALS['SOBE'] = $this;
         $this->init();
     }
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
index 4f7c159778fc397337178c6fe7633e6d966bb694..57028ba9eb76b615231b593d15e2ad4f36bbc6f0 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
@@ -145,7 +145,7 @@ class NewContentElementController extends AbstractModule
     public function init()
     {
         $lang = $this->getLanguageService();
-        $lang->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $lang->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $LOCAL_LANG_orig = $GLOBALS['LOCAL_LANG'];
         $lang->includeLLFile('EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf');
         ArrayUtility::mergeRecursiveWithOverrule($LOCAL_LANG_orig, $GLOBALS['LOCAL_LANG']);
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index bfa35c1001a3c55a7236fafb0f0a20f8586fe247..9d76a684b265520b0d6b637dbc28b2bcf9cf392f 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -411,7 +411,7 @@ class EditDocumentController extends AbstractModule
     {
         parent::__construct();
         $GLOBALS['SOBE'] = $this;
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_alt_doc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf');
     }
 
     /**
@@ -734,7 +734,7 @@ class EditDocumentController extends AbstractModule
         // Create an instance of the document template object
         $this->doc = $GLOBALS['TBE_TEMPLATE'];
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_alt_doc.xlf');
+        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf');
         // override the default jumpToUrl
         $this->moduleTemplate->addJavaScriptCode(
             'jumpToUrl',
@@ -756,7 +756,7 @@ class EditDocumentController extends AbstractModule
             // called here. This block of code is intended to be removed at a later point again.
             $lang = $this->getLanguageService();
             $coreLabels = [
-                'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:csh_tooltip_loading')
+                'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:csh_tooltip_loading')
             ];
             $generatedLabels = [];
             $generatedLabels['core'] = $coreLabels;
@@ -1180,7 +1180,7 @@ class EditDocumentController extends AbstractModule
                                     // Create message from exception.
                                     $message = $e->getMessage() . ' ' . $e->getCode();
                                 }
-                                $editForm .= htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.noEditPermission'))
+                                $editForm .= htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noEditPermission'))
                                     . '<br /><br />' . htmlspecialchars($message) . '<br /><br />';
                             }
                         } // End of for each uid
@@ -1206,7 +1206,7 @@ class EditDocumentController extends AbstractModule
             $saveSplitButton = $buttonBar->makeSplitButton();
             // SAVE button:
             $saveButton = $buttonBar->makeInputButton()
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
                 ->setName('_savedok')
                 ->setValue('1')
                 ->setForm('EditDocumentController')
@@ -1234,7 +1234,7 @@ class EditDocumentController extends AbstractModule
                     || isset($pagesTSconfig['TCEMAIN.']['preview.'][$this->firstEl['table'] . '.']['previewPageId'])
                 ) {
                     $saveAndOpenButton = $buttonBar->makeInputButton()
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDocShow'))
                         ->setName('_savedokview')
                         ->setValue('1')
                         ->setForm('EditDocumentController')
@@ -1253,7 +1253,7 @@ class EditDocumentController extends AbstractModule
                     ->setClasses('t3js-editform-submitButton')
                     ->setValue('1')
                     ->setForm('EditDocumentController')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveNewDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveNewDoc'))
                     ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                         'actions-document-save-new',
                         Icon::SIZE_SMALL
@@ -1266,7 +1266,7 @@ class EditDocumentController extends AbstractModule
                 ->setClasses('t3js-editform-submitButton')
                 ->setValue('1')
                 ->setForm('EditDocumentController')
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                     'actions-document-save-close',
                     Icon::SIZE_SMALL
@@ -1278,7 +1278,7 @@ class EditDocumentController extends AbstractModule
                     ->setName('_translation_savedok')
                     ->setValue('1')
                     ->setForm('EditDocumentController')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.translationSaveDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.translationSaveDoc'))
                     ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                         'actions-document-save-cleartranslationcache',
                         Icon::SIZE_SMALL
@@ -1288,7 +1288,7 @@ class EditDocumentController extends AbstractModule
                     ->setName('_translation_savedokclear')
                     ->setValue('1')
                     ->setForm('EditDocumentController')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.translationSaveDocClear'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.translationSaveDocClear'))
                     ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                         'actions-document-save-cleartranslationcache',
                         Icon::SIZE_SMALL
@@ -1301,7 +1301,7 @@ class EditDocumentController extends AbstractModule
         $closeButton = $buttonBar->makeLinkButton()
             ->setHref('#')
             ->setClasses('t3js-editform-close')
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                 'actions-document-close',
                 Icon::SIZE_SMALL
@@ -1387,7 +1387,7 @@ class EditDocumentController extends AbstractModule
                                 $lang->getLL('undoLastChange'),
                                 BackendUtility::calcAge(
                                     ($GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp']),
-                                    $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                                    $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                                 )
                             )
                         )
@@ -1510,7 +1510,7 @@ class EditDocumentController extends AbstractModule
             $openInNewWindowButton = $this->moduleTemplate->getDocHeaderComponent()->getButtonBar()
                 ->makeLinkButton()
                 ->setHref('#')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.openInNewWindow'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.openInNewWindow'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-window-open', Icon::SIZE_SMALL))
                 ->setOnClick($aOnClick);
             $this->moduleTemplate->getDocHeaderComponent()->getButtonBar()->addButton(
@@ -1614,11 +1614,11 @@ class EditDocumentController extends AbstractModule
                     $languageMenu = $this->moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
                     $languageMenu->setIdentifier('_langSelector');
                     $languageMenu->setLabel(htmlspecialchars($this->getLanguageService()->sL(
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.language'
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language'
                     )));
                     foreach ($langRows as $lang) {
                         if ($this->getBackendUser()->checkLanguageAccess($lang['uid'])) {
-                            $newTranslation = isset($rowsByLang[$lang['uid']]) ? '' : ' [' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.new')) . ']';
+                            $newTranslation = isset($rowsByLang[$lang['uid']]) ? '' : ' [' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.new')) . ']';
                             // Create url for creating a localized record
                             $addOption = true;
                             if ($newTranslation) {
@@ -1729,8 +1729,8 @@ class EditDocumentController extends AbstractModule
                 'pid' => 0,
                 'hidden' => 0,
                 'title' => $modSharedTSconfig['properties']['defaultLanguageLabel'] !== ''
-                        ? $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')'
-                        : $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage'),
+                        ? $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')'
+                        : $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage'),
                 'flag' => $modSharedTSconfig['properties']['defaultLanguageFlag']
             ]
         ];
diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
index 05de874ed63de7372d1e05d82067a303358e98d7..e29de318aaaddb1d95f35565cdc4e3dda4d9b44b 100644
--- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
@@ -107,8 +107,8 @@ class CreateFolderController extends AbstractModule
         }
         // Cleaning and checking target directory
         if (!$this->folderObject) {
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError');
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir');
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:paramError');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:targetNoDir');
             throw new \RuntimeException($title . ': ' . $message, 1294586845);
         }
         if ($this->folderObject->getStorage()->getUid() === 0) {
@@ -128,12 +128,12 @@ class CreateFolderController extends AbstractModule
             'var path = "' . $this->target . '";
             var confirmTitle = '
             . GeneralUtility::quoteJSvalue(
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:pleaseConfirm')
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:pleaseConfirm')
             )
             . ';
             var confirmText = '
             . GeneralUtility::quoteJSvalue(
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:mess.redraw')
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.redraw')
             )
             . ';
             function reload(a) {
@@ -167,7 +167,7 @@ class CreateFolderController extends AbstractModule
     public function main()
     {
         $lang = $this->getLanguageService();
-        $pageContent = '<h1>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.pagetitle') . '</h1>';
+        $pageContent = '<h1>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.pagetitle') . '</h1>';
 
         if ($this->folderObject->checkActionPermission('add')) {
             $code = '<form role="form" action="' . htmlspecialchars(BackendUtility::getModuleUrl('tce_file')) . '" method="post" name="editform">';
@@ -177,7 +177,7 @@ class CreateFolderController extends AbstractModule
 				<div class="form-group">
 					<div class="form-section">
 						<div class="form-group">
-							<label for="number-of-new-folders">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.number_of_folders') . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '
+							<label for="number-of-new-folders">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.number_of_folders') . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '
 							<div class="form-control-wrap">
 								<div class="input-group">
 									<select class="form-control form-control-adapt" name="number" id="number-of-new-folders" onchange="reload(this.options[this.selectedIndex].value);">';
@@ -196,7 +196,7 @@ class CreateFolderController extends AbstractModule
                 $code .= '
 					<div class="form-section">
 						<div class="form-group">
-							<label for="folder_new_' . $a . '">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfolder') . ' ' . ($a + 1) . ':</label>
+							<label for="folder_new_' . $a . '">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.label_newfolder') . ' ' . ($a + 1) . ':</label>
 							<div class="form-control-wrap">
 								<input type="text" class="form-control" id="folder_new_' . $a . '" name="file[newfolder][' . $a . '][data]" onchange="changed=true;" />
 								<input type="hidden" name="file[newfolder][' . $a . '][target]" value="' . htmlspecialchars($this->target) . '" />
@@ -207,13 +207,13 @@ class CreateFolderController extends AbstractModule
             // Making submit button for folder creation:
             $code .= '
 				</div><div class="form-group">
-					<input class="btn btn-default" type="submit" value="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.submit')) . '" />
+					<input class="btn btn-default" type="submit" value="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.submit')) . '" />
 					<input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
 				</div>
 				';
 
             // Switching form tags:
-            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfolders')) . '</h3>';
+            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.newfolders')) . '</h3>';
             $pageContent .= '<div>' . $code . '</form></div>';
         }
 
@@ -232,14 +232,14 @@ class CreateFolderController extends AbstractModule
 				<div class="form-group">
 					<div class="form-section">
 						<div class="form-group">
-							<label for="newMedia">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.label')) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newMedia') . '
+							<label for="newMedia">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.label')) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newMedia') . '
 							<div class="form-control-wrap">
 								<input class="form-control" type="text" id="newMedia" name="file[newMedia][0][url]"
-									placeholder="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.placeholder')) . '" />
+									placeholder="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.placeholder')) . '" />
 								<input type="hidden" name="file[newMedia][0][target]" value="' . htmlspecialchars($this->target) . '" />
 							</div>
 							<div class="help-block">
-								' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.allowedProviders')) . '<br>
+								' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.allowedProviders')) . '<br>
 								' . implode(' ', $fileExtList) . '
 							</div>
 						</div>
@@ -249,11 +249,11 @@ class CreateFolderController extends AbstractModule
             // Submit button for creation of a new media:
             $code .= '
 				<div class="form-group">
-					<input class="btn btn-default" type="submit" value="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.submit')) . '" />
+					<input class="btn btn-default" type="submit" value="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.submit')) . '" />
 					<input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
 				</div>
 				';
-            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media')) . '</h3>';
+            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media')) . '</h3>';
             $pageContent .= '<div>' . $code . '</div>';
             $pageContent .= '</form>';
 
@@ -271,13 +271,13 @@ class CreateFolderController extends AbstractModule
 				<div class="form-group">
 					<div class="form-section">
 						<div class="form-group">
-							<label for="newfile">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfile')) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '
+							<label for="newfile">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.label_newfile')) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '
 							<div class="form-control-wrap">
 								<input class="form-control" type="text" id="newfile" name="file[newfile][0][data]" onchange="changed=true;" />
 								<input type="hidden" name="file[newfile][0][target]" value="' . htmlspecialchars($this->target) . '" />
 							</div>
 							<div class="help-block">
-								' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.allowedFileExtensions')) . '<br>
+								' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.allowedFileExtensions')) . '<br>
 								' . implode(' ', $fileExtList) . '
 							</div>
 						</div>
@@ -287,11 +287,11 @@ class CreateFolderController extends AbstractModule
             // Submit button for "creation of a new file":
             $code .= '
 				<div class="form-group">
-					<button class="btn btn-default" name="edit" type="submit" value="1">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile_submit')) . '</button>
+					<button class="btn btn-default" name="edit" type="submit" value="1">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.newfile_submit')) . '</button>
 					<input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
 				</div>
 			';
-            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile')) . '</h3>';
+            $pageContent .= '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_newfolder.php.newfile')) . '</h3>';
             $pageContent .= '<div>' . $code . '</div>';
             $pageContent .= '</form>';
         }
@@ -301,7 +301,7 @@ class CreateFolderController extends AbstractModule
         if ($this->returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
                ->setHref($this->returnUrl)
-               ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+               ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton);
         }
diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index 7f854e3e277b8e4f881dda41ce29d64d10020200..d6cf9e25a0a9080878dc9a8aaf6982eabd3348b3 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -107,8 +107,8 @@ class EditFileController extends AbstractModule
         }
         // Cleaning and checking target directory
         if (!$this->fileObject) {
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError');
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir');
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:paramError');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:targetNoDir');
             throw new \RuntimeException($title . ': ' . $message, 1294586841);
         }
         if ($this->fileObject->getStorage()->getUid() === 0) {
@@ -248,7 +248,7 @@ class EditFileController extends AbstractModule
             ->setName('_save')
             ->setValue('1')
             ->setOnClick('document.editform.submit();')
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.submit'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.submit'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL));
 
         // Save and Close button
@@ -260,7 +260,7 @@ class EditFileController extends AbstractModule
                 . GeneralUtility::quoteJSvalue($this->returnUrl)
                 . '; document.editform.submit();'
             )
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.saveAndClose'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.saveAndClose'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                 'actions-document-save-close',
                 Icon::SIZE_SMALL
@@ -275,7 +275,7 @@ class EditFileController extends AbstractModule
         $closeButton = $buttonBar->makeLinkButton()
             ->setHref('#')
             ->setOnClick('backToList(); return false;')
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.cancel'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.cancel'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL));
         $buttonBar->addButton($closeButton, ButtonBar::BUTTON_POSITION_LEFT, 10);
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index 0d4483340e00205e9c1282100d2b1148fc83a8be..e257284bb204c52b2965f32170bbe0b0fdcf80c0 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -70,7 +70,7 @@ class FileUploadController extends AbstractModule
     {
         parent::__construct();
         $GLOBALS['SOBE'] = $this;
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $this->init();
     }
 
@@ -103,8 +103,8 @@ class FileUploadController extends AbstractModule
 
         // Cleaning and checking target directory
         if (!$this->folderObject) {
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError');
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir');
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:paramError');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:targetNoDir');
             throw new \RuntimeException($title . ': ' . $message, 1294586843);
         }
 
@@ -128,13 +128,13 @@ class FileUploadController extends AbstractModule
         $lang = $this->getLanguageService();
 
         // set page title
-        $this->moduleTemplate->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle'));
+        $this->moduleTemplate->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.pagetitle'));
 
         $pageContent = '<form action="'
             . htmlspecialchars(BackendUtility::getModuleUrl('tce_file'))
             . '" method="post" id="FileUploadController" name="editform" enctype="multipart/form-data">';
         // Make page header:
-        $pageContent .= '<h1>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle') . '</h1>';
+        $pageContent .= '<h1>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.pagetitle') . '</h1>';
         $pageContent .= $this->renderUploadForm();
 
         // Header Buttons
@@ -150,7 +150,7 @@ class FileUploadController extends AbstractModule
         if ($this->returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
                 ->setHref($this->returnUrl)
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton);
         }
@@ -192,7 +192,7 @@ class FileUploadController extends AbstractModule
         $content .= '
 			<div id="c-submit">
 				<input type="hidden" name="redirect" value="' . $this->returnUrl . '" /><br />
-				<input class="btn btn-default" type="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.submit')) . '" />
+				<input class="btn btn-default" type="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')) . '" />
 			</div>
 		';
         return $content;
diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
index 105fa3f44effcc342e40a57d7a33729eb3cbdf35..ead4607dbbbd732a93b67612f43dc9dfe4676ee9 100644
--- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
@@ -89,8 +89,8 @@ class RenameFileController extends AbstractModule
             $this->fileOrFolderObject = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->retrieveFileOrFolderObject($this->target);
         }
         if (!$this->fileOrFolderObject) {
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError');
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir');
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:paramError');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:targetNoDir');
             throw new \RuntimeException($title . ': ' . $message, 1294586844);
         }
         if ($this->fileOrFolderObject->getStorage()->getUid() === 0) {
@@ -158,7 +158,7 @@ class RenameFileController extends AbstractModule
         if ($this->returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
                 ->setHref($this->returnUrl)
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton);
         }
diff --git a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
index a749f2e8188bf21fcff5d537cd90e0429af2bb5b..76dcefb32e16f9e1acaa6a2d6e69acbd5a71f5a4 100644
--- a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
@@ -104,8 +104,8 @@ class ReplaceFileController extends AbstractModule
                 ->retrieveFileOrFolderObject('file:' . $this->uid);
         }
         if (!$this->fileOrFolderObject) {
-            $title = $lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError');
-            $message = $lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir');
+            $title = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:paramError');
+            $message = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:targetNoDir');
             throw new \RuntimeException($title . ': ' . $message, 1436895930);
         }
         if ($this->fileOrFolderObject->getStorage()->getUid() === 0) {
@@ -158,16 +158,16 @@ class ReplaceFileController extends AbstractModule
         $code .= '
 			<div class="form-group">
 				<input type="checkbox" value="1" id="keepFilename" name="file[replace][1][keepFilename]"> <label for="keepFilename">'
-            . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_replace.php.keepfiletitle')
+            . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_replace.php.keepfiletitle')
             . '</label>
 			</div>
 
 			<div class="form-group">
-				<label for="file_replace">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_replace.php.selectfile') . '</label>
+				<label for="file_replace">' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_replace.php.selectfile') . '</label>
 				<div class="input-group col-xs-6">
 					<input type="text" name="fakefile" id="fakefile" class="form-control input-xlarge" readonly>
 					<a class="input-group-addon btn btn-primary" onclick="TYPO3.jQuery(\'#file_replace\').click();">'
-            . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_replace.php.browse')
+            . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_replace.php.browse')
             . '</a>
 				</div>
 				<input class="form-control" type="file" id="file_replace" name="replace_1" style="visibility: hidden;" />
@@ -187,9 +187,9 @@ class ReplaceFileController extends AbstractModule
         $code .= '
 				<div class="form-group">
 					<input class="btn btn-primary" type="submit" value="'
-            . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_replace.php.submit')) . '" />
+            . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_replace.php.submit')) . '" />
 					<input class="btn btn-danger" type="submit" value="'
-            . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.cancel'))
+            . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.cancel'))
             . '" onclick="backToList(); return false;" />
 					<input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
 				</div>
@@ -207,12 +207,12 @@ class ReplaceFileController extends AbstractModule
         if ($this->returnUrl) {
             $returnButton = $buttonBar->makeLinkButton()
                 ->setHref($this->returnUrl)
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($returnButton);
         }
 
-        $this->content .= '<h1>' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_replace.php.pagetitle') . '</h1>';
+        $this->content .= '<h1>' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_replace.php.pagetitle') . '</h1>';
         // Add the HTML as a section:
         $this->content .= '<div>' . $code . '</div>';
 
diff --git a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
index 2cedcb4a40a90dfc1fd177577e3742fea35d0b3f..2e8c852d5cf4c444939ffed88a55f9bcebf0cbf0 100644
--- a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
+++ b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
@@ -216,7 +216,7 @@ class FileSystemNavigationFrameController
         // Refresh
         $refreshButton = $buttonBar->makeLinkButton()
             ->setHref(GeneralUtility::getIndpEnv('REQUEST_URI'))
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload'))
+            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.reload'))
             ->setIcon($iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL));
         $buttonBar->addButton($refreshButton, ButtonBar::BUTTON_POSITION_RIGHT);
 
diff --git a/typo3/sysext/backend/Classes/Controller/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php
index e076bea5a3a29806b76eff8bda5f92b5716f30b2..234ba47c9b06c761c127d3dcc74d69302b93f33e 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginController.php
@@ -113,7 +113,7 @@ class LoginController
             GeneralUtility::makeInstance(PageRenderer::class)->setLanguage($preferredBrowserLanguage);
         }
 
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_login.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_login.xlf');
 
         // Setting the redirect URL to "index.php?M=main" if no alternative input is given
         $this->redirectToURL = $this->redirectUrl ?: BackendUtility::getModuleUrl('main');
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index a93a46cf467f4ecb840674d5c534d9ea77904f8b..b5c54903a87ec4302b95f4fee8c34e78e1ea062b 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -153,7 +153,7 @@ class NewRecordController extends AbstractModule
     {
         parent::__construct();
         $GLOBALS['SOBE'] = $this;
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
         $this->init();
     }
 
@@ -189,7 +189,7 @@ class NewRecordController extends AbstractModule
         // Creating content
         $this->content = '';
         $this->content .= '<h1>'
-            . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:db_new.php.pagetitle')
+            . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:db_new.php.pagetitle')
             . '</h1>';
         // Id a positive id is supplied, ask for the page record with permission information contained:
         if ($this->id > 0) {
@@ -340,7 +340,7 @@ class NewRecordController extends AbstractModule
         if ($this->returnUrl) {
             $returnButton = $buttonBar->makeLinkButton()
                 ->setHref($this->returnUrl)
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($returnButton, ButtonBar::BUTTON_POSITION_LEFT, 10);
         }
@@ -370,7 +370,7 @@ class NewRecordController extends AbstractModule
                         '',
                         BackendUtility::BEgetRootLine($this->pageinfo['uid'])
                     ))
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                     ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                         'actions-document-view',
                         Icon::SIZE_SMALL
@@ -464,11 +464,11 @@ class NewRecordController extends AbstractModule
         $newPageLinks = [];
         if ($displayNewPagesIntoLink && $this->isTableAllowedForThisPage($this->pageinfo, 'pages') && $this->getBackendUserAuthentication()->check('tables_modify', 'pages') && $this->getBackendUserAuthentication()->workspaceCreateNewRecord(($this->pageinfo['_ORIG_uid'] ?: $this->id), 'pages')) {
             // Create link to new page inside:
-            $newPageLinks[] = $this->linkWrap($this->moduleTemplate->getIconFactory()->getIconForRecord($table, [], Icon::SIZE_SMALL)->render() . htmlspecialchars($lang->sL($v['ctrl']['title'])) . ' (' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:db_new.php.inside')) . ')', $table, $this->id);
+            $newPageLinks[] = $this->linkWrap($this->moduleTemplate->getIconFactory()->getIconForRecord($table, [], Icon::SIZE_SMALL)->render() . htmlspecialchars($lang->sL($v['ctrl']['title'])) . ' (' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:db_new.php.inside')) . ')', $table, $this->id);
         }
         // New pages AFTER this pages
         if ($displayNewPagesAfterLink && $this->isTableAllowedForThisPage($this->pidInfo, 'pages') && $this->getBackendUserAuthentication()->check('tables_modify', 'pages') && $this->getBackendUserAuthentication()->workspaceCreateNewRecord($this->pidInfo['uid'], 'pages')) {
-            $newPageLinks[] = $this->linkWrap($pageIcon . htmlspecialchars($lang->sL($v['ctrl']['title'])) . ' (' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:db_new.php.after')) . ')', 'pages', -$this->id);
+            $newPageLinks[] = $this->linkWrap($pageIcon . htmlspecialchars($lang->sL($v['ctrl']['title'])) . ' (' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:db_new.php.after')) . ')', 'pages', -$this->id);
         }
         // New pages at selection position
         if ($this->newPagesSelectPosition && $this->showNewRecLink('pages')) {
diff --git a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
index 3f9513ed6d51cb22282dd95e709165f09c418d40..2e2601d955c8292fc40ea69ec119a28eeb00177f 100644
--- a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
+++ b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
@@ -48,7 +48,7 @@ class OnlineMediaController
             if ($file !== null) {
                 $data['file'] = $file->getUid();
             } else {
-                $data['error'] = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:online_media.error.invalid_url');
+                $data['error'] = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.error.invalid_url');
             }
             $response->getBody()->write(json_encode($data));
         }
@@ -78,15 +78,15 @@ class OnlineMediaController
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
                         $file->getName(),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.added'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.added'),
                         FlashMessage::OK,
                         true
                     );
                 } else {
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:online_media.error.invalid_url'),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:online_media.error.new_media.failed'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.error.invalid_url'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.error.new_media.failed'),
                         FlashMessage::ERROR,
                         true
                     );
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 8d962aea165d28bd34f7855c9b1443a813e0375c..4ae317784020fddcc1d0c405142b79990886c7d0 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -1097,7 +1097,7 @@ class PageLayoutController
         $dbList->setLMargin = 0;
         $dbList->doEdit = $this->EDIT_CONTENT;
         $dbList->ext_CALC_PERMS = $this->CALC_PERMS;
-        $dbList->agePrefixes = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears');
+        $dbList->agePrefixes = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears');
         $dbList->id = $this->id;
         $dbList->nextThree = MathUtility::forceIntegerInRange($this->modTSconfig['properties']['editFieldsAtATime'], 0, 10);
         $dbList->option_newWizard = $this->modTSconfig['properties']['disableNewContentElementWizard'] ? 0 : 1;
@@ -1205,7 +1205,7 @@ class PageLayoutController
             $this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/ToggleSearchToolbox');
             $toggleSearchFormButton = $this->buttonBar->makeLinkButton()
                 ->setClasses('t3js-toggle-search-toolbox')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.searchIcon'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.searchIcon'))
                 ->setIcon($this->iconFactory->getIcon('actions-search', Icon::SIZE_SMALL))
                 ->setHref('#');
             $this->buttonBar->addButton($toggleSearchFormButton, ButtonBar::BUTTON_POSITION_LEFT, 4);
@@ -1258,7 +1258,7 @@ class PageLayoutController
         if (!VersionState::cast($this->pageinfo['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) {
             $viewButton = $this->buttonBar->makeLinkButton()
                 ->setOnClick(BackendUtility::viewOnClick($this->pageinfo['uid'], '', BackendUtility::BEgetRootLine($this->pageinfo['uid'])))
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                 ->setIcon($this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL))
                 ->setHref('#');
 
@@ -1284,7 +1284,7 @@ class PageLayoutController
         if (!$this->modTSconfig['properties']['disableAdvanced']) {
             $clearCacheButton = $this->buttonBar->makeLinkButton()
                 ->setHref(BackendUtility::getModuleUrl($this->moduleName, ['id' => $this->pageinfo['uid'], 'clear_cache' => '1']))
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.clear_cache'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clear_cache'))
                 ->setIcon($this->iconFactory->getIcon('actions-system-cache-clear', Icon::SIZE_SMALL));
             $this->buttonBar->addButton($clearCacheButton, ButtonBar::BUTTON_POSITION_RIGHT, 1);
         }
@@ -1373,7 +1373,7 @@ class PageLayoutController
                 $closeButton = $this->buttonBar->makeLinkButton()
                     ->setHref('#')
                     ->setOnClick('jumpToUrl(' . GeneralUtility::quoteJSvalue($this->closeUrl) . '); return false;')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL));
                 $this->buttonBar->addButton($closeButton, ButtonBar::BUTTON_POSITION_LEFT, 0);
 
@@ -1383,7 +1383,7 @@ class PageLayoutController
                     ->setName('_savedok')
                     ->setValue('1')
                     ->setForm('PageLayoutController')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-save', Icon::SIZE_SMALL));
                 $saveButtonDropdown->addItem($saveButton);
                 $saveAndCloseButton = $this->buttonBar->makeInputButton()
@@ -1391,7 +1391,7 @@ class PageLayoutController
                     ->setValue('1')
                     ->setForm('PageLayoutController')
                     ->setOnClick('document.editform.redirect.value=\'' . $this->closeUrl . '\';')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL));
                 $saveButtonDropdown->addItem($saveAndCloseButton);
                 $saveAndShowPageButton = $this->buttonBar->makeInputButton()
@@ -1399,7 +1399,7 @@ class PageLayoutController
                     ->setValue('1')
                     ->setForm('PageLayoutController')
                     ->setOnClick('document.editform.redirect.value+=\'&popView=1\';')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDocShow'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-save-view', Icon::SIZE_SMALL));
                 $saveButtonDropdown->addItem($saveAndShowPageButton);
                 $this->buttonBar->addButton($saveButtonDropdown, ButtonBar::BUTTON_POSITION_LEFT, 1);
@@ -1434,7 +1434,7 @@ class PageLayoutController
                                     ]
                                 )
                             ) . '; return false;')
-                        ->setTitle(sprintf($lang->getLL('undoLastChange'), BackendUtility::calcAge($GLOBALS['EXEC_TIME'] - $this->undoButtonR['tstamp'], $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears'))))
+                        ->setTitle(sprintf($lang->getLL('undoLastChange'), BackendUtility::calcAge($GLOBALS['EXEC_TIME'] - $this->undoButtonR['tstamp'], $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears'))))
                         ->setIcon($this->iconFactory->getIcon('actions-edit-undo', Icon::SIZE_SMALL));
                     $this->buttonBar->addButton($undoButton, ButtonBar::BUTTON_POSITION_LEFT, 5);
                     $historyButton = $this->buttonBar->makeLinkButton()
@@ -1726,7 +1726,7 @@ class PageLayoutController
                 $inValue = 'tt_content:' . $cRow['uid'];
                 $isSelected += (int)$edit_record == $inValue;
                 $menuItem = $quickEditMenu->makeMenuItem()
-                    ->setTitle(GeneralUtility::fixed_lgd_cs(($cRow['header'] ? $cRow['header'] : '[' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title') . '] ' . strip_tags($cRow['bodytext'])), $beUser->uc['titleLen']))
+                    ->setTitle(GeneralUtility::fixed_lgd_cs(($cRow['header'] ? $cRow['header'] : '[' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title') . '] ' . strip_tags($cRow['bodytext'])), $beUser->uc['titleLen']))
                     ->setHref(BackendUtility::getModuleUrl($this->moduleName) . '&id=' . $this->id . '&edit_record=' . $inValue . $retUrlStr)
                     ->setActive($edit_record == $inValue);
                 $quickEditMenu->addMenuItem($menuItem);
@@ -1771,7 +1771,7 @@ class PageLayoutController
             $lang = $this->getLanguageService();
             $languageMenu = $this->moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
             $languageMenu->setIdentifier('languageMenu');
-            $languageMenu->setLabel(htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_general.xlf:LGL.language')));
+            $languageMenu->setLabel(htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language')));
             foreach ($this->MOD_MENU['language'] as $key => $language) {
                 $menuItem = $languageMenu
                     ->makeMenuItem()
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
index 7eb4ece1838e0797441937a7d63df1b6ddcd2c1f..514ccb5894641330ea0c68953248d0dde7cca18b 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
@@ -87,7 +87,7 @@ class AddController extends AbstractWizardController
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index ec08e4f50408540ab631946ae89b8deb1bda1550..9152d2edd53522ae1373353dc43bd6581e9f9635 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -123,7 +123,7 @@ class ColorpickerController extends AbstractWizardController
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
index 0eae369553cf44cf756ec5ccdb46fd76f2993fb0..423e65e21f8366d41de9257377b58a2e69836025 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
@@ -54,7 +54,7 @@ class EditController extends AbstractWizardController
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
index 0cfb15d434592d2e006fe6d5a2f8602620046489..a9e7e2064fd4ee61ca208ccc087d68c7c6af5d47 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
@@ -57,7 +57,7 @@ class ListController extends AbstractWizardController
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
         $this->P = GeneralUtility::_GP('P');
         $this->table = GeneralUtility::_GP('table');
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
index b02e3e2bef2c9698f283321d3fcc810772e5729c..dc8c5b592985d0d23e376cb89d4fbab856da671a 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
@@ -75,7 +75,7 @@ class RteController extends AbstractWizardController
     {
         parent::__construct();
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
@@ -273,7 +273,7 @@ class RteController extends AbstractWizardController
             // Close
             $closeButton = $buttonBar->makeLinkButton()
                 ->setHref($closeUrl)
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL));
             $buttonBar->addButton($closeButton, ButtonBar::BUTTON_POSITION_LEFT, 10);
 
@@ -283,7 +283,7 @@ class RteController extends AbstractWizardController
                 ->setValue('1')
                 ->setForm('RteController')
                 ->setOnClick('TBE_EDITOR.checkAndDoSubmit(1); return false;')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL));
             // Save & View
             $saveAndViewButton = $buttonBar->makeInputButton()
@@ -292,7 +292,7 @@ class RteController extends AbstractWizardController
                 ->setForm('RteController')
                 ->setOnClick('document.editform.redirect.value+= ' . GeneralUtility::quoteJSvalue('&popView=1') . '; '
                     . ' TBE_EDITOR.checkAndDoSubmit(1); return false;')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDocShow'))
                 ->setIcon(
                     $this->moduleTemplate->getIconFactory()->getIcon('actions-document-save-view', Icon::SIZE_SMALL)
                 );
@@ -304,7 +304,7 @@ class RteController extends AbstractWizardController
                 ->setForm('RteController')
                 ->setOnClick('document.editform.redirect.value=' . GeneralUtility::quoteJSvalue($closeUrl)
                     . '; TBE_EDITOR.checkAndDoSubmit(1); return false;')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                     'actions-document-save-close',
                     Icon::SIZE_SMALL
@@ -332,14 +332,14 @@ class RteController extends AbstractWizardController
                     ) . '; return false;';
 
                 $undoText = $this->getLanguageService()->sL(
-                    'LLL:EXT:lang/locallang_wizards.xlf:rte_undoLastChange'
+                    'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:rte_undoLastChange'
                 );
                 $lastChangeLabel = sprintf(
                     $undoText,
                     BackendUtility::calcAge(
                         ($GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp']),
                         $this->getLanguageService()->sL(
-                            'LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears'
+                            'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears'
                         )
                     )
                 );
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
index 86d309226e70f709e853437d899f78ca063b49b5..a096fc1a5fe0ef2e9fb7f4b738d963ad3d15cc7c 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
@@ -109,7 +109,7 @@ class TableController extends AbstractWizardController
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
@@ -187,7 +187,7 @@ class TableController extends AbstractWizardController
             // Close
             $closeButton = $buttonBar->makeLinkButton()
                 ->setHref($this->P['returnUrl'])
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL));
             $buttonBar->addButton($closeButton);
             // Save
@@ -196,13 +196,13 @@ class TableController extends AbstractWizardController
                 ->setValue('1')
                 ->setForm('TableController')
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'));
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'));
             // Save & Close
             $saveAndCloseButton = $buttonBar->makeInputButton()
                 ->setName('_saveandclosedok')
                 ->setValue('1')
                 ->setForm('TableController')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                     'actions-document-save-close',
                     Icon::SIZE_SMALL
diff --git a/typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php b/typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php
index c1fac7cf5fe62ad4836a86281d5834df12c8af82..e8a1d77fac427e4c9bd441313f86ed5d4b5c7961 100644
--- a/typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php
@@ -68,8 +68,8 @@ class FlexFormContainerContainer extends AbstractContainer
         $moveAndDeleteContent = [];
         $userHasAccessToDefaultLanguage = $this->getBackendUserAuthentication()->checkLanguageAccess(0);
         if ($userHasAccessToDefaultLanguage) {
-            $moveAndDeleteContent[] = '<span class="btn btn-default t3js-sortable-handle"><span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:sortable.dragmove')) . '">' . $iconFactory->getIcon('actions-move-move', Icon::SIZE_SMALL)->render() . '</span></span>';
-            $moveAndDeleteContent[] = '<span class="btn btn-default t3js-delete"><span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:delete')) . '">' . $iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</span></span>';
+            $moveAndDeleteContent[] = '<span class="btn btn-default t3js-sortable-handle"><span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:sortable.dragmove')) . '">' . $iconFactory->getIcon('actions-move-move', Icon::SIZE_SMALL)->render() . '</span></span>';
+            $moveAndDeleteContent[] = '<span class="btn btn-default t3js-delete"><span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:delete')) . '">' . $iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</span></span>';
         }
 
         $options = $this->data;
diff --git a/typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php b/typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php
index 34c1d3280efa7c499278b0953028f3b763458e70..02d6eff7dbf96d5aaf4a968cc9f46b09689f8112 100644
--- a/typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php
@@ -166,7 +166,7 @@ class FlexFormSectionContainer extends AbstractContainer
         }
 
         // Wrap child stuff
-        $toggleAll = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.toggleall'));
+        $toggleAll = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.toggleall'));
         $html = [];
         $html[] = '<div class="panel panel-tab">';
         $html[] =     '<div class="panel-body">';
diff --git a/typo3/sysext/backend/Classes/Form/Container/FullRecordContainer.php b/typo3/sysext/backend/Classes/Form/Container/FullRecordContainer.php
index 413c1265d90cea1a887710ab912b1abd0526ef57..6dadb47e614ed56a603d623d48ca1f8eb11eae75 100644
--- a/typo3/sysext/backend/Classes/Form/Container/FullRecordContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/FullRecordContainer.php
@@ -51,12 +51,12 @@ class FullRecordContainer extends AbstractContainer
         // Streamline the fields array
         // First, make sure there is always a --div-- definition for the first element
         if (substr($fieldsArray[0], 0, 7) !== '--div--') {
-            array_unshift($fieldsArray, '--div--;LLL:EXT:lang/locallang_core.xlf:labels.generalTab');
+            array_unshift($fieldsArray, '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.generalTab');
         }
         // If first tab has no label definition, add "general" label
         $firstTabHasLabel = count(GeneralUtility::trimExplode(';',  $fieldsArray[0])) > 1;
         if (!$firstTabHasLabel) {
-            $fieldsArray[0] = '--div--;LLL:EXT:lang/locallang_core.xlf:labels.generalTab';
+            $fieldsArray[0] = '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.generalTab';
         }
         // If there are at least two --div-- definitions, inner container will be a TabContainer, else a NoTabContainer
         $tabCount = 0;
diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
index c57b985b2a1f9b9e17a8a597b801eb249974b4f8..b909a23adae60d52686be8c80b6c42ab8784055c 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
@@ -351,7 +351,7 @@ class InlineControlContainer extends AbstractContainer
         $attributes = [];
         switch ($type) {
             case 'newRecord':
-                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.createnew'));
+                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.createnew'));
                 $icon = 'actions-document-new';
                 $className = 'typo3-newRecordLink';
                 $attributes['class'] = 'btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'];
@@ -361,7 +361,7 @@ class InlineControlContainer extends AbstractContainer
                 }
                 if (!empty($conf['appearance']['newRecordLinkAddTitle'])) {
                     $title = htmlspecialchars(sprintf(
-                        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.createnew.link'),
+                        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.createnew.link'),
                         $languageService->sL($GLOBALS['TCA'][$conf['foreign_table']]['ctrl']['title'])
                     ));
                 } elseif (isset($conf['appearance']['newRecordLinkTitle']) && $conf['appearance']['newRecordLinkTitle'] !== '') {
@@ -369,14 +369,14 @@ class InlineControlContainer extends AbstractContainer
                 }
                 break;
             case 'localize':
-                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:localizeAllRecords'));
+                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:localizeAllRecords'));
                 $icon = 'actions-document-localize';
                 $className = 'typo3-localizationLink';
                 $attributes['class'] = 'btn btn-default';
                 $attributes['onclick'] = 'return inline.synchronizeLocalizeRecords(' . GeneralUtility::quoteJSvalue($objectPrefix) . ', \'localize\')';
                 break;
             case 'synchronize':
-                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:synchronizeWithOriginalLanguage'));
+                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:synchronizeWithOriginalLanguage'));
                 $icon = 'actions-document-synchronize';
                 $className = 'typo3-synchronizationLink';
                 $attributes['class'] = 'btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'];
@@ -436,7 +436,7 @@ class InlineControlContainer extends AbstractContainer
         if (!empty($inlineConfiguration['appearance']['createNewRelationLinkTitle'])) {
             $createNewRelationText = htmlspecialchars($languageService->sL($inlineConfiguration['appearance']['createNewRelationLinkTitle']));
         } else {
-            $createNewRelationText = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.createNewRelation'));
+            $createNewRelationText = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.createNewRelation'));
         }
         if (is_array($groupFieldConfiguration['appearance'])) {
             if (isset($groupFieldConfiguration['appearance']['elementBrowserType'])) {
@@ -499,7 +499,7 @@ class InlineControlContainer extends AbstractContainer
 					data-max-file-size="' . htmlspecialchars($maxFileSize) . '"
 					>';
                 $item .= $this->iconFactory->getIcon('actions-upload', Icon::SIZE_SMALL)->render() . ' ';
-                $item .= htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.select-and-submit'));
+                $item .= htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.select-and-submit'));
                 $item .= '</a>';
 
                 $this->requireJsModules[] = ['TYPO3/CMS/Backend/DragUploader' => 'function(dragUploader){dragUploader.initialize()}'];
@@ -509,9 +509,9 @@ class InlineControlContainer extends AbstractContainer
                         $buttonStyle = ' style="' . $inlineConfiguration['inline']['inlineOnlineMediaAddButtonStyle'] . '"';
                     }
                     $this->requireJsModules[] = 'TYPO3/CMS/Backend/OnlineMedia';
-                    $buttonText = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.button'));
-                    $placeholder = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.placeholder'));
-                    $buttonSubmit = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.submit'));
+                    $buttonText = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.button'));
+                    $placeholder = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.placeholder'));
+                    $buttonSubmit = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.submit'));
                     $item .= '
 						<span class="btn btn-default t3js-online-media-add-btn ' . $this->inlineData['config'][$nameObject]['md5'] . '"
 							' . $buttonStyle . '
@@ -530,7 +530,7 @@ class InlineControlContainer extends AbstractContainer
 
         $item = '<div class="form-control-wrap">' . $item . '</div>';
         $allowedList = '';
-        $allowedLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.allowedFileExtensions'));
+        $allowedLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.allowedFileExtensions'));
         foreach ($allowedArray as $allowedItem) {
             $allowedList .= '<span class="label label-success">' . strtoupper($allowedItem) . '</span> ';
         }
@@ -578,7 +578,7 @@ class InlineControlContainer extends AbstractContainer
             if (!empty($config['appearance']['createNewRelationLinkTitle'])) {
                 $createNewRelationText = htmlspecialchars($this->getLanguageService()->sL($config['appearance']['createNewRelationLinkTitle']));
             } else {
-                $createNewRelationText = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.createNewRelation'));
+                $createNewRelationText = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.createNewRelation'));
             }
             $item .= '
             <span class="input-group-btn">
diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
index bcfca7ec1cab81b4ab913997d16c6f726d676562..32a29741b2724ebee2f6dfda97c0e3dcd59978d5 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
@@ -245,7 +245,7 @@ class InlineRecordContainer extends AbstractContainer
 
         // Display Warning FlashMessage if it is not suppressed
         if (!isset($parentConfig['appearance']['suppressCombinationWarning']) || empty($parentConfig['appearance']['suppressCombinationWarning'])) {
-            $combinationWarningMessage = 'LLL:EXT:lang/locallang_core.xlf:warning.inline_use_combination';
+            $combinationWarningMessage = 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.inline_use_combination';
             if (!empty($parentConfig['appearance']['overwriteCombinationWarningMessage'])) {
                 $combinationWarningMessage = $parentConfig['appearance']['overwriteCombinationWarningMessage'];
             }
@@ -310,7 +310,7 @@ class InlineRecordContainer extends AbstractContainer
                 $recordTitle = BackendUtility::getRecordTitlePrep($recordTitle);
             }
         } else {
-            $recordTitle = '<em>[' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</em>';
+            $recordTitle = '<em>[' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</em>';
         }
 
         $altText = BackendUtility::getRecordIconAltText($rec, $foreignTable);
@@ -334,7 +334,7 @@ class InlineRecordContainer extends AbstractContainer
                 }
                 if ($fileObject && $fileObject->isMissing()) {
                     $thumbnail .= '<span class="label label-danger">'
-                        . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                        . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                         . '</span>&nbsp;' . htmlspecialchars($fileObject->getName()) . '<br />';
                 } elseif ($fileObject) {
                     $imageSetup = $inlineConfig['appearance']['headerThumbnail'];
@@ -414,7 +414,7 @@ class InlineRecordContainer extends AbstractContainer
             $hookObj->renderForeignRecordHeaderControl_preProcess($data['inlineParentUid'], $foreignTable, $rec, $inlineConfig, $data['isInlineDefaultLanguageRecordInLocalizedParentContext'], $enabledControls);
         }
         if ($data['isInlineDefaultLanguageRecordInLocalizedParentContext']) {
-            $cells['localize.isLocalizable'] = '<span title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:localize.isLocalizable')) . '">'
+            $cells['localize.isLocalizable'] = '<span title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:localize.isLocalizable')) . '">'
                 . $this->iconFactory->getIcon('actions-edit-localize-status-low', Icon::SIZE_SMALL)->render()
                 . '</span>';
         }
@@ -428,7 +428,7 @@ class InlineRecordContainer extends AbstractContainer
                 $table = $foreignTable;
             }
             $cells['info'] = '
-				<a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;')) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:showInfo')) . '">
+				<a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;')) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:showInfo')) . '">
 					' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '
 				</a>';
         }
@@ -443,7 +443,7 @@ class InlineRecordContainer extends AbstractContainer
                         $style = ' style="' . $inlineConfig['inline']['inlineNewButtonStyle'] . '"';
                     }
                     $cells['new'] = '
-						<a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record')))) . '" ' . $style . '>
+						<a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record')))) . '" ' . $style . '>
 							' . $this->iconFactory->getIcon('actions-' . ($isPagesTable ? 'page' : 'document') . '-new', Icon::SIZE_SMALL)->render() . '
 						</a>';
                 }
@@ -454,14 +454,14 @@ class InlineRecordContainer extends AbstractContainer
                 $onClick = 'return inline.changeSorting(' . GeneralUtility::quoteJSvalue($nameObjectFtId) . ', \'1\')';
                 $style = $inlineConfig['inline']['first'] == $rec['uid'] ? 'style="visibility: hidden;"' : '';
                 $cells['sort.up'] = '
-					<a class="btn btn-default sortingUp" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveUp')) . '">
+					<a class="btn btn-default sortingUp" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:moveUp')) . '">
 						' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '
 					</a>';
                 // Down
                 $onClick = 'return inline.changeSorting(' . GeneralUtility::quoteJSvalue($nameObjectFtId) . ', \'-1\')';
                 $style = $inlineConfig['inline']['last'] == $rec['uid'] ? 'style="visibility: hidden;"' : '';
                 $cells['sort.down'] = '
-					<a class="btn btn-default sortingDown" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveDown')) . '">
+					<a class="btn btn-default sortingDown" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:moveDown')) . '">
 						' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '
 					</a>';
             }
@@ -494,7 +494,7 @@ class InlineRecordContainer extends AbstractContainer
                         'edit[sys_file_metadata][' . (int)$recordInDatabase['uid'] . ']' => 'edit',
                         'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
                     ]);
-                    $title = $languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.editMetadata');
+                    $title = $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata');
                     $cells['editmetadata'] = '
 						<a class="btn btn-default" href="' . htmlspecialchars($url) . '" title="' . htmlspecialchars($title) . '">
 							' . $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL)->render() . '
@@ -506,7 +506,7 @@ class InlineRecordContainer extends AbstractContainer
                     || !$isPagesTable && $calcPerms & Permission::CONTENT_EDIT
                     || $isSysFileReferenceTable && $calcPerms & Permission::PAGE_EDIT)
             ) {
-                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete'));
+                $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:delete'));
                 $icon = $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render();
                 $cells['delete'] = '<a href="#" class="btn btn-default t3js-editform-delete-inline-record" data-objectid="' . htmlspecialchars($nameObjectFtId) . '" title="' . $title . '">' . $icon . '</a>';
             }
@@ -518,14 +518,14 @@ class InlineRecordContainer extends AbstractContainer
                     GeneralUtility::quoteJSvalue($hiddenField) . ')';
                 $className = 't3js-' . $nameObjectFtId . '_disabled';
                 if ($rec[$hiddenField]) {
-                    $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : ''))));
+                    $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : ''))));
                     $cells['hide.unhide'] = '
 						<a class="btn btn-default hiddenHandle ' . $className . '" href="#" onclick="'
                         . htmlspecialchars($onClick) . '"' . 'title="' . $title . '">' .
                         $this->iconFactory->getIcon('actions-edit-unhide', Icon::SIZE_SMALL)->render() . '
 						</a>';
                 } else {
-                    $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:hide' . ($isPagesTable ? 'Page' : ''))));
+                    $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:hide' . ($isPagesTable ? 'Page' : ''))));
                     $cells['hide.hide'] = '
 						<a class="btn btn-default hiddenHandle ' . $className . '" href="#" onclick="'
                         . htmlspecialchars($onClick) . '"' . 'title="' . $title . '">' .
@@ -536,7 +536,7 @@ class InlineRecordContainer extends AbstractContainer
             // Drag&Drop Sorting: Sortable handler for script.aculo.us
             if ($enabledControls['dragdrop'] && $permsEdit && $enableManualSorting && $inlineConfig['appearance']['useSortable']) {
                 $additionalCells['dragdrop'] = '
-					<span class="btn btn-default sortableHandle" data-id="' . htmlspecialchars($rec['uid']) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move')) . '">
+					<span class="btn btn-default sortableHandle" data-id="' . htmlspecialchars($rec['uid']) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.move')) . '">
 						' . $this->iconFactory->getIcon('actions-move-move', Icon::SIZE_SMALL)->render() . '
 					</span>';
             }
@@ -544,7 +544,7 @@ class InlineRecordContainer extends AbstractContainer
             if ($enabledControls['localize'] && $data['isInlineDefaultLanguageRecordInLocalizedParentContext']) {
                 $onClick = 'inline.synchronizeLocalizeRecords(' . GeneralUtility::quoteJSvalue($nameObjectFt) . ', ' . GeneralUtility::quoteJSvalue($rec['uid']) . ');';
                 $cells['localize'] = '
-					<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:localize')) . '">
+					<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:localize')) . '">
 						' . $this->iconFactory->getIcon('actions-document-localize', Icon::SIZE_SMALL)->render() . '
 					</a>';
             }
diff --git a/typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php b/typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php
index 31892c47185e5ac6029d85ed12ffae5ca8626cc7..05d5048d00ac602186d4e5fd2e85a4da4ab01cc8 100644
--- a/typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php
@@ -69,18 +69,18 @@ class OuterWrapContainer extends AbstractContainer
         $tableTitle = $languageService->sL($this->data['processedTca']['ctrl']['title']);
 
         if ($this->data['command'] === 'new') {
-            $newOrUid = ' <span class="typo3-TCEforms-newToken">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.new')) . '</span>';
+            $newOrUid = ' <span class="typo3-TCEforms-newToken">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.new')) . '</span>';
 
             // @todo: There is quite some stuff do to for WS overlays ...
             $workspacedPageRecord = BackendUtility::getRecordWSOL('pages', $this->data['effectivePid'], 'title');
             $pageTitle = BackendUtility::getRecordTitle('pages', $workspacedPageRecord, true, false);
             if ($table === 'pages') {
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.createNewPage'));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.createNewPage'));
                 $pageTitle = sprintf($label, $tableTitle);
             } else {
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.createNewRecord'));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.createNewRecord'));
                 if ($this->data['effectivePid'] === 0) {
-                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.createNewRecordRootLevel'));
+                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.createNewRecordRootLevel'));
                 }
                 $pageTitle = sprintf($label, $tableTitle, $pageTitle);
             }
@@ -91,17 +91,17 @@ class OuterWrapContainer extends AbstractContainer
             // @todo: getRecordTitlePrep applies an htmlspecialchars here
             $recordLabel = BackendUtility::getRecordTitlePrep($this->data['recordTitle']);
             if ($table === 'pages') {
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.editPage'));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.editPage'));
                 $pageTitle = sprintf($label, $tableTitle, $recordLabel);
             } else {
-                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.editRecord'));
+                $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.editRecord'));
                 $workspacedPageRecord = BackendUtility::getRecordWSOL('pages', $row['pid'], 'uid,title');
                 $pageTitle = BackendUtility::getRecordTitle('pages', $workspacedPageRecord, true, false);
                 if (empty($recordLabel)) {
-                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.editRecordNoTitle'));
+                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.editRecordNoTitle'));
                 }
                 if ($this->data['effectivePid'] === 0) {
-                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.editRecordRootLevel'));
+                    $label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.editRecordRootLevel'));
                 }
                 if (!empty($recordLabel)) {
                     // Use record title and prepend an edit label.
@@ -121,7 +121,7 @@ class OuterWrapContainer extends AbstractContainer
         $descriptionColumn = !empty($this->data['processedTca']['ctrl']['descriptionColumn'])
             ? $this->data['processedTca']['ctrl']['descriptionColumn'] : null;
         if ($descriptionColumn !== null) {
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.recordInformation');
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.recordInformation');
             $content = $this->data['databaseRow'][$descriptionColumn];
             $view->assignMultiple([
                 'infoBoxMessageTitle' => $title,
diff --git a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
index 8b570114c9312ac74844d08edca68c1c4ba25d2f..21d3ac6cab55cf85d8bf92777799baff2e4a6db2 100644
--- a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
@@ -272,12 +272,12 @@ class SingleFieldContainer extends AbstractContainer
             $disabled = '';
             $fallbackValue = 0;
             if (strlen(BackendUtility::getRecordTitlePrep($placeholder, 20)) > 0) {
-                $overrideLabel = sprintf($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.placeholder.override'), BackendUtility::getRecordTitlePrep($placeholder, 20));
+                $overrideLabel = sprintf($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.placeholder.override'), BackendUtility::getRecordTitlePrep($placeholder, 20));
             } else {
                 $fallbackValue = 1;
                 $checked = ' checked="checked"';
                 $disabled = ' disabled="disabled"';
-                $overrideLabel = sprintf($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.placeholder.override_not_available'), BackendUtility::getRecordTitlePrep($placeholder, 20));
+                $overrideLabel = sprintf($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.placeholder.override_not_available'), BackendUtility::getRecordTitlePrep($placeholder, 20));
             }
 
             $resultArray['additionalJavaScriptPost'][] = 'typo3form.fieldTogglePlaceholder('
@@ -357,7 +357,7 @@ class SingleFieldContainer extends AbstractContainer
                 /** @var IconFactory $iconFactory */
                 $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
                 if ($defaultLanguageValue !== '') {
-                    $item .= '<div class="t3-form-original-language" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_misc.xlf:localizeMergeIfNotBlank')) . '">'
+                    $item .= '<div class="t3-form-original-language" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:localizeMergeIfNotBlank')) . '">'
                         . $iconFactory->getIcon($this->data['systemLanguageRows'][0]['flagIconIdentifier'], Icon::SIZE_SMALL)->render()
                         . $this->getMergeBehaviourIcon($fieldConfig['l10n_mode'])
                         . $this->previewFieldValue($defaultLanguageValue, $fieldConfig, $field) . '</div>';
@@ -372,7 +372,7 @@ class SingleFieldContainer extends AbstractContainer
                         true
                     );
                     if ($defaultLanguageValue !== '') {
-                        $item .= '<div class="t3-form-original-language" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_misc.xlf:localizeMergeIfNotBlank')) . '">'
+                        $item .= '<div class="t3-form-original-language" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:localizeMergeIfNotBlank')) . '">'
                             . $iconFactory->getIcon($this->data['systemLanguageRows'][$previewLanguage['sys_language_uid']]['flagIconIdentifier'], Icon::SIZE_SMALL)->render()
                             . $this->getMergeBehaviourIcon($fieldConfig['l10n_mode'])
                             . $this->previewFieldValue($defaultLanguageValue, $fieldConfig, $field) . '</div>';
@@ -434,7 +434,7 @@ class SingleFieldContainer extends AbstractContainer
                     $item .= '
 						<div class="t3-form-original-language-diff">
 							<div class="t3-form-original-language-diffheader">'
-                                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.changeInOrig'))
+                                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.changeInOrig'))
                             . '</div>
 							<div class="t3-form-original-language-diffcontent">
 								<div class="diff">
diff --git a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
index 4b851f37e0d321441d56ed08b0cf9ebc37bdb995..5fe64b0caf9f422406c47e4633939bc634179e62 100644
--- a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
@@ -285,7 +285,7 @@ abstract class AbstractFormElement extends AbstractNode
 
                     $onlyIfSelectedJS = '';
                     if (isset($wizardConfiguration['popup_onlyOpenIfSelected']) && $wizardConfiguration['popup_onlyOpenIfSelected']) {
-                        $notSelectedText = $languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.noSelItemForEdit');
+                        $notSelectedText = $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.noSelItemForEdit');
                         $onlyIfSelectedJS =
                             'if (!TBE_EDITOR.curSelected(' . GeneralUtility::quoteJSvalue($itemName) . ')){' .
                                 'alert(' . GeneralUtility::quoteJSvalue($notSelectedText) . ');' .
@@ -560,7 +560,7 @@ abstract class AbstractFormElement extends AbstractNode
 					<a href="#"
 						onclick="' . htmlspecialchars($aOnClick) . '"
 						class="btn btn-default"
-						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.browse_' . ($mode == 'db' ? 'db' : 'file'))) . '">
+						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.browse_' . ($mode == 'db' ? 'db' : 'file'))) . '">
 						' . $this->iconFactory->getIcon('actions-insert-record', Icon::SIZE_SMALL)->render() . '
 					</a>';
             }
@@ -570,7 +570,7 @@ abstract class AbstractFormElement extends AbstractNode
 						<a href="#"
 							class="btn btn-default t3js-btn-moveoption-top"
 							data-fieldname="' . $fName . '"
-							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_top')) . '">
+							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.move_to_top')) . '">
 							' . $this->iconFactory->getIcon('actions-move-to-top', Icon::SIZE_SMALL)->render() . '
 						</a>';
                 }
@@ -578,14 +578,14 @@ abstract class AbstractFormElement extends AbstractNode
 					<a href="#"
 						class="btn btn-default t3js-btn-moveoption-up"
 						data-fieldname="' . $fName . '"
-						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_up')) . '">
+						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.move_up')) . '">
 						' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '
 					</a>';
                 $icons['L'][] = '
 					<a href="#"
 						class="btn btn-default t3js-btn-moveoption-down"
 						data-fieldname="' . $fName . '"
-						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_down')) . '">
+						title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.move_down')) . '">
 						' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '
 					</a>';
                 if ($sSize >= 5) {
@@ -593,7 +593,7 @@ abstract class AbstractFormElement extends AbstractNode
 						<a href="#"
 							class="btn btn-default t3js-btn-moveoption-bottom"
 							data-fieldname="' . $fName . '"
-							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_bottom')) . '">
+							title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.move_to_bottom')) . '">
 							' . $this->iconFactory->getIcon('actions-move-to-bottom', Icon::SIZE_SMALL)->render() . '
 						</a>';
                 }
@@ -619,7 +619,7 @@ abstract class AbstractFormElement extends AbstractNode
 					<a href="#"
 						class="btn btn-default"
 						onclick="' . htmlspecialchars($aOnClick) . '"
-						title="' . htmlspecialchars(sprintf($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))) . '">
+						title="' . htmlspecialchars(sprintf($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))) . '">
 						' . $this->iconFactory->getIcon('actions-document-paste-into', Icon::SIZE_SMALL)->render() . '
 					</a>';
             }
@@ -630,7 +630,7 @@ abstract class AbstractFormElement extends AbstractNode
 					class="btn btn-default t3js-btn-removeoption"
 					onClick="' . $rOnClickInline . '"
 					data-fieldname="' . $fName . '"
-					title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.remove_selected')) . '">
+					title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.remove_selected')) . '">
 					' . $this->iconFactory->getIcon('actions-selection-delete', Icon::SIZE_SMALL)->render() . '
 				</a>';
         }
diff --git a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
index 562610c0499d1e148f5df0ba1e22fd14537204fa..9abbac774aea6e40b3f02ad86c3863200920d35c 100644
--- a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
@@ -140,7 +140,7 @@ class GroupElement extends AbstractFormElement
                             if ($fileObject->isMissing()) {
                                 $thumbnails[] = [
                                     'message' => '<span class="label label-danger">'
-                                        . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                                        . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                                         . '</span>&nbsp;' . htmlspecialchars($fileObject->getName()) . '<br />'
                                 ];
                             } elseif (GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], $fileObject->getExtension())) {
@@ -254,7 +254,7 @@ class GroupElement extends AbstractFormElement
                 $allowedTables = [];
                 if ($allowed[0] === '*') {
                     $allowedTables = [
-                        'name' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.allTables'))
+                        'name' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.allTables'))
                     ];
                 } elseif ($allowed) {
                     foreach ($allowed as $allowedTable) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php b/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
index 9542cb8e334f247a1d96c84636dd271755a0e46b..5868e64f41d69c3f1670152e95d534620c0aae05 100644
--- a/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
@@ -38,10 +38,10 @@ class ImageManipulationElement extends AbstractFormElement
         'enableZoom' => false,
         'allowedExtensions' => null, // default: $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
         'ratios' => [
-            '1.7777777777777777' => 'LLL:EXT:lang/locallang_wizards.xlf:imwizard.ratio.16_9',
-            '1.3333333333333333' => 'LLL:EXT:lang/locallang_wizards.xlf:imwizard.ratio.4_3',
-            '1' => 'LLL:EXT:lang/locallang_wizards.xlf:imwizard.ratio.1_1',
-            'NaN' => 'LLL:EXT:lang/locallang_wizards.xlf:imwizard.ratio.free',
+            '1.7777777777777777' => 'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.ratio.16_9',
+            '1.3333333333333333' => 'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.ratio.4_3',
+            '1' => 'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.ratio.1_1',
+            'NaN' => 'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.ratio.free',
         ]
     ];
 
@@ -120,7 +120,7 @@ class ImageManipulationElement extends AbstractFormElement
             $button = '<button class="btn btn-default t3js-image-manipulation-trigger"';
             $button .= GeneralUtility::implodeAttributes($buttonAttributes, true, true);
             $button .= '><span class="t3-icon fa fa-crop"></span>';
-            $button .= htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.open-editor'));
+            $button .= htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.open-editor'));
             $button .= '</button>';
 
             $attributes = [];
@@ -145,7 +145,7 @@ class ImageManipulationElement extends AbstractFormElement
             ];
         }
 
-        $content .= '<p class="text-muted"><em>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.supported-types-message')) . '<br />';
+        $content .= '<p class="text-muted"><em>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.supported-types-message')) . '<br />';
         $content .= strtoupper(implode(', ', GeneralUtility::trimExplode(',', $config['allowedExtensions'])));
         $content .= '</em></p>';
 
@@ -251,13 +251,13 @@ class ImageManipulationElement extends AbstractFormElement
 
         $content .= '<div class="table-fit-block table-spacer-wrap">';
         $content .= '<table class="table table-no-borders t3js-image-manipulation-info' . ($imageManipulation === null ? ' hide' : '') . '">';
-        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-x')) . '</td>';
+        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-x')) . '</td>';
         $content .= '<td class="t3js-image-manipulation-info-crop-x">' . $x . 'px</td></tr>';
-        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-y')) . '</td>';
+        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-y')) . '</td>';
         $content .= '<td class="t3js-image-manipulation-info-crop-y">' . $y . 'px</td></tr>';
-        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-width')) . '</td>';
+        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-width')) . '</td>';
         $content .= '<td class="t3js-image-manipulation-info-crop-width">' . $width . 'px</td></tr>';
-        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-height')) . '</td>';
+        $content .= '<tr><td>' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-height')) . '</td>';
         $content .= '<td class="t3js-image-manipulation-info-crop-height">' . $height . 'px</td></tr>';
         $content .= '</table>';
         $content .= '</div>';
diff --git a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
index 24925b786edf8ff522dedf5c38f1c1ffce3018f5..f08182520409cbf9d24648344a6c526f7418ddc3 100644
--- a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
@@ -96,7 +96,7 @@ class NoneElement extends AbstractFormElement
                 if (isset($config['format.']['appendAge']) && $config['format.']['appendAge']) {
                     $age = BackendUtility::calcAge(
                         $GLOBALS['EXEC_TIME'] - $itemValue,
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                     );
                     $value .= ' (' . $age . ')';
                 }
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
index 794cf8ebc4e1e9c3b64a2de74624702518945395..d4ce28393e09258dfb3ba7f381d1edd04adaa31d 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
@@ -156,20 +156,20 @@ class SelectCheckBoxElement extends AbstractFormElement
                     $resetGroupBtn = '';
                     if (!empty($resetGroup)) {
                         $resetGroup[] = 'TYPO3.FormEngine.updateCheckboxState(this);';
-                        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.revertSelection'));
+                        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.revertSelection'));
                         $resetGroupBtn = '<a href="#" '
                             . 'class="btn btn-default btn-sm" '
                             . 'onclick="' . implode('', $resetGroup) . ' return false;" '
                             . 'title="' . $title . '">'
                             . $this->iconFactory->getIcon('actions-edit-undo', Icon::SIZE_SMALL)->render() . ' '
-                            . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.revertSelection') . '</a>';
+                            . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.revertSelection') . '</a>';
                     }
 
                     if (is_array($group['header'])) {
                         $html[] = '<div id="' . $groupId . '" class="panel-collapse collapse" role="tabpanel">';
                     }
                     $checkboxId = uniqid($groupId);
-                    $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.toggleall'));
+                    $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.toggleall'));
                     $html[] =    '<div class="table-responsive">';
                     $html[] =        '<table class="table table-transparent table-hover">';
                     $html[] =            '<thead>';
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
index 654195cca418e1014ad6519c93268ee13200faa0..c2369990b6b27ec0c218db097fda20018d1ac696 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
@@ -164,8 +164,8 @@ class SelectMultipleSideBySideElement extends AbstractFormElement
             'maxitems' => $maxitems,
             'info' => '',
             'headers' => [
-                'selector' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.selected'),
-                'items' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.items'),
+                'selector' => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.selected'),
+                'items' => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.items'),
                 'selectorbox' => $selectBoxFilterContents,
             ],
             'noBrowser' => 1,
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
index 9d8e2e6c1cc6850e9972cbc845f558c650b0a02b..e0d60ed700784bfcf103a20319727cac56d8d46d 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
@@ -87,7 +87,7 @@ class SelectSingleBoxElement extends AbstractFormElement
                 '</div>',
             '</div>',
             '<p>',
-                '<em>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.holdDownCTRL')) . '</em>',
+                '<em>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.holdDownCTRL')) . '</em>',
             '</p>',
         ]);
         $html = implode(LF, $html);
@@ -206,7 +206,7 @@ class SelectSingleBoxElement extends AbstractFormElement
             'class' => 'btn btn-default',
             'onclick' => htmlspecialchars(implode(';', $resetCode)),
             // htmlspecialchars() is done by $this->implodeAttributes()
-            'title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.revertSelection')
+            'title' => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.revertSelection')
         ];
 
         $html = [
diff --git a/typo3/sysext/backend/Classes/Form/Element/TextElement.php b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
index b1c805e2c4bf485c03b4d1cfbc24a5990e326469..8aa02559be38c9af76a2f9645e61a5b1f535f78e 100644
--- a/typo3/sysext/backend/Classes/Form/Element/TextElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
@@ -93,7 +93,7 @@ class TextElement extends AbstractFormElement
 
         // Show message, if no RTE (field can only be edited with RTE!)
         if ($specialConfiguration['rte_only']) {
-            $html = '<p><em>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.noRTEfound')) . '</em></p>';
+            $html = '<p><em>' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noRTEfound')) . '</em></p>';
         } else {
             $attributes = [];
             // validation
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
index 03b19006ef12f991c4c1607bcbb93196f016cde3..717b674b1e4cb8129b4f8d2b8902cd82c9a723a3 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -81,7 +81,7 @@ abstract class AbstractItemProvider
                 $fieldLabel = $languageService->sL($result['processedTca']['columns'][$fieldName]['label']);
             }
             $message = sprintf(
-                $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.items_proc_func_error'),
+                $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.items_proc_func_error'),
                 $fieldLabel,
                 $exception->getMessage()
             );
@@ -480,8 +480,8 @@ abstract class AbstractItemProvider
         // Early return on error with flash message
         if (!empty($databaseError)) {
             $msg = $databaseError . '. ';
-            $msg .= $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.database_schema_mismatch');
-            $msgTitle = $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.database_schema_mismatch_title');
+            $msg .= $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.database_schema_mismatch');
+            $msgTitle = $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.database_schema_mismatch_title');
             /** @var $flashMessage FlashMessage */
             $flashMessage = GeneralUtility::makeInstance(FlashMessage::class, $msg, $msgTitle, FlashMessage::ERROR, true);
             /** @var $flashMessageService FlashMessageService */
@@ -843,8 +843,8 @@ abstract class AbstractItemProvider
     {
         $languageService = static::getLanguageService();
         $adLabel = [
-            'ALLOW' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.allow'),
-            'DENY' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.deny')
+            'ALLOW' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.allow'),
+            'DENY' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.deny')
         ];
         $allowDenyOptions = [];
         foreach ($GLOBALS['TCA'] as $table => $_) {
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
index ed43c5122eaf1e1dcfd76618b01c8201e3d39c00..c141bc1cba80e96ba96c1d6370b8e5f400f51448 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
@@ -38,7 +38,7 @@ class DatabaseSystemLanguageRows implements FormDataProviderInterface
         $languageService = $this->getLanguageService();
 
         $pageTs = $result['pageTsConfig'];
-        $defaultLanguageLabel = $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
+        $defaultLanguageLabel = $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage');
         if (isset($pageTs['mod.']['SHARED.']['defaultLanguageLabel'])) {
             $defaultLanguageLabel = $pageTs['mod.']['SHARED.']['defaultLanguageLabel'] . ' (' . $languageService->sL($defaultLanguageLabel) . ')';
         }
@@ -51,7 +51,7 @@ class DatabaseSystemLanguageRows implements FormDataProviderInterface
             -1 => [
                 // -1: "All" languages
                 'uid' => -1,
-                'title' => $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages'),
+                'title' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages'),
                 // Same as for 0, but iso is used in flex form context only and duplication handled there
                 // @todo: Maybe drop this if flex form language handling is extracted?
                 'iso' => 'DEF',
@@ -99,7 +99,7 @@ class DatabaseSystemLanguageRows implements FormDataProviderInterface
                 // @todo: This could be relaxed again if flex form language handling is extracted,
                 // @todo: since the rest of the FormEngine code does not rely on iso code?
                 $message = sprintf(
-                    $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.missingLanguageIsocode'),
+                    $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.missingLanguageIsocode'),
                     $row['title'],
                     $uid
                 );
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRecordTitle.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRecordTitle.php
index 42a0ac8bef407a5781d0400728a21dc22fae54ee..870cfb3770d6700e0d5cbe57343f9e301c7bd355 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRecordTitle.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRecordTitle.php
@@ -266,8 +266,8 @@ class TcaRecordTitle implements FormDataProviderInterface
         $languageService = $this->getLanguageService();
         if (empty($fieldConfig['items']) || !is_array($fieldConfig['items'])) {
             $title = (bool)$value
-                ? $languageService->sL('LLL:EXT:lang/locallang_common.xlf:yes')
-                : $languageService->sL('LLL:EXT:lang/locallang_common.xlf:no');
+                ? $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes')
+                : $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:no');
         } else {
             $labelParts = [];
             foreach ($fieldConfig['items'] as $key => $val) {
@@ -306,7 +306,7 @@ class TcaRecordTitle implements FormDataProviderInterface
                     $ageDelta = $GLOBALS['EXEC_TIME'] - $value;
                     $calculatedAge = BackendUtility::calcAge(
                         abs($ageDelta),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                     );
                     $ageSuffix = ' (' . ($ageDelta > 0 ? '-' : '') . $calculatedAge . ')';
                 }
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaSelectItems.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaSelectItems.php
index 79fc498413412252f557cbd6ac41d5fb5bf424c7..fb594a1a52d0b8f4e2be325410c63f5a744a3dd1 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaSelectItems.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaSelectItems.php
@@ -125,7 +125,7 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
         $languageService = $this->getLanguageService();
         $noMatchingLabel = isset($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['noMatchingValue_label'])
             ? $languageService->sL(trim($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['noMatchingValue_label']))
-            : '[ ' . $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue') . ' ]';
+            : '[ ' . $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue') . ' ]';
 
         $unmatchedValues = array_diff(
             array_values($databaseValues),
diff --git a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
index 2db8b2cf1ce8d3ca3dc0b11e473a80ae35c1b4e5..1127d304c46259135fb3cc1bb26377f3e215b21f 100644
--- a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
+++ b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
@@ -282,7 +282,7 @@ class FormResultCompiler
 
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Filelist/FileListLocalisation');
 
-        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_core.xlf', 'file_upload');
+        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_core.xlf', 'file_upload');
         if (!empty($this->additionalInlineLanguageLabelFiles)) {
             foreach ($this->additionalInlineLanguageLabelFiles as $additionalInlineLanguageLabelFile) {
                 $pageRenderer->addInlineLanguageLabelFile($additionalInlineLanguageLabelFile);
@@ -297,13 +297,13 @@ class FormResultCompiler
 
         // todo: change these things in JS
         $pageRenderer->addInlineLanguageLabelArray([
-            'FormEngine.noRecordTitle'          => 'LLL:EXT:lang/locallang_core.xlf:labels.no_title',
-            'FormEngine.fieldsChanged'          => 'LLL:EXT:lang/locallang_core.xlf:labels.fieldsChanged',
-            'FormEngine.fieldsMissing'          => 'LLL:EXT:lang/locallang_core.xlf:labels.fieldsMissing',
-            'FormEngine.maxItemsAllowed'        => 'LLL:EXT:lang/locallang_core.xlf:labels.maxItemsAllowed',
-            'FormEngine.refreshRequiredTitle'   => 'LLL:EXT:lang/locallang_core.xlf:mess.refreshRequired.title',
-            'FormEngine.refreshRequiredContent' => 'LLL:EXT:lang/locallang_core.xlf:mess.refreshRequired.content',
-            'FormEngine.remainingCharacters'    => 'LLL:EXT:lang/locallang_core.xlf:labels.remainingCharacters',
+            'FormEngine.noRecordTitle'          => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title',
+            'FormEngine.fieldsChanged'          => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.fieldsChanged',
+            'FormEngine.fieldsMissing'          => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.fieldsMissing',
+            'FormEngine.maxItemsAllowed'        => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.maxItemsAllowed',
+            'FormEngine.refreshRequiredTitle'   => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refreshRequired.title',
+            'FormEngine.refreshRequiredContent' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.refreshRequired.content',
+            'FormEngine.remainingCharacters'    => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.remainingCharacters',
         ], true);
 
         $out = '
diff --git a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizard.php b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizard.php
index 868f728c533e161890c9f1e71b418b359129bdb1..2fc6c07a7673bb54a799f566b655ebbd8c89243a 100644
--- a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizard.php
+++ b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizard.php
@@ -100,7 +100,7 @@ class SuggestWizard
         );
 
         $this->view->assignMultiple([
-                'placeholder' => 'LLL:EXT:lang/locallang_core.xlf:labels.findRecord',
+                'placeholder' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.findRecord',
                 'fieldname' => $fieldName,
                 'table' => $table,
                 'field' => $field,
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index ec90c6217017e97c3af8e2d1c895fc1304f128b6..d6b663446d8e1c64b2a27476a3d2c0eff110f85b 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -299,16 +299,16 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
      * Returns the label for key. If a translation for the language set in $this->uc['lang']
      * is found that is returned, otherwise the default value.
      * If the global variable $LOCAL_LANG is NOT an array (yet) then this function loads
-     * the global $LOCAL_LANG array with the content of "sysext/lang/locallang_tsfe.xlf"
+     * the global $LOCAL_LANG array with the content of "sysext/lang/Resources/Private/Language/locallang_tsfe.xlf"
      * such that the values therein can be used for labels in the Admin Panel
      *
-     * @param string $key Key for a label in the $GLOBALS['LOCAL_LANG'] array of "sysext/lang/locallang_tsfe.xlf
+     * @param string $key Key for a label in the $GLOBALS['LOCAL_LANG'] array of "sysext/lang/Resources/Private/Language/locallang_tsfe.xlf
      * @return string The value for the $key
      */
     public function extGetLL($key)
     {
         if (!is_array($GLOBALS['LOCAL_LANG'])) {
-            $this->getLanguageService()->includeLLFile('EXT:lang/locallang_tsfe.xlf');
+            $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_tsfe.xlf');
             if (!is_array($GLOBALS['LOCAL_LANG'])) {
                 $GLOBALS['LOCAL_LANG'] = [];
             }
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index 2ef688d30b49d060750d7f123ef1f1a90dc61ba6..b94aedb197c02106d055229ae9bbd7cfa2f327bc 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -436,7 +436,7 @@ class RecordHistory
             // remove first link
             $singleLine['time'] = htmlspecialchars(BackendUtility::datetime($entry['tstamp']));
             // add time
-            $singleLine['age'] = htmlspecialchars(BackendUtility::calcAge($GLOBALS['EXEC_TIME'] - $entry['tstamp'], $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')));
+            $singleLine['age'] = htmlspecialchars(BackendUtility::calcAge($GLOBALS['EXEC_TIME'] - $entry['tstamp'], $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')));
             // add age
 
             $singleLine['tableUid'] = $this->linkPage(
diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
index af2e27de37c10467655655935ac998f5dc5507cb..0411c50afee7d12b59c65a857bd497edbc417d25 100644
--- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
@@ -50,7 +50,7 @@ class ElementBrowserRecordList extends DatabaseRecordList
     public function linkWrapItems($table, $uid, $code, $row)
     {
         if (!$code) {
-            $code = '<i>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</i>';
+            $code = '<i>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</i>';
         } else {
             $code = BackendUtility::getRecordTitlePrep($code, $this->fixedL);
         }
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index 2c7cf997fb5c385a1efbebe783f27afe8c3f2d46..e4c5bdbf3f0953924b3aa2834cac4790bc71dcf8 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -372,10 +372,10 @@ function jumpToUrl(URL) {
         $str = '<a href="' . htmlspecialchars(BackendUtility::getModuleUrl('web_list', [
             'id' => $id,
             'returnUrl' > GeneralUtility::getIndpEnv('REQUEST_URI')
-        ])) . '" title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList')) . '">' . $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . '</a>';
+        ])) . '" title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showList')) . '">' . $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . '</a>';
 
         // Make link to view page
-        $str .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($id, '', BackendUtility::BEgetRootLine($id))) . '" title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '</a>';
+        $str .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($id, '', BackendUtility::BEgetRootLine($id))) . '" title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '</a>';
         return $str;
     }
 
@@ -471,7 +471,7 @@ function jumpToUrl(URL) {
         } else {
             $motherModule = '\'\'';
         }
-        $confirmationText = GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark'));
+        $confirmationText = GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.makeBookmark'));
 
         $shortcutUrl = $pathInfo['path'] . '?' . $storeUrl;
         $shortcutExist = BackendUtility::shortcutExists($shortcutUrl);
@@ -485,7 +485,7 @@ function jumpToUrl(URL) {
             ', ' . $url . ', ' . $confirmationText . ', ' . $motherModule . ', this);return false;';
 
         return '<a href="#" class="' . htmlspecialchars($classes) . '" onclick="' . htmlspecialchars($onClick) . '" title="' .
-        htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark')) . '">' .
+        htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.makeBookmark')) . '">' .
         $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render() . '</a>';
     }
 
@@ -1457,7 +1457,7 @@ function jumpToUrl(URL) {
             $title = '';
         }
         // Setting the path of the page
-        $pagePath = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.path')) . ': <span class="typo3-docheader-pagePath">';
+        $pagePath = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path')) . ': <span class="typo3-docheader-pagePath">';
         // crop the title to title limit (or 50, if not defined)
         $cropLength = empty($GLOBALS['BE_USER']->uc['titleLen']) ? 50 : $GLOBALS['BE_USER']->uc['titleLen'];
         $croppedTitle = GeneralUtility::fixed_lgd_cs($title, -$cropLength);
diff --git a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
index 5a08dc0a5cbf1dbc19c2f99e4eb0d6fe4072b22d..549f8e3cdd30cd72c1dd1c80a284a445663f813e 100644
--- a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
@@ -532,7 +532,7 @@ class ModuleTemplate
             $motherModule = '\'\'';
         }
         $confirmationText = GeneralUtility::quoteJSvalue(
-            $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark')
+            $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.makeBookmark')
         );
 
         $shortcutUrl = $pathInfo['path'] . '?' . $storeUrl;
@@ -548,7 +548,7 @@ class ModuleTemplate
             ', ' . $url . ', ' . $confirmationText . ', ' . $motherModule . ', this, ' . GeneralUtility::quoteJSvalue($displayName) . ');return false;';
 
         return '<a href="#" class="' . htmlspecialchars($classes) . '" onclick="' . htmlspecialchars($onClick) . '" title="' .
-        htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark')) . '">' .
+        htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.makeBookmark')) . '">' .
         $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render() . '</a>';
     }
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index c31f57623b7abb0c150ff17ad61722d85535f92e..4f252e98daef9ab9f32b7d99558686bddaa35fdc 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -176,7 +176,7 @@ class Commands
 
         $data['pages'][$placeholder]['pid'] = $pid;
         $data['pages'][$placeholder]['doktype'] = $pageType;
-        $data['pages'][$placeholder]['title'] = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:tree.defaultPageTitle'));
+        $data['pages'][$placeholder]['title'] = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:tree.defaultPageTitle'));
         $newPageId = self::processTceCmdAndDataMap([], $data);
         $node = self::getNode($newPageId[$placeholder]);
         if ($pid !== $targetId) {
@@ -336,7 +336,7 @@ class Commands
             $text = $record['nav_title'];
         }
         if (trim($text) === '') {
-            $visibleText = '[' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']';
+            $visibleText = '[' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']';
         } else {
             $visibleText = $text;
         }
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
index c36a59cdd829d9fb80f340ce2e11460dcdb74987..4cb94ca94677e0851abb3bdf129c1a4553c52627 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
@@ -178,7 +178,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
      */
     public function loadResources()
     {
-        $file = 'LLL:EXT:lang/locallang_core.xlf:';
+        $file = 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:';
         $indicators = $this->getIndicators();
         $configuration = [
             'LLL' => [
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 72f3876a078577930d0038b7afeb9929e714bf16..161f4e36bdfd01b9f78c3f8966f8419464998969 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -698,7 +698,7 @@ abstract class AbstractTreeView
     public function getTitleStr($row, $titleLen = 30)
     {
         $title = htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['title'], $titleLen));
-        $title = trim($row['title']) === '' ? '<em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</em>' : $title;
+        $title = trim($row['title']) === '' ? '<em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</em>' : $title;
         return $title;
     }
 
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index aa40186c1cbb7e9e4c0db23831270cb35fb4e5f8..bc99db5376a8a497dabf7bd63d070be5960626b9 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -329,7 +329,7 @@ class FolderTreeView extends AbstractTreeView
             // Mark a storage which is not online, as offline
             // maybe someday there will be a special icon for this
             if ($storageObject->isOnline() === false) {
-                $rootLevelFolderName .= ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file.xlf:sys_file_storage.isOffline') . ')';
+                $rootLevelFolderName .= ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.isOffline') . ')';
             }
             // Preparing rootRec for the mount
             $icon = $this->iconFactory->getIconForResource($rootLevelFolder, Icon::SIZE_SMALL, null, ['mount-root' => true]);
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 19dc172e821c0a13be31023fea442763127c037d..6c2ecbca2f749bae43a72059f4cf7a23a7046f61 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -126,7 +126,7 @@ class PageTreeView extends AbstractTreeView
     {
         $lang = $this->getLanguageService();
         if ($this->ext_showNavTitle && isset($row['nav_title']) && trim($row['nav_title']) !== '') {
-            $title = '<span title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_tca.xlf:title')) . ' '
+            $title = '<span title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:title')) . ' '
                      . htmlspecialchars(trim($row['title'])) . '">'
                      . htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['nav_title'], $titleLen))
                      . '</span>';
@@ -139,7 +139,7 @@ class PageTreeView extends AbstractTreeView
                          . '</span>';
             }
             $title = trim($row['title']) === ''
-                ? '<em>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</em>'
+                ? '<em>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</em>'
                 : $title;
         }
         return $title;
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 029edc77086121ab5e4f2df55a48f43ad83bda27..d26b62c8b4a1333575b89c8110ec2a78c6c8f06c 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -1483,7 +1483,7 @@ class BackendUtility
      * Returns the "age" in minutes / hours / days / years of the number of $seconds inputted.
      *
      * @param int $seconds Seconds could be the difference of a certain timestamp and time()
-     * @param string $labels Labels should be something like ' min| hrs| days| yrs| min| hour| day| year'. This value is typically delivered by this function call: $GLOBALS["LANG"]->sL("LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears")
+     * @param string $labels Labels should be something like ' min| hrs| days| yrs| min| hour| day| year'. This value is typically delivered by this function call: $GLOBALS["LANG"]->sL("LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears")
      * @return string Formatted time
      */
     public static function calcAge($seconds, $labels = ' min| hrs| days| yrs| min| hour| day| year')
@@ -1521,7 +1521,7 @@ class BackendUtility
         if (!$tstamp) {
             return '';
         }
-        $label = static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears');
+        $label = static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears');
         $age = ' (' . self::calcAge($prefix * ($GLOBALS['EXEC_TIME'] - $tstamp), $label) . ')';
         return ($date === 'date' ? self::date($tstamp) : self::datetime($tstamp)) . $age;
     }
@@ -1656,7 +1656,7 @@ class BackendUtility
                 if ($fileObject->isMissing()) {
                     $thumbData .= '<span class="label label-danger">'
                         . htmlspecialchars(
-                            static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing')
+                            static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing')
                         )
                         . '</span>&nbsp;' . htmlspecialchars($fileObject->getName()) . '<br />';
                     continue;
@@ -1718,13 +1718,13 @@ class BackendUtility
                         }
                         if ($fileObject->isMissing()) {
                             $thumbData .= '<span class="label label-danger">'
-                                . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                                . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                                 . '</span>&nbsp;' . htmlspecialchars($fileObject->getName()) . '<br />';
                             continue;
                         }
                     } catch (ResourceDoesNotExistException $exception) {
                         $thumbData .= '<span class="label label-danger">'
-                            . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                            . htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                             . '</span>&nbsp;' . htmlspecialchars($fileName) . '<br />';
                         continue;
                     }
@@ -1833,7 +1833,7 @@ class BackendUtility
             $parts[] = rtrim($lang->sL($GLOBALS['TCA']['pages']['columns']['nav_hide']['label']), ':');
         }
         if ($row['hidden']) {
-            $parts[] = $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.hidden');
+            $parts[] = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.hidden');
         }
         if ($row['starttime']) {
             $parts[] = $lang->sL($GLOBALS['TCA']['pages']['columns']['starttime']['label'])
@@ -1922,15 +1922,15 @@ class BackendUtility
             // Hidden
             $lang = static::getLanguageService();
             if ($ctrl['disabled']) {
-                $out .= $row[$ctrl['disabled']] ? ' - ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.hidden') : '';
+                $out .= $row[$ctrl['disabled']] ? ' - ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.hidden') : '';
             }
             if ($ctrl['starttime']) {
                 if ($row[$ctrl['starttime']] > $GLOBALS['EXEC_TIME']) {
-                    $out .= ' - ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.starttime') . ':' . self::date($row[$ctrl['starttime']]) . ' (' . self::daysUntil($row[$ctrl['starttime']]) . ' ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.days') . ')';
+                    $out .= ' - ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.starttime') . ':' . self::date($row[$ctrl['starttime']]) . ' (' . self::daysUntil($row[$ctrl['starttime']]) . ' ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.days') . ')';
                 }
             }
             if ($row[$ctrl['endtime']]) {
-                $out .= ' - ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.endtime') . ': ' . self::date($row[$ctrl['endtime']]) . ' (' . self::daysUntil($row[$ctrl['endtime']]) . ' ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.days') . ')';
+                $out .= ' - ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.endtime') . ': ' . self::date($row[$ctrl['endtime']]) . ' (' . self::daysUntil($row[$ctrl['endtime']]) . ' ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.days') . ')';
             }
         }
         return htmlspecialchars($out);
@@ -2207,7 +2207,7 @@ class BackendUtility
     public static function getNoRecordTitle($prep = false)
     {
         $noTitle = '[' .
-            htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title'))
+            htmlspecialchars(static::getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title'))
             . ']';
         if ($prep) {
             $noTitle = '<em>' . $noTitle . '</em>';
@@ -2522,7 +2522,7 @@ class BackendUtility
                 break;
             case 'check':
                 if (!is_array($theColConf['items']) || count($theColConf['items']) === 1) {
-                    $l = $value ? $lang->sL('LLL:EXT:lang/locallang_common.xlf:yes') : $lang->sL('LLL:EXT:lang/locallang_common.xlf:no');
+                    $l = $value ? $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes') : $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:no');
                 } else {
                     $lA = [];
                     foreach ($theColConf['items'] as $key => $val) {
@@ -2556,7 +2556,7 @@ class BackendUtility
                                 $ageSuffix = ' (' . ($GLOBALS['EXEC_TIME'] - $value > 0 ? '-' : '')
                                     . self::calcAge(
                                         abs(($GLOBALS['EXEC_TIME'] - $value)),
-                                        $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                                        $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                                     )
                                     . ')';
                             }
@@ -3778,31 +3778,31 @@ class BackendUtility
                     $userTypeLabel = 'user';
                 }
                 $lang = static::getLanguageService();
-                $userType = $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.' . $userTypeLabel);
+                $userType = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.' . $userTypeLabel);
                 // Get the username (if available):
                 if ($row['username']) {
                     $userName = $row['username'];
                 } else {
-                    $userName = $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.unknownUser');
+                    $userName = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.unknownUser');
                 }
                 $GLOBALS['LOCKED_RECORDS'][$row['record_table'] . ':' . $row['record_uid']] = $row;
                 $GLOBALS['LOCKED_RECORDS'][$row['record_table'] . ':' . $row['record_uid']]['msg'] = sprintf(
-                    $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.lockedRecordUser'),
+                    $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.lockedRecordUser'),
                     $userType,
                     $userName,
                     self::calcAge(
                         $GLOBALS['EXEC_TIME'] - $row['tstamp'],
-                        $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                        $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                     )
                 );
                 if ($row['record_pid'] && !isset($GLOBALS['LOCKED_RECORDS'][$row['record_table'] . ':' . $row['record_pid']])) {
                     $GLOBALS['LOCKED_RECORDS']['pages:' . $row['record_pid']]['msg'] = sprintf(
-                        $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.lockedRecordUser_content'),
+                        $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.lockedRecordUser_content'),
                         $userType,
                         $userName,
                         self::calcAge(
                             $GLOBALS['EXEC_TIME'] - $row['tstamp'],
-                            $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
                         )
                     );
                 }
@@ -4747,33 +4747,33 @@ class BackendUtility
 
         if (strlen($loginCopyrightWarrantyProvider) >= 2 && strlen($loginCopyrightWarrantyURL) >= 10) {
             $warrantyNote = sprintf(
-                $lang->sL('LLL:EXT:lang/locallang_login.xlf:warranty.by'),
+                $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:warranty.by'),
                 htmlspecialchars($loginCopyrightWarrantyProvider),
                 '<a href="' . htmlspecialchars($loginCopyrightWarrantyURL) . '" target="_blank">',
                 '</a>'
             );
         } else {
             $warrantyNote = sprintf(
-                $lang->sL('LLL:EXT:lang/locallang_login.xlf:no.warranty'),
+                $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:no.warranty'),
                 '<a href="' . TYPO3_URL_LICENSE . '" target="_blank">',
                 '</a>'
             );
         }
         $cNotice = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
-            $lang->sL('LLL:EXT:lang/locallang_login.xlf:typo3.cms') . '</a>. ' .
-            $lang->sL('LLL:EXT:lang/locallang_login.xlf:copyright') . ' &copy; '
+            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:typo3.cms') . '</a>. ' .
+            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:copyright') . ' &copy; '
             . htmlspecialchars(TYPO3_copyright_year) . ' Kasper Sk&aring;rh&oslash;j. ' .
-            $lang->sL('LLL:EXT:lang/locallang_login.xlf:extension.copyright') . ' ' .
+            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:extension.copyright') . ' ' .
             sprintf(
-                $lang->sL('LLL:EXT:lang/locallang_login.xlf:details.link'),
+                $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:details.link'),
                 ('<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>')
             ) . ' ' .
             strip_tags($warrantyNote, '<a>') . ' ' .
             sprintf(
-                $lang->sL('LLL:EXT:lang/locallang_login.xlf:free.software'),
+                $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:free.software'),
                 ('<a href="' . TYPO3_URL_LICENSE . '" target="_blank">'),
                 '</a> ')
-            . $lang->sL('LLL:EXT:lang/locallang_login.xlf:keep.notice');
+            . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:keep.notice');
         return $cNotice;
     }
 
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index c396831808c01a10682c876383a618701267cd8e..8550f9bd5b366c5524b0a3b2772e6e43f9fe9ac8 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -823,7 +823,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                 $viewLink = '';
                 if (!VersionState::cast($this->getPageLayoutController()->pageinfo['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) {
                     $onClick = BackendUtility::viewOnClick($this->id, '', BackendUtility::BEgetRootLine($this->id), '', '', ('&L=' . $lP));
-                    $viewLink = '<a href="#" class="btn btn-default btn-sm" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">' . $this->iconFactory->getIcon('actions-view', Icon::SIZE_SMALL)->render() . '</a>';
+                    $viewLink = '<a href="#" class="btn btn-default btn-sm" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">' . $this->iconFactory->getIcon('actions-view', Icon::SIZE_SMALL)->render() . '</a>';
                 }
                 // Language overlay page header:
                 if ($lP) {
@@ -1535,12 +1535,12 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                     $params = '&cmd[tt_content][' . $row['uid'] . '][delete]=1';
                     $confirm = $this->getLanguageService()->getLL('deleteWarning')
                         . BackendUtility::translationCount('tt_content', $row['uid'], (' '
-                                                                                       . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.translationsOfRecord')));
+                                                                                       . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.translationsOfRecord')));
                     $out .= '<a class="btn btn-default t3js-modal-trigger" href="' . htmlspecialchars(BackendUtility::getLinkToDataHandlerAction($params)) . '"'
                         . ' data-severity="warning"'
-                        . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_alt_doc.xlf:label.confirm.delete_record.title')) . '"'
+                        . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')) . '"'
                         . ' data-content="' . htmlspecialchars($confirm) . '" '
-                        . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:cancel')) . '"'
+                        . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')) . '"'
                         . ' title="' . htmlspecialchars($this->getLanguageService()->getLL('deleteItem')) . '">'
                         . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</a>';
                     if ($out && $this->getBackendUser()->doesUserHaveAccess($this->pageinfo, Permission::CONTENT_EDIT)) {
@@ -1651,7 +1651,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
             $hiddenHeaderNote = '';
             // If header layout is set to 'hidden', display an accordant note:
             if ($row['header_layout'] == 100) {
-                $hiddenHeaderNote = ' <em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.hidden')) . ']</em>';
+                $hiddenHeaderNote = ' <em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.hidden')) . ']</em>';
             }
             $outHeader = $row['date']
                 ? htmlspecialchars($this->itemLabels['date'] . ' ' . BackendUtility::date($row['date'])) . '<br />'
@@ -1782,7 +1782,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                         if (!empty($label)) {
                             $out .= $this->linkEditContent('<strong>' . htmlspecialchars($this->getLanguageService()->sL($label)) . '</strong>', $row) . '<br />';
                         } else {
-                            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue'), $row['list_type']);
+                            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue'), $row['list_type']);
                             $out .= '<span class="label label-warning">' . htmlspecialchars($message) . '</span>';
                         }
                     } elseif (!empty($row['select_key'])) {
@@ -1808,7 +1808,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                         }
                     } else {
                         $message = sprintf(
-                            $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue'),
+                            $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue'),
                             $row['CType']
                         );
                         $out .= '<span class="label label-warning">' . htmlspecialchars($message) . '</span>';
diff --git a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
index 843aca48529421c86002802366d5dd86cfe6dfdb..8e2f25d7145acab16a43ade27cbd1cd6336ea562 100644
--- a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
+++ b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
@@ -105,7 +105,7 @@ class BackendLayoutWizardElement extends AbstractFormElement
         $content = implode(LF, $markup);
         $this->resultArray['html'] = $content;
         $this->resultArray['requireJsModules'][] = 'TYPO3/CMS/Backend/GridEditor';
-        $this->resultArray['additionalInlineLanguageLabelFiles'][] = 'EXT:lang/locallang_wizards.xlf';
+        $this->resultArray['additionalInlineLanguageLabelFiles'][] = 'EXT:lang/Resources/Private/Language/locallang_wizards.xlf';
         $this->resultArray['additionalInlineLanguageLabelFiles'][]
             = 'EXT:backend/Resources/Private/Language/locallang.xlf';
 
diff --git a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
index 1b81d0913a3ff3f3405a5303e33cba216e548229..2aa6a33624f14b18e5c422d7b03f47b2f8c75fe0 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
@@ -12,7 +12,7 @@
 		</div>
 		<div class="module-docheader-bar-column-right">
 			<f:if condition="{docHeader.metaInformation.recordInformation}">
-				<span class="typo3-docheader-pagePath"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw></span> <f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
+				<span class="typo3-docheader-pagePath"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path" />: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw></span> <f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
 			</f:if>
 		</div>
 	</div>
@@ -24,4 +24,4 @@
 			<f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}" />
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
index dc8f70f1417d9ee80f8aeaa36610108283ba751d..37cfdb906d9f12754172ef8ba44a85b23a04ee49 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/History.html
@@ -1,24 +1,24 @@
 {namespace be = TYPO3\CMS\Backend\ViewHelpers}
 
-<h2>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:changes')}</h2>
+<h2>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:changes')}</h2>
 <div>
-	<f:be.infobox state="-1">{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:differenceMsg') -> f:format.raw()}</f:be.infobox>
+	<f:be.infobox state="-1">{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:differenceMsg') -> f:format.raw()}</f:be.infobox>
 	<table class="table table-striped table-hover table-vertical-top" id="typo3-history">
 		<thead>
 		<tr>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:rollback')}</th>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:time')}</th>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:age')}</th>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:user')}</th>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:tableUid')}</th>
-			<th>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:differences')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:rollback')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:time')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:age')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:user')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:tableUid')}</th>
+			<th>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:differences')}</th>
 			<th>&nbsp;</th>
 		</tr>
 		</thead>
 		<tbody>
 		<f:for each="{history}" as="historyRow" key="key">
 			<tr>
-				<td><span><span title="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:sumUpChanges')}">
+				<td><span><span title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:sumUpChanges')}">
 					{historyRow.rollbackLink -> f:format.raw()}
 				</span></span></td>
 				<td>{historyRow.time}</td>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
index 98ec610eb0a26a04d88d38064690f87d29af57c9..07090de9af334e40ab1f261256dcbbf22f361464 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/MultipleDiff.html
@@ -1,4 +1,4 @@
-<h2>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:mergedDifferences')}</h2>
+<h2>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:mergedDifferences')}</h2>
 <div>
 	<f:if condition="{revertAllLink}">
 		<f:then>
@@ -14,10 +14,10 @@
 						<div
 							style="padding-left:10px;border-left:5px solid darkgray;border-bottom:1px dotted darkgray;padding-bottom:2px;">
 							<f:if condition="{historyRow.insertDelete} == 'delete'">
-								<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:delete')}</strong><br/>
+								<strong>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:delete')}</strong><br/>
 							</f:if>
 							<f:if condition="{historyRow.insertDelete} == 'insert'">
-								<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:insert')}</strong><br/>
+								<strong>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:insert')}</strong><br/>
 							</f:if>
 							<f:if condition="{historyRow.differences}">
 								<f:render partial="RecordHistory/Diff" arguments="{differences: historyRow.differences}"/>
@@ -28,7 +28,7 @@
 			</div>
 		</f:then>
 		<f:else>
-			{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:noDifferences')}
+			{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:noDifferences')}
 		</f:else>
 	</f:if>
 </div>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
index e3bc4506dc99837437518e93caccaf56021115ee..5a84e1a68d1989a336fee612845e2adbbac3e942 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/RecordHistory/Settings.html
@@ -1,6 +1,6 @@
 <div>
 	<f:if condition="{singleElement}">
-		<strong>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:elementHistory')}</strong><br/>
+		<strong>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:elementHistory')}</strong><br/>
 		<f:if condition="{fullHistoryLink}">
 			<span class="btn btn-default" style="margin-bottom: 5px;"><f:format.raw>{fullHistoryLink}</f:format.raw></span>
 		</f:if>
@@ -10,11 +10,11 @@
 		<div class="row">
 			<div class="col-sm-12 col-md-6 col-lg-4">
 				<div class="panel panel-default">
-					<div class="panel-heading">{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:settings')}</div>
+					<div class="panel-heading">{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:settings')}</div>
 					<table class="table">
 						<f:for each="{settings}" as="values" key="key">
 							<tr>
-								<td>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{key}')}</td>
+								<td>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{key}')}</td>
 								<td>
 									<div class="btn-group">
 										<button class="btn btn-default dropdown-toggle" type="button" id="copymodeSelector"
@@ -27,8 +27,8 @@
 																<f:for each="{values}" as="singleValue" key="singleKey">
 																	<f:if condition="{currentSelectionValue} == {singleKey}">
 																		<f:then>
-																			<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
-																				<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+																			<f:if condition="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+																				<f:then>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
 																				<f:else>{singleValue.value}</f:else>
 																			</f:if>
 																		</f:then>
@@ -39,8 +39,8 @@
 																<f:for each="{values}" as="singleValue" iteration="iterator">
 																	<f:if condition="{iterator.isFirst}">
 																		<f:then>
-																			<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
-																				<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+																			<f:if condition="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+																				<f:then>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
 																				<f:else>{singleValue.value}</f:else>
 																			</f:if>
 																		</f:then>
@@ -57,8 +57,8 @@
 											<f:for each="{values}" as="singleValue" key="singleKey">
 												<li><a href="#"
 															 onclick="document.settings.method='POST'; document.settings.action={singleValue.scriptUrl}; document.settings.submit()">
-													<f:if condition="{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}">
-														<f:then>{f:translate(key: 'LLL:EXT:lang/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
+													<f:if condition="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}">
+														<f:then>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_show_rechis.xlf:{singleValue.value}')}</f:then>
 														<f:else>{singleValue.value}</f:else>
 													</f:if>
 												</a></li>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/File/EditFile.html b/typo3/sysext/backend/Resources/Private/Templates/File/EditFile.html
index f505c43407569a51be1f10ed4c4511ae52b88cb7..d763dee5a1c1b190336f4dbfbb3f8ea0cf57f6e2 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/File/EditFile.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/File/EditFile.html
@@ -1,5 +1,5 @@
 <form action="{moduleUrlTceFile}" method="post" id="EditFileController" name="editform">
-    <h1><f:translate key="LLL:EXT:lang/locallang_core.xlf:file_edit.php.pagetitle" /> {fileName}</h1>
+    <h1><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.pagetitle" /> {fileName}</h1>
     <div id="c-edit">
         <textarea rows="30" name="file[editfile][0][data]" wrap="off" class="form-control text-monospace t3js-enable-tab">{fileContent}</textarea>
         <input type="hidden" name="file[editfile][0][target]" value="{uid}" />
@@ -8,7 +8,7 @@
     <br />
     <f:if condition="{extList}">
         <f:format.raw>
-            <f:translate key="LLL:EXT:lang/locallang_core.xlf:file_edit.php.coundNot" arguments="{0: extList}" />
+            <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.coundNot" arguments="{0: extList}" />
         </f:format.raw>
     </f:if>
 </form>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/File/RenameFile.html b/typo3/sysext/backend/Resources/Private/Templates/File/RenameFile.html
index e6a1441f8f1838ec448df036ed4201edb0c466e6..91d739a241e3330477d4a6602e85e313ed9b5e6c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/File/RenameFile.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/File/RenameFile.html
@@ -1,4 +1,4 @@
-<h1><f:translate key="LLL:EXT:lang/locallang_core.xlf:file_rename.php.pagetitle" /></h1>
+<h1><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_rename.php.pagetitle" /></h1>
 <div>
     <form action="{moduleUrlTceFile}" method="post" name="editform" role="form">
         <div class="form-group">
@@ -6,9 +6,9 @@
             <input type="hidden" name="file[rename][0][data]" value="{fileIdentifier}" />
         </div>
         <div class="form-group">
-            <input class="btn btn-primary" type="submit" value="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:file_rename.php.submit')}" />
-            <input class="btn btn-danger" type="submit" value="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.cancel')}" onclick="backToList(); return false;" />
+            <input class="btn btn-primary" type="submit" value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_rename.php.submit')}" />
+            <input class="btn btn-danger" type="submit" value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.cancel')}" onclick="backToList(); return false;" />
             <input type="hidden" name="redirect" value="{returnUrl}" />
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
index 9090db7f7ae96fa2ac277beea3026b65916fc663..b49b4492ce89ff3a7e3035d72e227960429d32b6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/NewContentElement/Main.html
@@ -3,9 +3,9 @@
 	<f:then>
 		<f:form action="" name="editForm" id="NewContentElementController">
 			<f:form.hidden name="defValues" value=""/>
-			<h1>{f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:newContentElement')}</h1>
+			<h1>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:newContentElement')}</h1>
 			<f:if condition="{onClickEvent} == ''">
-				<h2>{f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:1_selectType')}</h2>
+				<h2>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:1_selectType')}</h2>
 			</f:if>
 			<div>
 				<p>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:sel1')}</p>
@@ -14,7 +14,7 @@
 
 			<f:if condition="{onClickEvent} == ''">
 				<div><a name="sel2"></a></div>
-				<h2>{f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:2_selectPosition') -> f:format.htmlspecialchars()}</h2>
+				<h2>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:2_selectPosition') -> f:format.htmlspecialchars()}</h2>
 				<div>
 					<p>{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:sel2') ->
 						f:format.htmlspecialchars()}</p>
@@ -24,7 +24,7 @@
 		</f:form>
 	</f:then>
 	<f:else>
-		<h1>{f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:newContentElement')}</h1>
+		<h1>{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:newContentElement')}</h1>
 	</f:else>
 </f:if>
 </html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
index 2ba22f104696f433e9d984c420f94fc8bc37dbf1..19010d37cac094f56b91158a984314d44ba57691 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
@@ -1,5 +1,5 @@
 <h3 class="dropdown-headline">
-    {f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:toolbarItems.help', htmlEscape: 'FALSE')}
+    {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.help', htmlEscape: 'FALSE')}
 </h3>
 <hr>
 <div class="dropdown-table">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
index b638733ac602cc18016fccb92af186f432fabcd2..67f9a2af4611a136c676f044b7537b6ce6c2c7d8 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
@@ -1,8 +1,8 @@
 <span class="toolbar-item-avatar">{icon -> f:format.raw()}</span>
 <f:if condition="{switchUserMode}">
     <f:then>
-        <span class="toolbar-item-name" title="{f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:switchtouser', htmlEscape: 'TRUE')} {username}">
-            {f:translate(key: 'LLL:EXT:lang/locallang_misc.xlf:switchtousershort', htmlEscape: 'FALSE')}
+        <span class="toolbar-item-name" title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtouser', htmlEscape: 'TRUE')} {username}">
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtousershort', htmlEscape: 'FALSE')}
             {f:if(condition: '{realName}', then: '{realname} ({username})', else: '{username}')}
         </span>
     </f:then>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
index e2f62cd8a109333dbf9c5a43c91a2497895c44cd..624b8a8c3325d3754dee0a2066f7d36d8dd816d2 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
@@ -1,7 +1,7 @@
 {namespace core = TYPO3\CMS\Core\ViewHelpers}
 
 <h3 class="dropdown-headline">
-    {f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.user')}
+    {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.user')}
 </h3>
 <hr>
 <f:if condition="{modules}">
@@ -29,10 +29,10 @@
     {icon -> f:format.raw()}
     <f:if condition="{switchUserMode}">
         <f:then>
-            {f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:buttons.exit', htmlEscape: 'FALSE')}
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.exit', htmlEscape: 'FALSE')}
         </f:then>
         <f:else>
-            {f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:buttons.logout', htmlEscape: 'FALSE')}
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.logout', htmlEscape: 'FALSE')}
         </f:else>
     </f:if>
 </f:link.typolink>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Wizards/ImageManipulationWizard.html b/typo3/sysext/backend/Resources/Private/Templates/Wizards/ImageManipulationWizard.html
index 4abd0e944866aeed088ec03ef9c9ef235b694871..24a4ffd3fad81c35c793ce7d6fd6eaa26953e829 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Wizards/ImageManipulationWizard.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Wizards/ImageManipulationWizard.html
@@ -6,25 +6,25 @@
 			<div class="modal-panel-sidebar modal-panel-sidebar-right">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-					<h4 class="modal-title"><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.image-manipulation" /></h4>
+					<h4 class="modal-title"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.image-manipulation" /></h4>
 				</div>
 				<div class="modal-body">
 					<form class="form">
 						<div class="form-group">
-							<label><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.image-title" />:</label>
+							<label><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.image-title" />:</label>
 							<p>{f:if(condition:image.properties.title, then:image.properties.title, else:image.name)}</p>
 						</div>
 						<div class="form-group">
-							<label><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.original-dimensions" />:</label>
+							<label><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.original-dimensions" />:</label>
 							<p>{image.properties.width} × {image.properties.height}</p>
 						</div>
 
 						<f:if condition="{ratios}">
 						<div class="form-group">
-							<label for="ratio"><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.aspect-ratio" /></label>
+							<label for="ratio"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.aspect-ratio" /></label>
 							<div class="ratio-buttons t3js-ratio-buttons" data-toggle="buttons">
 								<f:for each="{ratios}" as="ratio" key="key" iteration="iteration">
-									<label class="btn btn-default" data-method="setAspectRatio" data-option="{key}" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.set-aspect-ratio')}"><input class="sr-only" id="aspestRatio{iteration.cycle}" name="aspestRatio" value="{key}" type="radio"> <span>{ratio}</span></label>
+									<label class="btn btn-default" data-method="setAspectRatio" data-option="{key}" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.set-aspect-ratio')}"><input class="sr-only" id="aspestRatio{iteration.cycle}" name="aspestRatio" value="{key}" type="radio"> <span>{ratio}</span></label>
 								</f:for>
 							</div>
 						</div>
@@ -32,54 +32,54 @@
 
 						<f:if condition="{zoom}">
 						<div class="form-group t3js-setting-zoom">
-							<label for="zoom"><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.zoom" /></label>
+							<label for="zoom"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.zoom" /></label>
 							<div class="btn-group">
-								<button class="btn btn-default" data-method="zoom" data-option="0.1" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.zoom-in')}"><i class="fa fa-search-plus"></i></button>
-								<button class="btn btn-default" data-method="zoom" data-option="-0.1" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.zoom-out')}"><i class="fa fa-search-minus"></i></button>
+								<button class="btn btn-default" data-method="zoom" data-option="0.1" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.zoom-in')}"><i class="fa fa-search-plus"></i></button>
+								<button class="btn btn-default" data-method="zoom" data-option="-0.1" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.zoom-out')}"><i class="fa fa-search-minus"></i></button>
 							</div>
 						</div>
 						</f:if>
 
 						<div class="form-group">
-							<label><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.selection" /></label>
+							<label><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.selection" /></label>
 							<div class="table-fit-block">
 								<table class="table table-no-borders table-transparent t3js-image-manipulation-info">
 									<tr>
 										<td>
-											<f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-x"/>
+											<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-x"/>
 										</td>
 										<td class="t3js-image-manipulation-info-crop-x"></td>
 									</tr>
 									<tr>
 										<td>
-											<f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-y"/>
+											<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-y"/>
 										</td>
 										<td class="t3js-image-manipulation-info-crop-y"></td>
 									</tr>
 									<tr>
 										<td>
-											<f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-width"/>
+											<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-width"/>
 										</td>
 										<td class="t3js-image-manipulation-info-crop-width"></td>
 									</tr>
 									<tr>
 										<td>
-											<f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.crop-height"/>
+											<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.crop-height"/>
 										</td>
 										<td class="t3js-image-manipulation-info-crop-height"></td>
 									</tr>
 								</table>
 							</div>
 							<div class="form-group">
-								<button class="btn btn-default" data-method="reset" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.reset')}"><i class="fa fa-refresh"></i> {f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.reset')}</button>
+								<button class="btn btn-default" data-method="reset" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}"><i class="fa fa-refresh"></i> {f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.reset')}</button>
 							</div>
 						</div>
 
 					</form>
 				</div>
 				<div class="modal-footer">
-					<button class="btn btn-default" data-method="dismiss" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.cancel')}"><i class="fa fa-remove"></i> {f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.cancel')}</button>
-					<button class="btn btn-default" data-method="save" title="{f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.accept')}"><i class="fa fa-check"></i> {f:translate(key:'LLL:EXT:lang/locallang_wizards.xlf:imwizard.accept')}</button>
+					<button class="btn btn-default" data-method="dismiss" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.cancel')}"><i class="fa fa-remove"></i> {f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.cancel')}</button>
+					<button class="btn btn-default" data-method="save" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.accept')}"><i class="fa fa-check"></i> {f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.accept')}</button>
 				</div>
 			</div>
 
@@ -95,8 +95,8 @@
 	</f:then>
 	<f:else>
 		<div class="alert alert-danger">
-			<h4 class="alert-title"><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.no-image-found" /></h4>
-			<p class="alert-message"><f:translate key="LLL:EXT:lang/locallang_wizards.xlf:imwizard.no-image-found-message" /></p>
+			<h4 class="alert-title"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-found" /></h4>
+			<p class="alert-message"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_wizards.xlf:imwizard.no-image-found-message" /></p>
 		</div>
 	</f:else>
 </f:if>
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
index b8fc266bf9f6ac5367724e4ee16698fc02c3b21b..ae7f96cb5f482a06b20a425707087db6972deb9d 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
@@ -69,13 +69,13 @@ class DatabaseSystemLanguageRowsTest extends UnitTestCase
             'systemLanguageRows' => [
                 -1 => [
                     'uid' => -1,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'flags-multiple',
                 ],
                 0 => [
                     'uid' => 0,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'empty-empty',
                 ],
@@ -156,13 +156,13 @@ class DatabaseSystemLanguageRowsTest extends UnitTestCase
         $expected['systemLanguageRows'] = [
             -1 => [
                 'uid' => -1,
-                'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages',
+                'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages',
                 'iso' => 'DEF',
                 'flagIconIdentifier' => 'flags-multiple',
             ],
             0 => [
                 'uid' => 0,
-                'title' => 'foo (LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage)',
+                'title' => 'foo (LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage)',
                 'iso' => 'DEF',
                 'flagIconIdentifier' => 'empty-empty',
             ],
@@ -215,13 +215,13 @@ class DatabaseSystemLanguageRowsTest extends UnitTestCase
         $expected['systemLanguageRows'] = [
             -1 => [
                 'uid' => -1,
-                'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages',
+                'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages',
                 'iso' => 'DEF',
                 'flagIconIdentifier' => 'flags-multiple',
             ],
             0 => [
                 'uid' => 0,
-                'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage',
+                'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage',
                 'iso' => 'DEF',
                 'flagIconIdentifier' => 'flags-uk',
             ],
@@ -273,13 +273,13 @@ class DatabaseSystemLanguageRowsTest extends UnitTestCase
             'systemLanguageRows' => [
                 -1 => [
                     'uid' => -1,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'flags-multiple',
                 ],
                 0 => [
                     'uid' => 0,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'empty-empty',
                 ],
@@ -340,13 +340,13 @@ class DatabaseSystemLanguageRowsTest extends UnitTestCase
             'systemLanguageRows' => [
                 -1 => [
                     'uid' => -1,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:multipleLanguages',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:multipleLanguages',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'flags-multiple',
                 ],
                 0 => [
                     'uid' => 0,
-                    'title' => 'LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage',
+                    'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage',
                     'iso' => 'DEF',
                     'flagIconIdentifier' => 'empty-empty',
                 ],
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
index 16d2888e82c62fb8e4ae2644dc5b95b8dc1002cc..8d21295cae66a1fdb9982f7b2b04cffdd4cd0450 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
@@ -366,7 +366,7 @@ class TcaRecordTitleTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
             ->willReturn(' min| hrs| days| yrs| min| hour| day| year');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
         $GLOBALS['EXEC_TIME'] = 978912061;
@@ -783,7 +783,7 @@ class TcaRecordTitleTest extends UnitTestCase
         $languageService->sL(Argument::cetera())->willReturnArgument(0)->shouldBeCalled();
 
         $expected = $input;
-        $expected['recordTitle'] = 'LLL:EXT:lang/locallang_common.xlf:yes';
+        $expected['recordTitle'] = 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes';
         $this->assertSame($expected, $this->subject->addData($input));
     }
 
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
index a26b9f0d13fa4b3bdcf53224d05d543d24db907e..84371cf129e793e392594ef451e59ce6339b88ad 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
@@ -245,7 +245,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
 
         $languageService->sL('aLabel')->shouldBeCalled()->willReturn('translated');
 
@@ -366,7 +366,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
         $languageService->sL(Argument::containingString('INVALID VALUE'))->willReturnArgument(0);
 
         $languageService->sL('aTitle')->shouldBeCalled()->willReturnArgument(0);
@@ -432,7 +432,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
 
         $languageService->sL('aLabel')->shouldBeCalled()->willReturnArgument(0);
 
@@ -735,7 +735,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.allow')->shouldBeCalled()->willReturn('allowMe');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.allow')->shouldBeCalled()->willReturn('allowMe');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         $expectedItems = [
@@ -806,7 +806,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.deny')->shouldBeCalled()->willReturn('denyMe');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.deny')->shouldBeCalled()->willReturn('denyMe');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         $expectedItems = [
@@ -892,7 +892,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.allow')->shouldBeCalled()->willReturn('allowMe');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.allow')->shouldBeCalled()->willReturn('allowMe');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         $expectedItems = [
@@ -984,7 +984,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.deny')->shouldBeCalled()->willReturn('denyMe');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.deny')->shouldBeCalled()->willReturn('denyMe');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         $expectedItems = [
@@ -1992,13 +1992,13 @@ class TcaSelectItemsTest extends UnitTestCase
         $expected = $input;
         $expected['processedTca']['columns']['aField']['config']['items'] = [
             0 => [
-                0 => 'aPrefix[LLL:EXT:lang/locallang_core.xlf:labels.no_title]',
+                0 => 'aPrefix[LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title]',
                 1 => 1,
                 2 => 'default-not-found',
                 3 => null,
             ],
             1 => [
-                0 => 'aPrefix[LLL:EXT:lang/locallang_core.xlf:labels.no_title]',
+                0 => 'aPrefix[LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title]',
                 1 => 2,
                 2 => 'default-not-found',
                 3 => null,
@@ -2442,7 +2442,7 @@ class TcaSelectItemsTest extends UnitTestCase
         /** @var LanguageService|ObjectProphecy $languageService */
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         /** @var BackendUserAuthentication|ObjectProphecy $backendUserProphecy */
@@ -2851,7 +2851,7 @@ class TcaSelectItemsTest extends UnitTestCase
         $GLOBALS['LANG'] = $languageService->reveal();
         $languageService->sL('aLabel')->willReturnArgument(0);
         $languageService->sL('labelOverride')->shouldBeCalled()->willReturnArgument(0);
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
 
         $expected = $input;
         $expected['databaseRow']['aField'] = ['aValue'];
@@ -3184,7 +3184,7 @@ class TcaSelectItemsTest extends UnitTestCase
     {
         $languageService = $this->prophesize(LanguageService::class);
         $GLOBALS['LANG'] = $languageService->reveal();
-        $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
+        $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue')->willReturn('INVALID VALUE "%s"');
         $languageService->sL(Argument::cetera())->willReturnArgument(0);
 
         $relationHandlerProphecy = $this->prophesize(RelationHandler::class);
diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index 32f4e4a1dbdcb81ea0baf4988ca0f07c3e8d0c19..c35405057c73097159e147f0998de1cb314f3bc5 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -311,12 +311,12 @@ abstract class AbstractController extends ActionController
     protected function createPageDepthOptions()
     {
         $options = [
-            0 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_0', 'lang'),
-            1 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_1', 'lang'),
-            2 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_2', 'lang'),
-            3 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_3', 'lang'),
-            4 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_4', 'lang'),
-            999 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi', 'lang')
+            0 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0', 'lang'),
+            1 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1', 'lang'),
+            2 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2', 'lang'),
+            3 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3', 'lang'),
+            4 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4', 'lang'),
+            999 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi', 'lang')
         ];
         return $options;
     }
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
index c7438f2f5da1cd4d1f70c5851fec7084160c00ed..8bd5e80a4ff2601ddcc416c1701089c9499aab26 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
@@ -104,7 +104,7 @@
 
 	<f:if condition="{constraint.timeFrame} == 30">
 		<div class="form-group">
-			<label for="manualDateStart"><f:translate key="LLL:EXT:lang/locallang_common.xlf:from" /></label>
+			<label for="manualDateStart"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:from" /></label>
 			<div class="input-group input-group-sm">
 				<f:form.textfield
 						name="manualDateStart"
@@ -124,7 +124,7 @@
 		</div>
 
 		<div class="form-group">
-			<label for="manualDateStop"><f:translate key="LLL:EXT:lang/locallang_common.xlf:to" /></label>
+			<label for="manualDateStop"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:to" /></label>
 			<div class="input-group input-group-sm">
 				<f:form.textfield
 						name="manualDateStop"
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
index 35398ff96fe03860e42985c38184d951733c19a6..92978b67019c228c5738afd2fe9487e6c7929b37 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
@@ -147,7 +147,7 @@ class BackendUserActionController extends ActionController
             }
             if ($this->request->getControllerActionName() === 'compare') {
                 $addUserLink = BackendUtility::getModuleUrl('system_BeuserTxBeuser');
-                $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack');
+                $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack');
                 $icon = $this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL);
                 $addUserButton = $buttonBar->makeLinkButton()
                     ->setHref($addUserLink)
diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php b/typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php
index 7ae8b552e2759ffcb88980384f85281568660262..ebd49262a504f0b3617e70ebfe55b9b300747fa4 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php
@@ -49,7 +49,7 @@ class PermissionAjaxController
     public function __construct()
     {
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_mod_web_perm.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_mod_web_perm.xlf');
         // Configuration, variable assignment
         $this->conf['page'] = GeneralUtility::_POST('page');
         $this->conf['who'] = GeneralUtility::_POST('who');
diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionController.php b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
index bfbb4d3772905e80a0d2959832a50f3404f461b2..6317dedf09e57c9afdeb9b401d171326d9f4ac80 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
@@ -173,7 +173,7 @@ class PermissionController extends ActionController
             ])->buildBackendUri();
             $closeButton = $buttonBar->makeLinkButton()
                 ->setHref($closeUrl)
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                 ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon(
                     'actions-document-close',
                     Icon::SIZE_SMALL
@@ -182,7 +182,7 @@ class PermissionController extends ActionController
 
             // SAVE button:
             $saveButton = $buttonBar->makeInputButton()
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                 ->setName('tx_beuser_system_beusertxpermission[submit]')
                 ->setValue('Save')
                 ->setForm('PermissionControllerEdit')
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
index 51edba90382fcac232cac9a83b11703b3bd20cc0..608e9187eec23c8f0e450cf181b24d55b335930c 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
@@ -82,9 +82,9 @@ class RemoveUserViewHelper extends AbstractViewHelper
 
         return '<a class="btn btn-default t3js-modal-trigger" href="' . htmlspecialchars($url) . '"'
             . ' data-severity="warning"'
-            . ' data-title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_alt_doc.xlf:label.confirm.delete_record.title')) . '"'
+            . ' data-title="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')) . '"'
             . ' data-content="' . htmlspecialchars(LocalizationUtility::translate('confirm', 'beuser', [$backendUser->getUserName()])) . '" '
-            . ' data-button-close-text="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xlf:cancel')) . '"'
+            . ' data-button-close-text="' . htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')) . '"'
             . '>' . $iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</a>';
     }
 }
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
index 19f9fb28462228d607ed2f4868a46499b5e34f7e..78bca5705fa0007a7b3267d3a5a36d3cd259b5af 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
@@ -35,7 +35,7 @@
 							action="terminateBackendUserSession"
 							controller="BackendUser"
 							arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
-							data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:cancel\')}'}"
+							data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel\')}'}"
 						>
 							<core:icon identifier="actions-document-close" />
 							<f:translate key="endSession" />
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
index 93f513ffa04c00ed17f7dda370bc63f0a367352c..5ebcd84a29f51fdcf1810b5eaa18a28bafdfd94d 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
@@ -33,7 +33,7 @@
 					</f:comment>
 					<tr>
 						<td colspan="4">
-							<f:count subject="{backendUserGroups}" /> <f:translate key="LLL:EXT:lang/locallang_tca.xlf:be_groups" />s
+							<f:count subject="{backendUserGroups}" /> <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups" />s
 						</td>
 					</tr>
 				</tbody>
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index fd70e9b1a08bd689cf72016ec571e188040f26ee..31a9a86c55da0e56d28332d7390e2c9b68b4255f 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -305,7 +305,7 @@ class CategoryRegistry implements SingletonInterface
     {
         $fieldList = '';
         if (!isset($this->addedCategoryTabs[$tableName])) {
-            $fieldList .= '--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category, ';
+            $fieldList .= '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category, ';
             $this->addedCategoryTabs[$tableName] = $tableName;
         }
         $fieldList .= $fieldName;
@@ -330,7 +330,7 @@ class CategoryRegistry implements SingletonInterface
         // Makes sure to add more TCA to an existing structure
         if (isset($GLOBALS['TCA'][$tableName]['columns'])) {
             // Take specific label into account
-            $label = 'LLL:EXT:lang/locallang_tca.xlf:sys_category.categories';
+            $label = 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.categories';
             if (!empty($options['label'])) {
                 $label = $options['label'];
             }
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 6e7eb49163e82a3461fa8658abb903b95d73174b..dc19b3aa39b2c75933e59ba3b0e43bcff62863c4 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -2829,7 +2829,7 @@ class DataHandler
         $set = false;
         /** @var FlashMessage $message */
         $message = GeneralUtility::makeInstance(FlashMessage::class,
-            sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:error.invalidEmail'), $value),
+            sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.invalidEmail'), $value),
             '', // header is optional
             FlashMessage::ERROR,
             true // whether message should be stored in session
diff --git a/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php b/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
index 87ca7337cfbe558831faf6104c2380c80438167e..4d8774fa776a86d8c57c7db4a304a5502106a160 100644
--- a/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
+++ b/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
@@ -61,7 +61,7 @@ class ItemProcessingService
                 $fieldLabel = $languageService->sL($GLOBALS['TCA'][$table]['columns'][$field]['label']);
             }
             $message = sprintf(
-                $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.items_proc_func_error'),
+                $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.items_proc_func_error'),
                 $fieldLabel,
                 $exception->getMessage()
             );
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 5670a355dc2975b91cf9b09eb0b25a2722a74ebd..0238b05303bca3f1d4eb3df1801c28e281ba4bb3 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -90,7 +90,7 @@ class QueryView
     {
         $this->backendUserAuthentication = $GLOBALS['BE_USER'];
         $this->languageService = $GLOBALS['LANG'];
-        $this->languageService->includeLLFile('EXT:lang/locallang_t3lib_fullsearch.xlf');
+        $this->languageService->includeLLFile('EXT:lang/Resources/Private/Language/locallang_t3lib_fullsearch.xlf');
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
     }
 
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
index 2fca0911ac3c4f2ca7458248daaae660e14d3297..1f7218fde5632b4a01b03309e7388ff7901ebcd2 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
@@ -182,10 +182,10 @@ class ExtDirectApi
     {
         if (!empty($filterNamespaces)) {
             // Namespace error
-            $errorMessage = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ExtDirect.namespaceError'), __CLASS__, implode(',', $filterNamespaces));
+            $errorMessage = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ExtDirect.namespaceError'), __CLASS__, implode(',', $filterNamespaces));
         } else {
             // No namespace given
-            $errorMessage = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ExtDirect.noNamespace'), __CLASS__);
+            $errorMessage = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ExtDirect.noNamespace'), __CLASS__);
         }
         return $errorMessage;
     }
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index f125a33d6d18947c0a517484ae914846f51daabe..4fee28f82bb427c33c046a0928abce85860bf1f6 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -165,7 +165,7 @@ class FormProtectionFactory
             /** @var FlashMessage $flashMessage */
             $flashMessage = GeneralUtility::makeInstance(
                 FlashMessage::class,
-                $languageService->sL('LLL:EXT:lang/locallang_core.xlf:error.formProtection.tokenInvalid'),
+                $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.formProtection.tokenInvalid'),
                 '',
                 FlashMessage::ERROR,
                 !$isAjaxCall
diff --git a/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php b/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
index fd056c666392c157770579ff94cdf0e52029f103..c7ecc2874f805fa8013790d7ba9b14c741d38f42 100644
--- a/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
@@ -48,8 +48,8 @@ class BackendUserGroupIntegrityCheck
                     /** @var $flashMessage FlashMessage */
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.message'),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:error.backendUserGroupListTypeError.header'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.backendUserGroupListTypeError.message'),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:error.backendUserGroupListTypeError.header'),
                         FlashMessage::WARNING,
                         true
                     );
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index b4498ac0f936baaed6e86319f02aa11f7093ef91..323c73ec7369686ccc3e16dd5b6580abb2c4d299 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -79,6 +79,45 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface
      */
     public function getParsedData($fileReference, $languageKey, $charset = '', $errorMode = 0, $isLocalizationOverride = false)
     {
+        // @deprecated since TYPO3 v8, will be removed with TYPO3 v9
+        // this is a fallback to convert references to old 'lang' locallang files to the new location
+        if (strpos($fileReference, 'EXT:lang/locallang_') === 0) {
+            $mapping = [
+                'lang/locallang_alt_doc.xlf' => 'lang/Resources/Private/Language/locallang_alt_doc.xlf',
+                'lang/locallang_alt_intro.xlf' => 'lang/Resources/Private/Language/locallang_alt_intro.xlf',
+                'lang/locallang_browse_links.xlf' => 'lang/Resources/Private/Language/locallang_browse_links.xlf',
+                'lang/locallang_common.xlf' => 'lang/Resources/Private/Language/locallang_common.xlf',
+                'lang/locallang_core.xlf' => 'lang/Resources/Private/Language/locallang_core.xlf',
+                'lang/locallang_general.xlf' => 'lang/Resources/Private/Language/locallang_general.xlf',
+                'lang/locallang_login.xlf' => 'lang/Resources/Private/Language/locallang_login.xlf',
+                'lang/locallang_misc.xlf' => 'lang/Resources/Private/Language/locallang_misc.xlf',
+                'lang/locallang_mod_admintools.xlf' => 'lang/Resources/Private/Language/locallang_mod_admintools.xlf',
+                'lang/locallang_mod_file_list.xlf' => 'lang/Resources/Private/Language/locallang_mod_file_list.xlf',
+                'lang/locallang_mod_file.xlf' => 'lang/Resources/Private/Language/locallang_mod_file.xlf',
+                'lang/locallang_mod_help_about.xlf' => 'lang/Resources/Private/Language/locallang_mod_help_about.xlf',
+                'lang/locallang_mod_help_cshmanual.xlf' => 'lang/Resources/Private/Language/locallang_mod_help_cshmanual.xlf',
+                'lang/locallang_mod_help.xlf' => 'lang/Resources/Private/Language/locallang_mod_help.xlf',
+                'lang/locallang_mod_system.xlf' => 'lang/Resources/Private/Language/locallang_mod_system.xlf',
+                'lang/locallang_mod_usertools.xlf' => 'lang/Resources/Private/Language/locallang_mod_usertools.xlf',
+                'lang/locallang_mod_user_ws.xlf' => 'lang/Resources/Private/Language/locallang_mod_user_ws.xlf',
+                'lang/locallang_mod_web_func.xlf' => 'lang/Resources/Private/Language/locallang_mod_web_func.xlf',
+                'lang/locallang_mod_web_info.xlf' => 'lang/Resources/Private/Language/locallang_mod_web_info.xlf',
+                'lang/locallang_mod_web_list.xlf' => 'lang/Resources/Private/Language/locallang_mod_web_list.xlf',
+                'lang/locallang_mod_web.xlf' => 'lang/Resources/Private/Language/locallang_mod_web.xlf',
+                'lang/locallang_show_rechis.xlf' => 'lang/Resources/Private/Language/locallang_show_rechis.xlf',
+                'lang/locallang_t3lib_fullsearch.xlf' => 'lang/Resources/Private/Language/locallang_t3lib_fullsearch.xlf',
+                'lang/locallang_tca.xlf' => 'lang/Resources/Private/Language/locallang_tca.xlf',
+                'lang/locallang_tcemain.xlf' => 'lang/Resources/Private/Language/locallang_tcemain.xlf',
+                'lang/locallang_tsfe.xlf' => 'lang/Resources/Private/Language/locallang_tsfe.xlf',
+                'lang/locallang_tsparser.xlf' => 'lang/Resources/Private/Language/locallang_tsparser.xlf',
+                'lang/locallang_view_help.xlf' => 'lang/Resources/Private/Language/locallang_view_help.xlf',
+                'lang/locallang_wizards.xlf' => 'lang/Resources/Private/Language/locallang_wizards.xlf',
+            ];
+            $filePath = substr($fileReference, 4);
+            GeneralUtility::deprecationLog('There is a reference to "' . $fileReference . '", which has been moved to "EXT:' . $mapping[$filePath] . '". This fallback will be removed with TYPO3 v9.');
+            $fileReference = 'EXT:' . $mapping[$filePath];
+        }
+
         $hash = md5($fileReference . $languageKey . $charset);
         $this->errorMode = $errorMode;
 
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index c08278972622c5b0577a61e4cf792e4d0586343d..98e049efc19164a02a161b4c15feb76ee47489cf 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -1298,8 +1298,8 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
 
         // Add language labels for ExtDirect
         $this->addInlineLanguageLabelArray([
-            'extDirect_timeoutHeader'  => 'LLL:EXT:lang/locallang_misc.xlf:extDirect_timeoutHeader',
-            'extDirect_timeoutMessage' => 'LLL:EXT:lang/locallang_misc.xlf:extDirect_timeoutMessage'
+            'extDirect_timeoutHeader'  => 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:extDirect_timeoutHeader',
+            'extDirect_timeoutMessage' => 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:extDirect_timeoutMessage'
         ], true);
 
         $token = ($api = '');
diff --git a/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php b/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
index dd33385dd12d7881b2b4ed21d029b5a89af900de..4a10f68df307ea1cb03c42f15d5bedebbf7e0689 100644
--- a/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
+++ b/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
@@ -76,7 +76,7 @@ class FileInfoHook
             $content = '';
             if ($file->isMissing()) {
                 $content .= '<span class="label label-danger label-space-right">'
-                    . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                    . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                     . '</span>';
             }
             if ($previewImage) {
@@ -88,11 +88,11 @@ class FileInfoHook
             $content .= '<strong>' . htmlspecialchars($file->getName()) . '</strong>';
             $content .= ' (' . htmlspecialchars(GeneralUtility::formatSize($file->getSize())) . 'bytes)<br />';
             $content .= BackendUtility::getProcessedValue('sys_file', 'type', $file->getType()) . ' (' . $file->getMimeType() . ')<br />';
-            $content .= htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_misc.xlf:fileMetaDataLocation')) . ': ';
+            $content .= htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:fileMetaDataLocation')) . ': ';
             $content .= htmlspecialchars($file->getStorage()->getName()) . ' - ' . htmlspecialchars($file->getIdentifier()) . '<br />';
             $content .= '<br />';
         } else {
-            $content = '<h2>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_misc.xlf:fileMetaErrorInvalidRecord')) . '</h2>';
+            $content = '<h2>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:fileMetaErrorInvalidRecord')) . '</h2>';
         }
 
         return $content;
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
index 8d041f59849b66b95e5b584685c18084fe9ca69c..f524c46864f28f9624142c5ad2b5a3170d35f907 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileInlineLabelService.php
@@ -80,7 +80,7 @@ class UserFileInlineLabelService
             if ((string)$value === '') {
                 continue;
             }
-            $labelText = LocalizationUtility::translate('LLL:EXT:lang/locallang_tca.xlf:sys_file.' . $field, 'lang');
+            $labelText = LocalizationUtility::translate('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.' . $field, 'lang');
             $title[] = '<dt>' . htmlspecialchars($labelText) . '</dt>' . '<dd>' . $value . '</dd>';
         }
         $params['title'] = '<dl>' . implode('', $title) . '</dl>';
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserStorageCapabilityService.php b/typo3/sysext/core/Classes/Resource/Service/UserStorageCapabilityService.php
index f520769c05710e0333900d42effb191bf47515ad..0e9356fbe2eb12040c707f07085d4ad02d7e51c5 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserStorageCapabilityService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserStorageCapabilityService.php
@@ -52,8 +52,8 @@ class UserStorageCapabilityService
                 $lang = $GLOBALS['LANG'];
                 $message = GeneralUtility::makeInstance(
                     FlashMessage::class,
-                    $lang->sL('LLL:EXT:lang/locallang_core.xlf:warning.message.storage_is_no_public'),
-                    $lang->sL('LLL:EXT:lang/locallang_core.xlf:warning.header.storage_is_no_public'),
+                    $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.message.storage_is_no_public'),
+                    $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.header.storage_is_no_public'),
                     FlashMessage::WARNING
                 );
 
diff --git a/typo3/sysext/core/Classes/Resource/Utility/BackendUtility.php b/typo3/sysext/core/Classes/Resource/Utility/BackendUtility.php
index 59ced1042514e4aabd9036faf6707da8f35662d9..d3f967204e23688f1ca05b874a766c9a2979738a 100644
--- a/typo3/sysext/core/Classes/Resource/Utility/BackendUtility.php
+++ b/typo3/sysext/core/Classes/Resource/Utility/BackendUtility.php
@@ -41,10 +41,10 @@ class BackendUtility
         /** @var FlashMessage $flashMessage */
         $flashMessage = GeneralUtility::makeInstance(
             FlashMessage::class,
-            $lang->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing_text') .
+            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing_text') .
             ' <abbr title="' . htmlspecialchars($file->getStorage()->getName() . ' :: ' . $file->getIdentifier()) . '">' .
             htmlspecialchars($file->getName()) . '</abbr>',
-            $lang->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'),
+            $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'),
             FlashMessage::ERROR
         );
 
diff --git a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
index 13f37eb1783f66a574d173ac26dbcb959441cb37..dfec37d4e2578f2ea929b3f988cdeb4cb29e8dfd 100644
--- a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
+++ b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
@@ -39,7 +39,7 @@ class ListUtility
             $name = $folder->getName();
             $role = $folder->getRole();
             if ($role !== FolderInterface::ROLE_DEFAULT) {
-                $tempName = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:role_folder_' . $role));
+                $tempName = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:role_folder_' . $role));
                 if (!empty($tempName) && ($tempName !== $name)) {
                     // Set new name and append original name
                     $name = $tempName . ' (' . $name . ')';
diff --git a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
index 73f492e7a8019484f0f82aae511131863f2cc749..5c2f209f7a1dbf148580eb69bf66824feaf2e77f 100644
--- a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
+++ b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
@@ -135,7 +135,7 @@ class ConfigurationForm extends ExtendedTemplateService
         }
         $content .= $addFields;
         $content .= $printFields;
-        $content .= '<input class="btn btn-default" type="submit" name="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_tsfe.xlf:update')) . '" id="configuration-submit-' . htmlspecialchars($extKey) . '" />';
+        $content .= '<input class="btn btn-default" type="submit" name="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tsfe.xlf:update')) . '" id="configuration-submit-' . htmlspecialchars($extKey) . '" />';
         $example = $this->ext_displayExample();
         $content .= $example ? '<hr/>' . $example : '';
         return $content;
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 36a97450274cf29364b17a23af939a9374271fa5..f0d517624eafa145c4531ee636f770665bf50f0e 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -1310,7 +1310,7 @@ class ExtendedTemplateService extends TemplateService
                             $userTyposcriptStyle = 'style="display:none;"';
                             $defaultTyposcriptStyle = '';
                         }
-                        $deleteTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.deleteTitle'));
+                        $deleteTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.deleteTitle'));
                         $deleteIcon = $iconFactory->getIcon('actions-edit-undo', Icon::SIZE_SMALL)->render();
                         $deleteIconHTML =
                             '<button type="button" class="btn btn-default t3js-toggle" data-toggle="undo" rel="' . $idName . '">'
@@ -1318,7 +1318,7 @@ class ExtendedTemplateService extends TemplateService
                                     . $deleteIcon
                                 . '</span>'
                             . '</button>';
-                        $editTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.editTitle'));
+                        $editTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.editTitle'));
                         $editIcon = $iconFactory->getIcon('actions-open', Icon::SIZE_SMALL)->render();
                         $editIconHTML =
                             '<button type="button" class="btn btn-default t3js-toggle" data-toggle="edit"  rel="' . $idName . '">'
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index 3ae1ef6b992933fb46b8f7d249bb4411ac0d9d98..d5c3b22e698e34e059392028c5bf616038425322 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -385,10 +385,10 @@ class ExtendedFileUtility extends BasicFileUtility
             $flashMessage = GeneralUtility::makeInstance(
                 FlashMessage::class,
                 sprintf(
-                    $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.fileNotFound'),
+                    $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.fileNotFound'),
                     $cmds['data']
                 ),
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.fileNotFound'),
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.fileNotFound'),
                 FlashMessage::ERROR,
                 true
             );
@@ -442,8 +442,8 @@ class ExtendedFileUtility extends BasicFileUtility
                     // render a message that the file has broken references
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.fileHasBrokenReferences'), count($brokenReferences)),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.fileHasBrokenReferences'),
+                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.fileHasBrokenReferences'), count($brokenReferences)),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.fileHasBrokenReferences'),
                         FlashMessage::INFO,
                         true
                     );
@@ -453,8 +453,8 @@ class ExtendedFileUtility extends BasicFileUtility
                     // render a message that the file could not be deleted
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.fileNotDeletedHasReferences'), $fileObject->getName()) . ' ' . implode(', ', $shortcutContent),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.fileNotDeletedHasReferences'),
+                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.fileNotDeletedHasReferences'), $fileObject->getName()) . ' ' . implode(', ', $shortcutContent),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.fileNotDeletedHasReferences'),
                         FlashMessage::WARNING,
                         true
                     );
@@ -470,8 +470,8 @@ class ExtendedFileUtility extends BasicFileUtility
                     // show the user that the file was deleted
                     $flashMessage = GeneralUtility::makeInstance(
                         FlashMessage::class,
-                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.fileDeleted'), $fileObject->getName()),
-                        $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.fileDeleted'),
+                        sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.fileDeleted'), $fileObject->getName()),
+                        $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.fileDeleted'),
                         FlashMessage::OK,
                         true
                     );
@@ -499,8 +499,8 @@ class ExtendedFileUtility extends BasicFileUtility
                         /** @var FlashMessage $flashMessage */
                         $flashMessage = GeneralUtility::makeInstance(
                             FlashMessage::class,
-                            sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.folderDeleted'), $fileObject->getName()),
-                            $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.folderDeleted'),
+                            sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.folderDeleted'), $fileObject->getName()),
+                            $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.folderDeleted'),
                             FlashMessage::OK,
                             true
                         );
@@ -573,8 +573,8 @@ class ExtendedFileUtility extends BasicFileUtility
             /** @var FlashMessage $flashMessage */
             $flashMessage = GeneralUtility::makeInstance(
                 FlashMessage::class,
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.description.folderNotDeletedHasFilesWithReferences'),
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:message.header.folderNotDeletedHasFilesWithReferences'),
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.folderNotDeletedHasFilesWithReferences'),
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.folderNotDeletedHasFilesWithReferences'),
                 FlashMessage::WARNING,
                 true
             );
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index cca1c0f232dce84a1884730aa10a0d4ebd71b4b3..aa0e72149c52a6f382157e9bbc74a61841508e99 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -774,7 +774,7 @@ return [
 							100 = ITEM
 							100 {
 								name = history
-								label = LLL:EXT:lang/locallang_misc.xlf:CM_history
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:CM_history
 								iconName = actions-document-history-open
 								displayCondition = canShowHistory != 0
 								callbackAction = openHistoryPopUp
@@ -789,7 +789,7 @@ return [
 							100 = ITEM
 							100 {
 								name = view
-								label = LLL:EXT:lang/locallang_core.xlf:cm.view
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view
 								iconName = actions-document-view
 								displayCondition = canBeViewed != 0
 								callbackAction = viewPage
@@ -798,7 +798,7 @@ return [
 							200 = ITEM
 							200 {
 								name = new
-								label = LLL:EXT:lang/locallang_core.xlf:cm.new
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.new
 								iconName = actions-page-new
 								displayCondition = canCreateNewPages != 0
 								callbackAction = newPageWizard
@@ -809,7 +809,7 @@ return [
 							400 = ITEM
 							400 {
 								name = history
-								label = LLL:EXT:lang/locallang_misc.xlf:CM_history
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:CM_history
 								iconName = actions-document-history-open
 								displayCondition = canShowHistory != 0
 								callbackAction = openHistoryPopUp
@@ -824,7 +824,7 @@ return [
 							100 = ITEM
 							100 {
 								name = view
-								label = LLL:EXT:lang/locallang_core.xlf:cm.view
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view
 								iconName = actions-document-view
 								displayCondition = canBeViewed != 0
 								callbackAction = viewPage
@@ -835,7 +835,7 @@ return [
 							300 = ITEM
 							300 {
 								name = disable
-								label = LLL:EXT:lang/locallang_common.xlf:disable
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:disable
 								iconName = actions-edit-hide
 								displayCondition = getRecord|hidden = 0 && canBeDisabledAndEnabled != 0
 								callbackAction = disablePage
@@ -844,7 +844,7 @@ return [
 							400 = ITEM
 							400 {
 								name = enable
-								label = LLL:EXT:lang/locallang_common.xlf:enable
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:enable
 								iconName = actions-edit-unhide
 								displayCondition = getRecord|hidden = 1 && canBeDisabledAndEnabled != 0
 								callbackAction = enablePage
@@ -853,7 +853,7 @@ return [
 							500 = ITEM
 							500 {
 								name = edit
-								label = LLL:EXT:lang/locallang_core.xlf:cm.edit
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.edit
 								iconName = actions-page-open
 								displayCondition = canBeEdited != 0
 								callbackAction = editPageProperties
@@ -862,7 +862,7 @@ return [
 							600 = ITEM
 							600 {
 								name = info
-								label = LLL:EXT:lang/locallang_core.xlf:cm.info
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info
 								iconName = actions-document-info
 								displayCondition = canShowInfo != 0
 								callbackAction = openInfoPopUp
@@ -871,7 +871,7 @@ return [
 							700 = ITEM
 							700 {
 								name = history
-								label = LLL:EXT:lang/locallang_misc.xlf:CM_history
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:CM_history
 								iconName = actions-document-history-open
 								displayCondition = canShowHistory != 0
 								callbackAction = openHistoryPopUp
@@ -881,12 +881,12 @@ return [
 
 							900 = SUBMENU
 							900 {
-								label = LLL:EXT:lang/locallang_core.xlf:cm.copyPasteActions
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copyPasteActions
 
 								100 = ITEM
 								100 {
 									name = new
-									label = LLL:EXT:lang/locallang_core.xlf:cm.new
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.new
 									iconName = actions-page-new
 									displayCondition = canCreateNewPages != 0
 									callbackAction = newPageWizard
@@ -897,7 +897,7 @@ return [
 								300 = ITEM
 								300 {
 									name = cut
-									label = LLL:EXT:lang/locallang_core.xlf:cm.cut
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut
 									iconName = actions-edit-cut
 									displayCondition = isInCutMode = 0 && canBeCut != 0 && isMountPoint != 1
 									callbackAction = enableCutMode
@@ -906,7 +906,7 @@ return [
 								400 = ITEM
 								400 {
 									name = cut
-									label = LLL:EXT:lang/locallang_core.xlf:cm.cut
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut
 									iconName = actions-edit-cut-release
 									displayCondition = isInCutMode = 1 && canBeCut != 0
 									callbackAction = disableCutMode
@@ -915,7 +915,7 @@ return [
 								500 = ITEM
 								500 {
 									name = copy
-									label = LLL:EXT:lang/locallang_core.xlf:cm.copy
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy
 									iconName = actions-edit-copy
 									displayCondition = isInCopyMode = 0
 									callbackAction = enableCopyMode
@@ -924,7 +924,7 @@ return [
 								600 = ITEM
 								600 {
 									name = copy
-									label = LLL:EXT:lang/locallang_core.xlf:cm.copy
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy
 									iconName = actions-edit-copy-release
 									displayCondition = isInCopyMode = 1
 									callbackAction = disableCopyMode
@@ -933,7 +933,7 @@ return [
 								700 = ITEM
 								700 {
 									name = pasteInto
-									label = LLL:EXT:lang/locallang_core.xlf:cm.pasteinto
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.pasteinto
 									iconName = actions-document-paste-into
 									displayCondition = getContextInfo|inCopyMode = 1 || getContextInfo|inCutMode = 1 && canBePastedInto != 0
 									callbackAction = pasteIntoNode
@@ -942,7 +942,7 @@ return [
 								800 = ITEM
 								800 {
 									name = pasteAfter
-									label = LLL:EXT:lang/locallang_core.xlf:cm.pasteafter
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.pasteafter
 									iconName = actions-document-paste-after
 									displayCondition = getContextInfo|inCopyMode = 1 || getContextInfo|inCutMode = 1 && canBePastedAfter != 0
 									callbackAction = pasteAfterNode
@@ -953,7 +953,7 @@ return [
 								1000 = ITEM
 								1000 {
 									name = delete
-									label = LLL:EXT:lang/locallang_core.xlf:cm.delete
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete
 									iconName = actions-edit-delete
 									displayCondition = canBeRemoved != 0 && isMountPoint != 1
 									callbackAction = removeNode
@@ -964,7 +964,7 @@ return [
 								1200 = ITEM
 								1200 {
 									name = clearCache
-									label = LLL:EXT:lang/locallang_core.xlf:labels.clear_cache
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clear_cache
 									iconName = actions-system-cache-clear
 									callbackAction = clearCacheOfPage
 								}
@@ -972,12 +972,12 @@ return [
 
 							1000 = SUBMENU
 							1000 {
-								label = LLL:EXT:lang/locallang_core.xlf:cm.branchActions
+								label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.branchActions
 
 								100 = ITEM
 								100 {
 									name = mountAsTreeroot
-									label = LLL:EXT:lang/locallang_core.xlf:cm.tempMountPoint
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.tempMountPoint
 									iconName = actions-pagetree-mountroot
 									displayCondition = canBeTemporaryMountPoint != 0 && isMountPoint = 0
 									callbackAction = mountAsTreeRoot
@@ -988,7 +988,7 @@ return [
 								300 = ITEM
 								300 {
 									name = expandBranch
-									label = LLL:EXT:lang/locallang_core.xlf:cm.expandBranch
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.expandBranch
 									iconName = actions-pagetree-expand
 									displayCondition =
 									callbackAction = expandBranch
@@ -997,7 +997,7 @@ return [
 								400 = ITEM
 								400 {
 									name = collapseBranch
-									label = LLL:EXT:lang/locallang_core.xlf:cm.collapseBranch
+									label = LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.collapseBranch
 									iconName = actions-pagetree-collapse
 									displayCondition =
 									callbackAction = collapseBranch
@@ -1027,12 +1027,12 @@ return [
 				sys_category.after = tt_content
 			}
 			mod.web_list.searchLevel.items {
-				-1 = EXT:lang/locallang_core.xlf:labels.searchLevel.infinite
-				0 = EXT:lang/locallang_core.xlf:labels.searchLevel.0
-				1 = EXT:lang/locallang_core.xlf:labels.searchLevel.1
-				2 = EXT:lang/locallang_core.xlf:labels.searchLevel.2
-				3 = EXT:lang/locallang_core.xlf:labels.searchLevel.3
-				4 = EXT:lang/locallang_core.xlf:labels.searchLevel.4
+				-1 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.infinite
+				0 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.0
+				1 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.1
+				2 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.2
+				3 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.3
+				4 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.4
 			}
 			mod.wizards.newRecord.pages.show.pageInside=1
 			mod.wizards.newRecord.pages.show.pageAfter=1
diff --git a/typo3/sysext/core/Configuration/Resource/Driver/LocalDriverFlexForm.xml b/typo3/sysext/core/Configuration/Resource/Driver/LocalDriverFlexForm.xml
index 3c6d9ef6b85463d625f6a1d2f41509456e2d06d6..c75221ab3fb1b194cdc2ac6aa2f79ab9196fe571 100644
--- a/typo3/sysext/core/Configuration/Resource/Driver/LocalDriverFlexForm.xml
+++ b/typo3/sysext/core/Configuration/Resource/Driver/LocalDriverFlexForm.xml
@@ -5,10 +5,10 @@
 		<el>
 			<basePath>
 				<TCEforms>
-					<label>LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_basePath</label>
+					<label>LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_basePath</label>
 					<config>
 						<type>input</type>
-						<placeholder>LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_basePath_placeholder</placeholder>
+						<placeholder>LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_basePath_placeholder</placeholder>
 						<eval>required</eval>
 						<size>30</size>
 					</config>
@@ -16,16 +16,16 @@
 			</basePath>
 			<pathType>
 				<TCEforms>
-					<label>LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_pathType</label>
+					<label>LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType</label>
 					<config>
 						<type>radio</type>
 						<items type="array">
 							<numIndex index="0" type="array">
-								<numIndex index="0">LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_pathType_relative</numIndex>
+								<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType_relative</numIndex>
 								<numIndex index="1">relative</numIndex>
 							</numIndex>
 							<numIndex index="1" type="array">
-								<numIndex index="0">LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_pathType_absolute</numIndex>
+								<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType_absolute</numIndex>
 								<numIndex index="1">absolute</numIndex>
 							</numIndex>
 						</items>
@@ -35,7 +35,7 @@
 			</pathType>
 			<caseSensitive>
 				<TCEforms>
-					<label>LLL:EXT:lang/locallang_mod_file_list.xlf:localDriverFlexform_caseSensitive</label>
+					<label>LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_caseSensitive</label>
 					<config>
 						<type>check</type>
 						<default>1</default>
diff --git a/typo3/sysext/core/Configuration/TCA/be_groups.php b/typo3/sysext/core/Configuration/TCA/be_groups.php
index 0892ea4153050cc415ceff130485ca0c2b1c599d..e89c020e8a5d34a59f1119da1ff413ed70643a31 100644
--- a/typo3/sysext/core/Configuration/TCA/be_groups.php
+++ b/typo3/sysext/core/Configuration/TCA/be_groups.php
@@ -8,7 +8,7 @@ return [
         'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
         'default_sortby' => 'ORDER BY title',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'adminOnly' => true,
         'rootLevel' => 1,
         'typeicon_classes' => [
@@ -17,7 +17,7 @@ return [
         'enablecolumns' => [
             'disabled' => 'hidden'
         ],
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups',
         'useColumnsForDefaultValues' => 'lockToDomain, file_permissions',
         'versioningWS_alwaysAllowLiveEdit' => true,
         'searchFields' => 'title'
@@ -27,7 +27,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.title',
             'config' => [
                 'type' => 'input',
                 'size' => 25,
@@ -36,7 +36,7 @@ return [
             ]
         ],
         'db_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:db_mountpoints',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:db_mountpoints',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -53,7 +53,7 @@ return [
             ]
         ],
         'file_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -66,7 +66,7 @@ return [
                     '_VERTICAL' => 1,
                     'edit' => [
                         'type' => 'popup',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_edit_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_edit_title',
                         'module' => [
                             'name' => 'wizard_edit',
                         ],
@@ -76,7 +76,7 @@ return [
                     ],
                     'add' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_add_title',
                         'icon' => 'actions-add',
                         'params' => [
                             'table' => 'sys_filemounts',
@@ -89,7 +89,7 @@ return [
                     ],
                     'list' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_list_title',
                         'icon' => 'actions-system-list-open',
                         'params' => [
                             'table' => 'sys_filemounts',
@@ -103,29 +103,29 @@ return [
             ]
         ],
         'file_permissions' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.fileoper_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.fileoper_perms',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder', '--div--', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_read', 'readFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_write', 'writeFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_add', 'addFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_rename', 'renameFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_move', 'moveFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_copy', 'copyFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_delete', 'deleteFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_recursivedelete', 'recursivedeleteFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files', '--div--', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_read', 'readFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_write', 'writeFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_add', 'addFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_rename', 'renameFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_replace', 'replaceFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_move', 'moveFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_copy', 'copyFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_delete', 'deleteFile', 'mimetypes-other-other']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder', '--div--', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_read', 'readFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_write', 'writeFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_add', 'addFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_rename', 'renameFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_move', 'moveFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_copy', 'copyFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_delete', 'deleteFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_recursivedelete', 'recursivedeleteFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files', '--div--', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_read', 'readFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_write', 'writeFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_add', 'addFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_rename', 'renameFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_replace', 'replaceFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_move', 'moveFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_copy', 'copyFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_delete', 'deleteFile', 'mimetypes-other-other']
                 ],
                 'size' => 17,
                 'maxitems' => 17,
@@ -133,17 +133,17 @@ return [
             ]
         ],
         'workspace_perms' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:workspace_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:workspace_perms',
             'config' => [
                 'type' => 'check',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:workspace_perms_live', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:workspace_perms_live', 0]
                 ],
                 'default' => 0
             ]
         ],
         'pagetypes_select' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.pagetypes_select',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.pagetypes_select',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -154,7 +154,7 @@ return [
             ]
         ],
         'tables_modify' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.tables_modify',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tables_modify',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -165,7 +165,7 @@ return [
             ]
         ],
         'tables_select' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.tables_select',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tables_select',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -176,7 +176,7 @@ return [
             ]
         ],
         'non_exclude_fields' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.non_exclude_fields',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.non_exclude_fields',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -187,7 +187,7 @@ return [
             ]
         ],
         'explicit_allowdeny' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.explicit_allowdeny',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.explicit_allowdeny',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -196,7 +196,7 @@ return [
             ]
         ],
         'allowed_languages' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:allowed_languages',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:allowed_languages',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -205,7 +205,7 @@ return [
             ]
         ],
         'custom_options' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.custom_options',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.custom_options',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -214,14 +214,14 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'lockToDomain' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:lockToDomain',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:lockToDomain',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -231,7 +231,7 @@ return [
             ]
         ],
         'groupMods' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:userMods',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:userMods',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -242,7 +242,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
@@ -251,7 +251,7 @@ return [
             ]
         ],
         'TSconfig' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:TSconfig',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:TSconfig',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -260,14 +260,14 @@ return [
             'defaultExtras' => 'fixed-font : enable-tab'
         ],
         'hide_in_lists' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.hide_in_lists',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.hide_in_lists',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'subgroup' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.subgroup',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.subgroup',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -279,7 +279,7 @@ return [
             ]
         ],
         'category_perms' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:category_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:category_perms',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectTree',
@@ -301,9 +301,9 @@ return [
     ],
     'types' => [
         '0' => ['showitem' => 'hidden, title, description, subgroup,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_groups.tabs.base_rights, groupMods, tables_select, tables_modify, pagetypes_select, non_exclude_fields, explicit_allowdeny, allowed_languages, custom_options,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_groups.tabs.mounts_and_workspaces, workspace_perms, db_mountpoints, file_mountpoints, file_permissions, category_perms,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_groups.tabs.options, lockToDomain, hide_in_lists, TSconfig,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_groups.tabs.extended'],
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tabs.base_rights, groupMods, tables_select, tables_modify, pagetypes_select, non_exclude_fields, explicit_allowdeny, allowed_languages, custom_options,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tabs.mounts_and_workspaces, workspace_perms, db_mountpoints, file_mountpoints, file_permissions, category_perms,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tabs.options, lockToDomain, hide_in_lists, TSconfig,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.tabs.extended'],
     ]
 ];
diff --git a/typo3/sysext/core/Configuration/TCA/be_users.php b/typo3/sysext/core/Configuration/TCA/be_users.php
index fb2d201d66ff35dd407030253af3833427b90973..8ed85b64797cdbec3f21a45ad2164b10b489ce61 100644
--- a/typo3/sysext/core/Configuration/TCA/be_users.php
+++ b/typo3/sysext/core/Configuration/TCA/be_users.php
@@ -4,7 +4,7 @@ return [
         'label' => 'username',
         'descriptionColumn' => 'description',
         'tstamp' => 'tstamp',
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
@@ -32,7 +32,7 @@ return [
     ],
     'columns' => [
         'username' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.username',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.username',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -42,7 +42,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
@@ -51,7 +51,7 @@ return [
             ]
         ],
         'password' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.password',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.password',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -61,7 +61,7 @@ return [
             ]
         ],
         'usergroup' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.usergroup',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -74,7 +74,7 @@ return [
                     '_VERTICAL' => 1,
                     'edit' => [
                         'type' => 'popup',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_edit_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.usergroup_edit_title',
                         'module' => [
                             'name' => 'wizard_edit',
                         ],
@@ -84,7 +84,7 @@ return [
                     ],
                     'add' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_add_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.usergroup_add_title',
                         'icon' => 'actions-add',
                         'params' => [
                             'table' => 'be_groups',
@@ -97,7 +97,7 @@ return [
                     ],
                     'list' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_list_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.usergroup_list_title',
                         'icon' => 'actions-system-list-open',
                         'params' => [
                             'table' => 'be_groups',
@@ -111,7 +111,7 @@ return [
             ]
         ],
         'avatar' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.avatar',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.avatar',
             'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
                 'avatar',
                 ['maxitems' => 1],
@@ -119,7 +119,7 @@ return [
             )
         ],
         'lockToDomain' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:lockToDomain',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:lockToDomain',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -129,7 +129,7 @@ return [
             ]
         ],
         'db_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.options_db_mounts',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.options_db_mounts',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -146,7 +146,7 @@ return [
             ]
         ],
         'file_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.options_file_mounts',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.options_file_mounts',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -159,7 +159,7 @@ return [
                     '_VERTICAL' => 1,
                     'edit' => [
                         'type' => 'popup',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_edit_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_edit_title',
                         'module' => [
                             'name' => 'wizard_edit',
                         ],
@@ -169,7 +169,7 @@ return [
                     ],
                     'add' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_add_title',
                         'icon' => 'actions-add',
                         'params' => [
                             'table' => 'sys_filemounts',
@@ -182,7 +182,7 @@ return [
                     ],
                     'list' => [
                         'type' => 'script',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints_list_title',
                         'icon' => 'actions-system-list-open',
                         'params' => [
                             'table' => 'sys_filemounts',
@@ -196,7 +196,7 @@ return [
             ]
         ],
         'email' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.email',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.email',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -206,7 +206,7 @@ return [
             ]
         ],
         'realName' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.name',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -215,59 +215,59 @@ return [
             ]
         ],
         'disable' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'config' => [
                 'type' => 'check'
             ]
         ],
         'disableIPlock' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.disableIPlock',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.disableIPlock',
             'config' => [
                 'type' => 'check'
             ]
         ],
         'admin' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.admin',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.admin',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'options' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.options',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.options',
             'config' => [
                 'type' => 'check',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_users.options_db_mounts', 0],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_users.options_file_mounts', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.options_db_mounts', 0],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.options_file_mounts', 0]
                 ],
                 'default' => 3
             ]
         ],
         'file_permissions' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups.fileoper_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.fileoper_perms',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder', '--div--', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_read', 'readFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_write', 'writeFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_add', 'addFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_rename', 'renameFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_move', 'moveFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_copy', 'copyFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_delete', 'deleteFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.folder_recursivedelete', 'recursivedeleteFolder', 'apps-filetree-folder-default'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files', '--div--', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_read', 'readFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_write', 'writeFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_add', 'addFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_rename', 'renameFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_replace', 'replaceFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_move', 'moveFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_copy', 'copyFile', 'mimetypes-other-other'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:be_groups.file_permissions.files_delete', 'deleteFile', 'mimetypes-other-other']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder', '--div--', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_read', 'readFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_write', 'writeFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_add', 'addFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_rename', 'renameFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_move', 'moveFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_copy', 'copyFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_delete', 'deleteFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.folder_recursivedelete', 'recursivedeleteFolder', 'apps-filetree-folder-default'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files', '--div--', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_read', 'readFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_write', 'writeFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_add', 'addFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_rename', 'renameFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_replace', 'replaceFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_move', 'moveFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_copy', 'copyFile', 'mimetypes-other-other'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups.file_permissions.files_delete', 'deleteFile', 'mimetypes-other-other']
                 ],
                 'size' => 17,
                 'maxitems' => 17,
@@ -275,17 +275,17 @@ return [
             ]
         ],
         'workspace_perms' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:workspace_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:workspace_perms',
             'config' => [
                 'type' => 'check',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:workspace_perms_live', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:workspace_perms_live', 0]
                 ],
                 'default' => 1
             ]
         ],
         'starttime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -294,7 +294,7 @@ return [
             ]
         ],
         'endtime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -306,7 +306,7 @@ return [
             ]
         ],
         'lang' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.lang',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.lang',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -316,7 +316,7 @@ return [
             ]
         ],
         'userMods' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:userMods',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:userMods',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -327,7 +327,7 @@ return [
             ]
         ],
         'allowed_languages' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:allowed_languages',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:allowed_languages',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -336,7 +336,7 @@ return [
             ]
         ],
         'TSconfig' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:TSconfig',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:TSconfig',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -350,7 +350,7 @@ return [
             ]
         ],
         'lastlogin' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.lastlogin',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.lastlogin',
             'config' => [
                 'type' => 'input',
                 'readOnly' => true,
@@ -360,7 +360,7 @@ return [
             ]
         ],
         'category_perms' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:category_perms',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:category_perms',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectTree',
@@ -382,14 +382,14 @@ return [
     ],
     'types' => [
         '0' => ['showitem' => 'disable, username, password, description, avatar, usergroup, admin, realName, email, lang, lastlogin,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.rights, userMods, allowed_languages,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.mounts_and_workspaces, workspace_perms, db_mountpoints, options, file_mountpoints, file_permissions, category_perms,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.options, lockToDomain, disableIPlock, TSconfig,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.access, starttime,endtime,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.extended'],
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.rights, userMods, allowed_languages,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.mounts_and_workspaces, workspace_perms, db_mountpoints, options, file_mountpoints, file_permissions, category_perms,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.options, lockToDomain, disableIPlock, TSconfig,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.access, starttime,endtime,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.extended'],
         '1' => ['showitem' => 'disable, username, password, avatar,description, usergroup, admin, realName, email, lang, lastlogin,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.options, disableIPlock, TSconfig, db_mountpoints, options, file_mountpoints,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.access, starttime,endtime,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:be_users.tabs.extended']
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.options, disableIPlock, TSconfig, db_mountpoints, options, file_mountpoints,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.access, starttime,endtime,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.tabs.extended']
     ]
 ];
diff --git a/typo3/sysext/core/Configuration/TCA/pages.php b/typo3/sysext/core/Configuration/TCA/pages.php
index 68a052e72084a2db33b583698b46901456c688bc..987bd3bb5974d1baa8b6c6a0233e0c533f18a9e5 100644
--- a/typo3/sysext/core/Configuration/TCA/pages.php
+++ b/typo3/sysext/core/Configuration/TCA/pages.php
@@ -4,14 +4,14 @@ return [
         'label' => 'title',
         'tstamp' => 'tstamp',
         'sortby' => 'sorting',
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:pages',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:pages',
         'type' => 'doktype',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
         'delete' => 'deleted',
         'crdate' => 'crdate',
         'hideAtCopy' => true,
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'cruser_id' => 'cruser_id',
         'editlock' => 'editlock',
         'useColumnsForDefaultValues' => 'doktype,fe_group,hidden',
@@ -67,7 +67,7 @@ return [
     'columns' => [
         'doktype' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -77,7 +77,7 @@ return [
                         '--div--'
                     ],
                     [
-                        'LLL:EXT:lang/locallang_tca.xlf:doktype.I.0',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:doktype.I.0',
                         (string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT,
                         'apps-pagetree-page-default'
                     ],
@@ -110,12 +110,12 @@ return [
                         '--div--'
                     ],
                     [
-                        'LLL:EXT:lang/locallang_tca.xlf:doktype.I.folder',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:doktype.I.folder',
                         (string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_SYSFOLDER,
                         'apps-pagetree-folder-default'
                     ],
                     [
-                        'LLL:EXT:lang/locallang_tca.xlf:doktype.I.2',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:doktype.I.2',
                         (string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_RECYCLER,
                         'apps-filetree-folder-recycler'
                     ],
@@ -129,7 +129,7 @@ return [
             ]
         ],
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:title',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -149,18 +149,18 @@ return [
         ],
         'php_tree_stop' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:php_tree_stop',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:php_tree_stop',
             'config' => [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
         ],
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 23,
@@ -169,12 +169,12 @@ return [
         ],
         'editlock' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:editlock',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:editlock',
             'config' => [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -194,7 +194,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -204,7 +204,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -217,13 +217,13 @@ return [
         ],
         'layout' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.layout',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.layout',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                         '0'
                     ],
                     [
@@ -250,7 +250,7 @@ return [
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                         0
                     ],
                     [
@@ -267,7 +267,7 @@ return [
         ],
         'fe_group' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fe_group',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fe_group',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -275,15 +275,15 @@ return [
                 'maxitems' => 20,
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.hide_at_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hide_at_login',
                         -1
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.any_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.any_login',
                         -2
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.usergroups',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.usergroups',
                         '--div--'
                     ]
                 ],
@@ -300,7 +300,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -370,13 +370,13 @@ return [
             ]
         ],
         'urltype' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_core.xlf:labels.automatic',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.automatic',
                         '0'
                     ],
                     [
@@ -428,7 +428,7 @@ return [
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                         0
                     ],
                     [
@@ -510,7 +510,7 @@ return [
             ]
         ],
         'shortcut' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.shortcut_page',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.shortcut_page',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -596,7 +596,7 @@ return [
         ],
         'keywords' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.keywords',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.keywords',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -605,7 +605,7 @@ return [
         ],
         'description' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'cols' => 40,
@@ -623,7 +623,7 @@ return [
         ],
         'author' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.author',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.author',
             'config' => [
                 'type' => 'input',
                 'size' => 23,
@@ -633,7 +633,7 @@ return [
         ],
         'author_email' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.email',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.email',
             'config' => [
                 'type' => 'input',
                 'size' => 23,
@@ -650,32 +650,32 @@ return [
                     'foreign_types' => [
                         '0' => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_AUDIO => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_APPLICATION => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ]
                     ]
@@ -689,7 +689,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
diff --git a/typo3/sysext/core/Configuration/TCA/sys_category.php b/typo3/sysext/core/Configuration/TCA/sys_category.php
index 30ee2d346581ad6f29f0afce9c99eac6f859e528..a757d7e180e0f0c685be4f6c786dda50578b1613 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_category.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_category.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_category',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category',
         'descriptionColumn' => 'description',
         'label' => 'title',
         'tstamp' => 'tstamp',
@@ -34,7 +34,7 @@ return [
     'types' => [
         '1' => [
             'showitem' => 'title, --palette--;;1, parent, description,
-				--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.items, items,
+				--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.items, items,
 				--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime',
         ],
     ],
@@ -43,7 +43,7 @@ return [
     ],
     'columns' => [
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -52,15 +52,15 @@ return [
         ],
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0,
                 'showIconTable' => true,
@@ -69,7 +69,7 @@ return [
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -89,7 +89,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
@@ -97,7 +97,7 @@ return [
         'starttime' => [
             'exclude' => true,
             'l10n_mode' => 'mergeIfNotBlank',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 10,
@@ -108,7 +108,7 @@ return [
         'endtime' => [
             'exclude' => true,
             'l10n_mode' => 'mergeIfNotBlank',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -120,7 +120,7 @@ return [
             ]
         ],
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_category.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.title',
             'config' => [
                 'type' => 'input',
                 'width' => 200,
@@ -128,14 +128,14 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_category.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.description',
             'config' => [
                 'type' => 'text',
                 'default' => '',
             ]
         ],
         'parent' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_category.parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.parent',
             'config' => [
                 'minitems' => 0,
                 'maxitems' => 1,
@@ -155,7 +155,7 @@ return [
             ]
         ],
         'items' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_category.items',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.items',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
diff --git a/typo3/sysext/core/Configuration/TCA/sys_collection.php b/typo3/sysext/core/Configuration/TCA/sys_collection.php
index 8525467d084de4202687f02ba8a2410f477729c8..8b769e5cd649a44f34eb6c10c4ed509f84146a5b 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_collection.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_collection.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -34,7 +34,7 @@ return [
     ],
     'columns' => [
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -43,15 +43,15 @@ return [
         ],
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0,
                 'showIconTable' => true,
@@ -60,7 +60,7 @@ return [
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -79,7 +79,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
@@ -87,7 +87,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -98,7 +98,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -112,21 +112,21 @@ return [
         ],
         'fe_group' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fe_group',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fe_group',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     ['', 0],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.hide_at_login', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.any_login', -2],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.usergroups', '--div--']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hide_at_login', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.any_login', -2],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.usergroups', '--div--']
                 ],
                 'foreign_table' => 'fe_groups'
             ]
         ],
         'table_name' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection.table_name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.table_name',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -134,7 +134,7 @@ return [
             ]
         ],
         'items' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection.items',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.items',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -147,7 +147,7 @@ return [
             ]
         ],
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.title',
             'config' => [
                 'type' => 'input',
                 'size' => 60,
@@ -155,7 +155,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.description',
             'config' => [
                 'type' => 'text',
                 'cols' => 60,
@@ -163,12 +163,12 @@ return [
             ]
         ],
         'type' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_collection.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_collection.type.static', 'static']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_collection.type.static', 'static']
                 ],
                 'default' => 'static'
             ]
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file.php b/typo3/sysext/core/Configuration/TCA/sys_file.php
index 31e6899969f1caf8e639b524444a0183ad70eea6..0549b8e27a0b76bd7f81e25f6435ef8f5f2b08d6 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file',
         'label' => 'name',
         'tstamp' => 'tstamp',
         'type' => 'type',
@@ -34,7 +34,7 @@ return [
             ]
         ],
         'storage' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.storage',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.storage',
             'config' => [
                 'readOnly' => true,
                 'type' => 'select',
@@ -50,7 +50,7 @@ return [
             ]
         ],
         'identifier' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.identifier',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.identifier',
             'config' => [
                 'readOnly' => true,
                 'type' => 'input',
@@ -58,7 +58,7 @@ return [
             ]
         ],
         'name' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.name',
             'config' => [
                 'readOnly' => true,
                 'type' => 'input',
@@ -67,24 +67,24 @@ return [
             ]
         ],
         'type' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type',
             'config' => [
                 'readOnly' => true,
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'size' => 1,
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.unknown', 0],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.text', 1],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.image', 2],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.audio', 3],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.video', 4],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file.type.software', 5]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.unknown', 0],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.text', 1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.image', 2],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.audio', 3],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.video', 4],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.type.software', 5]
                 ]
             ]
         ],
         'mime_type' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.mime_type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.mime_type',
             'config' => [
                 'readOnly' => true,
                 'type' => 'input',
@@ -92,7 +92,7 @@ return [
             ]
         ],
         'sha1' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.sha1',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.sha1',
             'config' => [
                 'readOnly' => true,
                 'type' => 'input',
@@ -100,7 +100,7 @@ return [
             ]
         ],
         'size' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.size',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.size',
             'config' => [
                 'readOnly' => true,
                 'type' => 'input',
@@ -111,7 +111,7 @@ return [
             ]
         ],
         'missing' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.missing',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.missing',
             'config' => [
                 'readOnly' => true,
                 'type' => 'check',
@@ -119,7 +119,7 @@ return [
             ]
         ],
         'metadata' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.metadata',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.metadata',
             'config' => [
                 'readOnly' => true,
                 'type' => 'inline',
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_collection.php b/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
index c208196a89d8510de4b94f08733161c89f823b99..e6f80014003f7b0808f0ed570e53f5e5f843147d 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -33,7 +33,7 @@ return [
     ],
     'columns' => [
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -42,15 +42,15 @@ return [
         ],
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0,
                 'showIconTable' => true,
@@ -59,7 +59,7 @@ return [
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -78,7 +78,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
@@ -86,7 +86,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -97,7 +97,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -110,23 +110,23 @@ return [
             ]
         ],
         'type' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.type.0', 'static'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.type.1', 'folder'],
-                    ['LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.type.2', 'category']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.type.0', 'static'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.type.1', 'folder'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.type.2', 'category']
                 ]
             ]
         ],
         'files' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.files',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.files',
             'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('files')
         ],
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -134,7 +134,7 @@ return [
             ]
         ],
         'storage' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.storage',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.storage',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -149,7 +149,7 @@ return [
             ]
         ],
         'folder' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.folder',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.folder',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -159,14 +159,14 @@ return [
             ]
         ],
         'recursive' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.recursive',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.recursive',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'category' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_collection.category',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_collection.category',
             'config' => [
                 'minitems' => 0,
                 'maxitems' => 1,
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
index ae3e32b9ccc6ca4ec72ac4074467abf5a8420c51..bdcad379c780cd8f9be7042a4e9b9a6686e9dc3d 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_metadata',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_metadata',
         'label' => 'file',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -29,15 +29,15 @@ return [
     ],
     'columns' => [
         'sys_language_uid' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0,
                 'showIconTable' => true,
@@ -45,7 +45,7 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -64,7 +64,7 @@ return [
             ]
         ],
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -79,7 +79,7 @@ return [
         ],
         'file' => [
             'displayCond' => 'FIELD:sys_language_uid:=:0',
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file',
             'config' => [
                 'readOnly' => true,
                 'type' => 'select',
@@ -93,7 +93,7 @@ return [
         ],
         'title' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.title',
             'l10n_mode' => 'prefixLangTitle',
             'config' => [
                 'type' => 'input',
@@ -102,7 +102,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.description',
             'l10n_mode' => 'prefixLangTitle',
             'config' => [
                 'type' => 'text',
@@ -111,7 +111,7 @@ return [
             ]
         ],
         'alternative' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file.alternative',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file.alternative',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
index 5e1c355b4ea0439b4ee9010d6c9dd3db482bc902..5927befa8be618fa54fe2795aa9b5e1a5a85a4b9 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference',
         'label' => 'uid_local',
         'formattedLabel_userFunc' => 'TYPO3\\CMS\\Core\\Resource\\Service\\UserFileInlineLabelService->getInlineLabel',
         'formattedLabel_userFunc_options' => [
@@ -41,7 +41,7 @@ return [
     ],
     'columns' => [
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -49,15 +49,15 @@ return [
             ]
         ],
         'sys_language_uid' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0,
                 'showIconTable' => true,
@@ -65,7 +65,7 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -84,14 +84,14 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'uid_local' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.uid_local',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.uid_local',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -103,7 +103,7 @@ return [
             ]
         ],
         'uid_foreign' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.uid_foreign',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.uid_foreign',
             'config' => [
                 'type' => 'input',
                 'size' => 10,
@@ -111,7 +111,7 @@ return [
             ]
         ],
         'tablenames' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.tablenames',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.tablenames',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -119,14 +119,14 @@ return [
             ]
         ],
         'fieldname' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.fieldname',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.fieldname',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'sorting_foreign' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.sorting_foreign',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.sorting_foreign',
             'config' => [
                 'type' => 'input',
                 'size' => 4,
@@ -140,7 +140,7 @@ return [
             ]
         ],
         'table_local' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.table_local',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.table_local',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -150,7 +150,7 @@ return [
         'title' => [
             'l10n_mode' => 'prefixLangTitle',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.title',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -162,7 +162,7 @@ return [
         ],
         'link' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.link',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.link',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -170,7 +170,7 @@ return [
                 'wizards' => [
                     'link' => [
                         'type' => 'popup',
-                        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.link',
+                        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.link',
                         'icon' => 'actions-wizard-link',
                         'module' => [
                             'name' => 'wizard_link',
@@ -185,7 +185,7 @@ return [
             // This is used for captions in the frontend
             'l10n_mode' => 'prefixLangTitle',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.description',
             'config' => [
                 'type' => 'text',
                 'cols' => 20,
@@ -199,7 +199,7 @@ return [
         'alternative' => [
             'l10n_mode' => 'prefixLangTitle',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.alternative',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.alternative',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -211,14 +211,14 @@ return [
         ],
         'crop' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.crop',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.crop',
             'config' => [
                 'type' => 'imageManipulation'
             ]
         ],
         'autoplay' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.autoplay',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.autoplay',
             'config' => [
                 'type' => 'check',
                 'default' => 0
@@ -230,32 +230,32 @@ return [
         // We leave the extensive definition of each type here anyway, to make clear that you can use it to differentiate between the types.
         '0' => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ],
         \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ],
         \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ],
         \TYPO3\CMS\Core\Resource\File::FILETYPE_AUDIO => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ],
         \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ],
         \TYPO3\CMS\Core\Resource\File::FILETYPE_APPLICATION => [
             'showitem' => '
-				--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
+				--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.basicoverlayPalette;basicoverlayPalette,
 				--palette--;;filePalette'
         ]
     ],
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_storage.php b/typo3/sysext/core/Configuration/TCA/sys_file_storage.php
index 110857c649cdb4fa6f775327f9c3545f5339e28e..a96cc66bb04e9265c4e72b5845ac2f45fb177db4 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_storage.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_storage.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage',
         'label' => 'name',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -22,7 +22,7 @@ return [
     ],
     'columns' => [
         'name' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.name',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -30,7 +30,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.description',
             'config' => [
                 'type' => 'text',
                 'cols' => 30,
@@ -38,14 +38,14 @@ return [
             ]
         ],
         'is_browsable' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.is_browsable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.is_browsable',
             'config' => [
                 'type' => 'check',
                 'default' => 1
             ]
         ],
         'is_default' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.is_default',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.is_default',
             'config' => [
                 'type' => 'check',
                 'default' => 0,
@@ -56,7 +56,7 @@ return [
             ]
         ],
         'is_public' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.is_public',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.is_public',
             'config' => [
                 'default' => true,
                 'type' => 'user',
@@ -64,36 +64,36 @@ return [
             ]
         ],
         'is_writable' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.is_writable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.is_writable',
             'config' => [
                 'type' => 'check',
                 'default' => 1
             ]
         ],
         'is_online' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.is_online',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.is_online',
             'config' => [
                 'type' => 'check',
                 'default' => 1
             ]
         ],
         'auto_extract_metadata' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.auto_extract_metadata',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.auto_extract_metadata',
             'config' => [
                 'type' => 'check',
                 'default' => 1
             ]
         ],
         'processingfolder' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.processingfolder',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.processingfolder',
             'config' => [
                 'type' => 'input',
-                'placeholder' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.processingfolder.placeholder',
+                'placeholder' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.processingfolder.placeholder',
                 'size' => 20
             ]
         ],
         'driver' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.driver',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.driver',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -103,7 +103,7 @@ return [
             ]
         ],
         'configuration' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_storage.configuration',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_storage.configuration',
             'config' => [
                 'type' => 'flex',
                 'ds_pointerField' => 'driver',
diff --git a/typo3/sysext/core/Configuration/TCA/sys_filemounts.php b/typo3/sysext/core/Configuration/TCA/sys_filemounts.php
index 29f0b3e6fe0d55a71c212d3b9b23528705fa7f47..3ac41e78f6898195ed51e4e464ec6021e357f4fd 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_filemounts.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_filemounts.php
@@ -5,8 +5,8 @@ return [
         'descriptionColumn' => 'description',
         'tstamp' => 'tstamp',
         'sortby' => 'sorting',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_filemounts',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts',
         'adminOnly' => true,
         'rootLevel' => 1,
         'requestUpdate' => 'base',
@@ -26,7 +26,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.title',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -35,13 +35,13 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'config' => [
                 'type' => 'check'
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
@@ -50,7 +50,7 @@ return [
             ]
         ],
         'base' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.baseStorage',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.baseStorage',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -68,7 +68,7 @@ return [
             ]
         ],
         'path' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.folder',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.folder',
             'displayCond' => 'FIELD:base:>:0',
             'config' => [
                 'type' => 'select',
@@ -78,7 +78,7 @@ return [
             ]
         ],
         'read_only' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.read_only',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.read_only',
             'config' => [
                 'type' => 'check'
             ],
diff --git a/typo3/sysext/core/Configuration/TCA/sys_history.php b/typo3/sysext/core/Configuration/TCA/sys_history.php
index a58f4f264c9db0112750f7fb71474bada27996ff..32ff967e3208794ae658cbd28ec6c393f42002ed 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_history.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_history.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_history',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_history',
         'label' => 'tablename',
         'tstamp' => 'tstamp',
         'adminOnly' => true,
diff --git a/typo3/sysext/core/Configuration/TCA/sys_language.php b/typo3/sysext/core/Configuration/TCA/sys_language.php
index ffdbd95a8013cb33b6cb6ec14c155f3a9416e09c..2da43b10050bcd9848c15eceb37996f37a3865d1 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_language.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_language.php
@@ -5,7 +5,7 @@ return [
         'tstamp' => 'tstamp',
         'default_sortby' => 'ORDER BY sorting',
         'sortby' => 'sorting',
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_language',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_language',
         'adminOnly' => true,
         'rootLevel' => 1,
         'enablecolumns' => [
@@ -23,7 +23,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'input',
                 'size' => 35,
@@ -32,7 +32,7 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
@@ -41,7 +41,7 @@ return [
         ],
         'language_isocode' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_language.language_isocode',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_language.language_isocode',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -53,7 +53,7 @@ return [
             ]
         ],
         'flag' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_language.flag',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_language.flag',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
diff --git a/typo3/sysext/core/Configuration/TCA/sys_log.php b/typo3/sysext/core/Configuration/TCA/sys_log.php
index 4396990df3c0733448f0f7d49a47cac33933f19c..5f8758cfb74b1953d63dc36d640d717dc451f76c 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_log.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_log.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_log',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_log',
         'label' => 'details',
         'tstamp' => 'tstamp',
         'adminOnly' => true,
diff --git a/typo3/sysext/core/Configuration/TCA/sys_news.php b/typo3/sysext/core/Configuration/TCA/sys_news.php
index 74f1f073a1f58e509f06010edc615eb554afac5d..b799cc9f14988ca7ad221dbe8ece5a60c969ded3 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_news.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_news.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_news',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_news',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -24,7 +24,7 @@ return [
     ],
     'columns' => [
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
@@ -33,7 +33,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -43,7 +43,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -52,7 +52,7 @@ return [
             ]
         ],
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -61,7 +61,7 @@ return [
             ]
         ],
         'content' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.text',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.text',
             'config' => [
                 'type' => 'text',
                 'cols' => 48,
@@ -84,7 +84,7 @@ return [
     ],
     'types' => [
         '1' => [
-            'showitem' => 'hidden, title, content, --div--;LLL:EXT:lang/locallang_tca.xlf:sys_news.tabs.access, starttime, endtime',
+            'showitem' => 'hidden, title, content, --div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_news.tabs.access, starttime, endtime',
         ],
     ],
 ];
diff --git a/typo3/sysext/core/Documentation/Changelog/8.0/Feature-70849-MakeSearchLevelsConsistent.rst b/typo3/sysext/core/Documentation/Changelog/8.0/Feature-70849-MakeSearchLevelsConsistent.rst
index 00e7768effeb047ec155ac678454c31758080027..e9261ad45df1aebf002f2436409a0994e24ce51e 100644
--- a/typo3/sysext/core/Documentation/Changelog/8.0/Feature-70849-MakeSearchLevelsConsistent.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.0/Feature-70849-MakeSearchLevelsConsistent.rst
@@ -15,12 +15,12 @@ In order to make the searchlevel handling consistent between live and list searc
 .. code-block:: typoscript
 
 	mod.web_list.searchLevel.items {
-		-1 = EXT:lang/locallang_core.xlf:labels.searchLevel.infinite
-		0 = EXT:lang/locallang_core.xlf:labels.searchLevel.0
-		1 = EXT:lang/locallang_core.xlf:labels.searchLevel.1
-		2 = EXT:lang/locallang_core.xlf:labels.searchLevel.2
-		3 = EXT:lang/locallang_core.xlf:labels.searchLevel.3
-		4 = EXT:lang/locallang_core.xlf:labels.searchLevel.4
+		-1 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.infinite
+		0 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.0
+		1 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.1
+		2 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.2
+		3 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.3
+		4 = EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.searchLevel.4
 	}
 
 This makes it possible to add custom search level entries.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-78647-MoveLanguageFilesFromEXTlanglocallang_ToResourcesPrivateLnaguage.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-78647-MoveLanguageFilesFromEXTlanglocallang_ToResourcesPrivateLnaguage.rst
new file mode 100644
index 0000000000000000000000000000000000000000..a821b152958dd732de3982becb504c1a900533be
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-78647-MoveLanguageFilesFromEXTlanglocallang_ToResourcesPrivateLnaguage.rst
@@ -0,0 +1,71 @@
+.. include:: ../../Includes.txt
+
+=================================================================================================
+Deprecation: #78647 - Move language files from EXT:lang/locallang_* to Resources/Private/Lnaguage
+=================================================================================================
+
+See :issue:`78647`
+
+Description
+===========
+
+Move language files from EXT:lang/locallang_* to Resources/Private/Language
+
+
+Impact
+======
+
+Language files from EXT:lang are moved to different places into the core.
+
+
+Affected Installations
+======================
+
+All 3rd party extensions that are using language labels from extension `lang`
+
+
+Migration
+=========
+
+Move the following references to the new location of the language file:
+
+* lang/locallang_alt_doc.xlf -> lang/Resources/Private/Language/locallang_alt_doc.xlf
+* lang/locallang_alt_intro.xlf -> lang/Resources/Private/Language/locallang_alt_intro.xlf
+* lang/locallang_browse_links.xlf -> lang/Resources/Private/Language/locallang_browse_links.xlf
+* lang/locallang_common.xlf -> lang/Resources/Private/Language/locallang_common.xlf
+* lang/locallang_core.xlf -> lang/Resources/Private/Language/locallang_core.xlf
+* lang/locallang_csh_be_groups.xlf -> lang/Resources/Private/Language/locallang_csh_be_groups.xlf
+* lang/locallang_csh_be_users.xlf -> lang/Resources/Private/Language/locallang_csh_be_users.xlf
+* lang/locallang_csh_corebe.xlf -> lang/Resources/Private/Language/locallang_csh_corebe.xlf
+* lang/locallang_csh_pages.xlf -> lang/Resources/Private/Language/locallang_csh_pages.xlf
+* lang/locallang_csh_sysfilem.xlf -> lang/Resources/Private/Language/locallang_csh_sysfilem.xlf
+* lang/locallang_csh_syslang.xlf -> lang/Resources/Private/Language/locallang_csh_syslang.xlf
+* lang/locallang_csh_sysnews.xlf -> lang/Resources/Private/Language/locallang_csh_sysnews.xlf
+* lang/locallang_csh_web_func.xlf -> lang/Resources/Private/Language/locallang_csh_web_func.xlf
+* lang/locallang_csh_web_info.xlf -> lang/Resources/Private/Language/locallang_csh_web_info.xlf
+* lang/locallang_general.xlf -> lang/Resources/Private/Language/locallang_general.xlf
+* lang/locallang_login.xlf -> lang/Resources/Private/Language/locallang_login.xlf
+* lang/locallang_misc.xlf -> lang/Resources/Private/Language/locallang_misc.xlf
+* lang/locallang_mod_admintools.xlf -> lang/Resources/Private/Language/locallang_mod_admintools.xlf
+* lang/locallang_mod_file_list.xlf -> lang/Resources/Private/Language/locallang_mod_file_list.xlf
+* lang/locallang_mod_file.xlf -> lang/Resources/Private/Language/locallang_mod_file.xlf
+* lang/locallang_mod_help_about.xlf -> lang/Resources/Private/Language/locallang_mod_help_about.xlf
+* lang/locallang_mod_help_cshmanual.xlf -> lang/Resources/Private/Language/locallang_mod_help_cshmanual.xlf
+* lang/locallang_mod_help.xlf -> lang/Resources/Private/Language/locallang_mod_help.xlf
+* lang/locallang_mod_system.xlf -> lang/Resources/Private/Language/locallang_mod_system.xlf
+* lang/locallang_mod_usertools.xlf -> lang/Resources/Private/Language/locallang_mod_usertools.xlf
+* lang/locallang_mod_user_ws.xlf -> lang/Resources/Private/Language/locallang_mod_user_ws.xlf
+* lang/locallang_mod_web_func.xlf -> lang/Resources/Private/Language/locallang_mod_web_func.xlf
+* lang/locallang_mod_web_info.xlf -> lang/Resources/Private/Language/locallang_mod_web_info.xlf
+* lang/locallang_mod_web_list.xlf -> lang/Resources/Private/Language/locallang_mod_web_list.xlf
+* lang/locallang_mod_web.xlf -> lang/Resources/Private/Language/locallang_mod_web.xlf
+* lang/locallang_show_rechis.xlf -> lang/Resources/Private/Language/locallang_show_rechis.xlf
+* lang/locallang_t3lib_fullsearch.xlf -> lang/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
+* lang/locallang_tca.xlf -> lang/Resources/Private/Language/locallang_tca.xlf
+* lang/locallang_tcemain.xlf -> lang/Resources/Private/Language/locallang_tcemain.xlf
+* lang/locallang_tsfe.xlf -> lang/Resources/Private/Language/locallang_tsfe.xlf
+* lang/locallang_tsparser.xlf -> lang/Resources/Private/Language/locallang_tsparser.xlf
+* lang/locallang_view_help.xlf -> lang/Resources/Private/Language/locallang_view_help.xlf
+* lang/locallang_wizards.xlf -> lang/Resources/Private/Language/locallang_wizards.xlf
+
+.. index:: ext:lang
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/sys_category.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/sys_category.php
index 98e0f0f486b5d21e9a88285c67dc1bc7a25f0c02..7c490ff3c67c8888c5e355be0f2058a0b228d83b 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/sys_category.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/sys_category.php
@@ -1,6 +1,6 @@
 <?php
 
 // Prepend label for copied sys_category records
-$GLOBALS['TCA']['sys_category']['ctrl']['prependAtCopy'] = 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy';
+$GLOBALS['TCA']['sys_category']['ctrl']['prependAtCopy'] = 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy';
 // Prepend label for localized sys_category records
 $GLOBALS['TCA']['sys_category']['columns']['title']['l10n_mode'] = 'prefixLangTitle';
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
index 8077f4b81cbeb216d0351b9c785111a87d1d8575..bb17ace41033d6b42589368b85d50c10e6bf548f 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
@@ -26,15 +26,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0,
             ]
@@ -42,7 +42,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -62,7 +62,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
index d3a27411f27586a08916fedc491f3b4fc15bccca..73cc0477bf17cdc46c31125af86b59076dc08daf 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
@@ -26,15 +26,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -42,7 +42,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -62,7 +62,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
index 3c3e560d391cde739f6daf2c1ea17c019aa91bc0..b659ddb7c88a6198f231e849c87ccf3fb60530be 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
index eb2cba9b60f02fe66282861caef0ea31b7be1959..59f6555b5d04811ac40737d68cf276d04c22f3a6 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
@@ -27,15 +27,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -43,7 +43,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -63,7 +63,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
index 6e3d036fdfad4c015f3bee0644c061e8bf4d41ea..1bdb36c87df186a23a9c495392845f1ed5ee0509 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
@@ -27,15 +27,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -43,7 +43,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -63,7 +63,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
index 52abd38832a104919f7403b4117c1354097a28e5..b64be66d79dab8bffc11621af0cf688252fbd860 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
@@ -27,15 +27,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -43,7 +43,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -63,7 +63,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
index d334dccf4d9db8d66f4bd19ce8673d2d9cd4133f..aaccd035ceff0f21fde1e58fb40b3fbb1ad8faca 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
index 269ec87f605e675194fcb417fbb4cb2a9ba52e85..6844b0fb2fdd12dee6aa33a64ad070d8029c9a28 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
@@ -25,15 +25,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -41,7 +41,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -61,7 +61,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
index 491332f182a4da022be1aceeb1d0ab8ca79ac61e..e48e25d8de247a2b1fb37d24a4d57fafde08d394 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
index 57e4af95c5df845e3d3484c577043f469d1a2a65..9fc05a82032214458d497a148da70c3ce43f91d2 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
@@ -26,15 +26,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -42,7 +42,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -62,7 +62,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
index b6283fa31caebba8e2fc707b6b43c0dcf8e69ecd..2e37151d0bdcf1499d86717b8e2d245beaa6b923 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
index acbb020790fa9b730265408dd915625cfbd3793e..01e11896f014e5b0e7ab78ccd418e1b571614bf6 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
@@ -25,15 +25,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -41,7 +41,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -61,7 +61,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
index 51c3ec18090972db57686fe1527978b46e81b32a..d458a51f8913394ee5063c28daf488ad5e35294a 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
index 9c009efb566982c23deda56028bd470c6748f17e..0f763260a4a224826caf0b575465524644e70518 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
index e77dc51a26a0bbca8fa83e9aa7e576445d153da2..306c7c3328b2b4fd694e721066d879fc3f3795d2 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
index 44c59c9846e2477fe67a4d3614fecdb607048854..66a6ba1e852577ce79079ca468dfe07310872ea5 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
index 1fca429036972454b0e0be7915b681127d526112..446ea013ce8d0254b65e44e0aa3dfc156b0e247d 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
@@ -24,15 +24,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -40,7 +40,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -60,7 +60,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
index 1c6ad5ebf0005c62f43d318c7819ac4bd1a70361..f930498869131096d07d133960f6311a192bba0e 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
@@ -25,15 +25,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -41,7 +41,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -61,7 +61,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
index e6d64a8f297200eb4767dff9afad3d129d83d373..cf574b1a4d28c30c80dd45fef31e2324a8f9659e 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
@@ -9,7 +9,7 @@ return [
         'languageField'            => 'sys_language_uid',
         'transOrigPointerField'    => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'sortby' => 'sorting',
         'delete' => 'deleted',
         'enablecolumns' => [
@@ -24,14 +24,14 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label'  => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'label'  => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.language',
             'config' => [
                 'type'                => 'select',
                 'foreign_table'       => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -39,7 +39,7 @@ return [
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude'     => 1,
-            'label'       => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'label'       => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.l18n_parent',
             'config'      => [
                 'type'  => 'select',
                 'items' => [
@@ -58,7 +58,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index c2782785447329a38323f15a68ad4bd50ba1dce9..dfdadb99f9a091ce4a912bc0640558a1f07eddf9 100644
--- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
@@ -143,7 +143,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
         ]);
         $expectedInlineLabelReturnValue = 'TYPO3.lang = {"myKey":"myValue","myKeyArray1":"myValueArray1","myKeyArray2":"myValueArray2","myKeyArray3":"myValueArray3"';
 
-        $subject->addInlineLanguageLabelFile('EXT:lang/locallang_core.xlf');
+        $subject->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_core.xlf');
         $expectedLanguageLabel1 = 'labels.beUser';
         $expectedLanguageLabel2 = 'labels.feUser';
 
diff --git a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
index 16b37408c1f5bd5b265319bc74962926d9621963..b5b68e9de0eb53b7f05345b433077f560634190f 100644
--- a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
@@ -256,7 +256,7 @@ class CategoryRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->subject->applyTcaForPreRegisteredTables();
 
         foreach ($GLOBALS['TCA'][$this->tables['first']]['types'] as $typeConfig) {
-            $this->assertContains('--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
+            $this->assertContains('--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
         }
     }
 
@@ -269,7 +269,7 @@ class CategoryRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->subject->applyTcaForPreRegisteredTables();
 
         foreach ($GLOBALS['TCA'][$this->tables['first']]['types'] as $typeConfig) {
-            $this->assertNotContains('--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
+            $this->assertNotContains('--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
         }
     }
 
@@ -294,7 +294,7 @@ class CategoryRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         foreach ($GLOBALS['TCA'][$this->tables['first']]['types'] as $typeConfig) {
             $this->assertSame(
-                1, substr_count($typeConfig['showitem'], '--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category')
+                1, substr_count($typeConfig['showitem'], '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category')
             );
         }
     }
@@ -318,7 +318,7 @@ class CategoryRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TCA'][$this->tables['first']]['types']['newtypeafterfirstadd'] = ['showitem' => ''];
         $this->subject->add('text_extension_a', $this->tables['first'], 'categories1', [], true);
         $this->assertSame(
-            1, substr_count($GLOBALS['TCA'][$this->tables['first']]['types']['newtypeafterfirstadd']['showitem'], '--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category')
+            1, substr_count($GLOBALS['TCA'][$this->tables['first']]['types']['newtypeafterfirstadd']['showitem'], '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category')
         );
     }
 
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
index 2580aa5356887042c0d04e4cfb4c5140e79593ea..0a6014954378596dfe9393150f905e4b426bb345 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
@@ -44,16 +44,16 @@ class LocalizationFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         // Make sure there is no cached version of the label
         GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('l10n')->flush();
         // Get default value
-        $defaultLL = $subject->getParsedData('EXT:lang/locallang_core.xlf', 'default');
+        $defaultLL = $subject->getParsedData('EXT:lang/Resources/Private/Language/locallang_core.xlf', 'default');
         // Clear language cache again
         GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('l10n')->flush();
         // Set override file
-        $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:lang/locallang_core.xlf'][$unique] = $file;
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:lang/Resources/Private/Language/locallang_core.xlf'][$unique] = $file;
         /** @var $store \TYPO3\CMS\Core\Localization\LanguageStore */
         $store = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageStore::class);
-        $store->flushData('EXT:lang/locallang_core.xlf');
+        $store->flushData('EXT:lang/Resources/Private/Language/locallang_core.xlf');
         // Get override value
-        $overrideLL = $subject->getParsedData('EXT:lang/locallang_core.xlf', 'default');
+        $overrideLL = $subject->getParsedData('EXT:lang/Resources/Private/Language/locallang_core.xlf', 'default');
         // Clean up again
         unlink($file);
         $this->assertNotEquals($overrideLL['default']['buttons.logout'][0]['target'], '');
diff --git a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
index a387810486d2a23901e74b739eb5c8c7c4adf9ec..1b27e85e02742fdd6cd9278cc78ed05cd9bb919d 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
@@ -84,10 +84,10 @@ class ExtendedFileUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
         $GLOBALS['LANG']->expects($this->at(0))->method('sL')
-            ->with('LLL:EXT:lang/locallang_core.xlf:message.description.folderNotDeletedHasFilesWithReferences')
+            ->with('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.description.folderNotDeletedHasFilesWithReferences')
             ->will($this->returnValue('folderNotDeletedHasFilesWithReferences'));
         $GLOBALS['LANG']->expects($this->at(1))->method('sL')
-            ->with('LLL:EXT:lang/locallang_core.xlf:message.header.folderNotDeletedHasFilesWithReferences')
+            ->with('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:message.header.folderNotDeletedHasFilesWithReferences')
             ->will($this->returnValue('folderNotDeletedHasFilesWithReferences'));
 
         $result = $subject->folderHasFilesInUse($folder);
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index 026c17e827528aaeb009660c981446c9bf0a1005..c9bbae65df55ab1736e125386b6f194110856027 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -44,34 +44,34 @@ $GLOBALS['TBE_MODULES'] = [
     'help' => '',
     '_configuration' => [
         'web' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_web.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web.xlf',
             'name' => 'web',
             'iconIdentifier' => 'module-web'
         ],
         'file' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_file.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file.xlf',
             'navigationFrameModule' => 'file_navframe',
             'name' => 'file',
             'workspaces' => 'online,custom',
             'iconIdentifier' => 'module-file'
         ],
         'user' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_usertools.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_usertools.xlf',
             'name' => 'user',
             'iconIdentifier' => 'status-user-backend'
         ],
         'tools' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_admintools.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_admintools.xlf',
             'name' => 'tools',
             'iconIdentifier' => 'module-tools'
         ],
         'system' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_system.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_system.xlf',
             'name' => 'system',
             'iconIdentifier' => 'module-system'
         ],
         'help' => [
-            'labels' => 'LLL:EXT:lang/locallang_mod_help.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help.xlf',
             'name' => 'help',
             'iconIdentifier' => 'module-help'
         ]
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
index 45c362033532d0bfff765da40dfe587498a098d2..14df7b7ccdae78ae3247c742b09b5237829786fb 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpController.php
@@ -168,7 +168,7 @@ class HelpController extends ActionController
         }
         if (isset($getVars['action']) && $getVars['action'] !== 'index') {
             $backButton = $buttonBar->makeLinkButton()
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:back'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:back'))
                 ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-view-go-up', Icon::SIZE_SMALL))
                 ->setHref(BackendUtility::getModuleUrl($moduleName));
             $buttonBar->addButton($backButton);
diff --git a/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html b/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html
index fa9a50202a84e8462a0145adbd204c36ee57b5b2..2ab5bef1401a9c27c2dbe5cddb5a6994bfbfc62c 100644
--- a/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html
+++ b/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html
@@ -7,14 +7,14 @@
 
 <f:if condition="{manual.configuration.details}">
 	<h3>
-		<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:details" />
+		<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:details" />
 	</h3>
 	<csh:format>{manual.configuration.details}</csh:format>
 </f:if>
 
 <f:if condition="{manual.configuration.syntax}">
 	<h3>
-		<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:syntax" />
+		<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:syntax" />
 	</h3>
 	{manual.configuration.syntax -> f:format.raw()}
 </f:if>
@@ -33,7 +33,7 @@
 
 <f:if condition="{manual.seeAlso}">
 	<h3>
-		<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:seeAlso" />
+		<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:seeAlso" />
 	</h3>
 	<ul>
 		<f:for each="{manual.seeAlso}" as="link">
diff --git a/typo3/sysext/cshmanual/Resources/Private/Partials/TableOfContents.html b/typo3/sysext/cshmanual/Resources/Private/Partials/TableOfContents.html
index 01da11e5bd37ead1398236961301df936bf510b0..78582490785af373cd0e45e403d0fba550041859 100644
--- a/typo3/sysext/cshmanual/Resources/Private/Partials/TableOfContents.html
+++ b/typo3/sysext/cshmanual/Resources/Private/Partials/TableOfContents.html
@@ -1,19 +1,19 @@
 <h1>
-	<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:manual_title" />
+	<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:manual_title" />
 </h1>
 <p class="lead">
-	<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:description" />
+	<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:description" />
 </p>
 
 <h2>
-	<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:TOC" />
+	<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:TOC" />
 </h2>
 
 <f:if condition="{toc}">
 	<ul>
 		<f:for each="{toc}" as="modules" key="type">
 			<li>
-				<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:TOC_{type}" default="{type}" />
+				<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:TOC_{type}" default="{type}" />
 
 				<ul>
 					<f:for each="{modules}" as="title" key="module">
@@ -32,4 +32,4 @@
 			</li>
 		</f:for>
 	</ul>
-</f:if>
\ No newline at end of file
+</f:if>
diff --git a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Index.html b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Index.html
index 4a22e04f017082d000d0dc1b8fa683f80f98d42f..5110b32c2b5dce72a527b7188671da19182505e8 100644
--- a/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Index.html
+++ b/typo3/sysext/cshmanual/Resources/Private/Templates/Help/Index.html
@@ -8,6 +8,6 @@
 	<f:render partial="TableOfContents" arguments="{toc:toc,all:0}" />
 
 	<f:link.action action="all">
-		<f:translate key="LLL:EXT:lang/locallang_view_help.xlf:full_manual" />
+		<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:full_manual" />
 	</f:link.action>
-</f:section>
\ No newline at end of file
+</f:section>
diff --git a/typo3/sysext/cshmanual/ext_tables.php b/typo3/sysext/cshmanual/ext_tables.php
index 66b921dde8a76a9e73bcdce4ad2338c120c09a48..a2d3e59566c9ac0c721d33d7a7521beba57e7972 100644
--- a/typo3/sysext/cshmanual/ext_tables.php
+++ b/typo3/sysext/cshmanual/ext_tables.php
@@ -13,7 +13,7 @@ if (TYPO3_MODE === 'BE') {
         [
             'access' => 'user,group',
             'icon' => 'EXT:cshmanual/Resources/Public/Icons/module-cshmanual.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_help_cshmanual.xlf',
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_cshmanual.xlf',
         ]
     );
 
diff --git a/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml b/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml
index 7e8d74181b7abcdbd8babe35a3c675fecb78ee36..5b249beca47520662e5c2cb0233a9ad9369c6078 100644
--- a/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml
+++ b/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml
@@ -34,7 +34,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
diff --git a/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
index ab7409082bb4fc7ec2bb4dbea443506ebd7baf3a..56b28f00b5d3718f3b6b769039a2d4d2223f089a 100644
--- a/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
@@ -11,7 +11,7 @@ $extraContentColumns = [
             'renderType' => 'selectSingle',
             'items' => [
                 [
-                    'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                    'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                     ''
                 ],
                 [
@@ -38,7 +38,7 @@ $extraContentColumns = [
             'renderType' => 'selectSingle',
             'items' => [
                 [
-                    'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                    'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                     0
                 ],
                 [
@@ -265,7 +265,7 @@ $extraContentColumns = [
             'renderType' => 'selectSingle',
             'items' => [
                 [
-                    'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                    'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                     '0'
                 ],
                 [
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
index d4a59669952fd2bf6eb20ab3a877b17e22f5f3d2..1b885c6fbdccb4273ed2b2657571a34a73aaa5f7 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
@@ -23,15 +23,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -39,7 +39,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -58,7 +58,7 @@ return [
         ],
         't3ver_label' => [
             'displayCond' => 'FIELD:t3ver_label:REQ:true',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type'=>'none',
                 'cols' => 27
@@ -66,14 +66,14 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
         ],
         'fe_group' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fe_group',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fe_group',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -81,15 +81,15 @@ return [
                 'maxitems' => 20,
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.hide_at_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hide_at_login',
                         -1,
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.any_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.any_login',
                         -2,
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.usergroups',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.usergroups',
                         '--div--',
                     ],
                 ],
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_comment.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_comment.php
index 99b84d22997f714e2a2ebae8bc8051ad664b54ca..e9056edb91fa1cf39f8548e1e1991832fdebbaec 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_comment.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_comment.php
@@ -19,7 +19,7 @@ return [
     'columns' => [
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
index 17b05565e205e4a104af90e207fdc4d4aac56ff5..f5b389b4b322b0c2a9c0ddf946ae6cec929f7f18 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
@@ -9,7 +9,7 @@ return [
         'crdate' => 'crdate',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xml:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.prependAtCopy',
         'delete' => 'deleted',
         'enablecolumns' => [
             'disabled' => 'hidden'
@@ -22,7 +22,7 @@ return [
     'columns' => [
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
index 6ebaf3eb7c77af026c2d85389270d236f7b4bbad..0b17bc239f4f3dbce46716f0e72094ff3eb39467 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
@@ -29,15 +29,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -45,7 +45,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -64,7 +64,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
index 4bccf79c9b524610183bc196ce44a9d44022f2ca..a104275008f1d28753efda2e2a22671d86a060c4 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
@@ -18,15 +18,15 @@ return [
     'columns' => [
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
                 ],
                 'default' => 0
             ]
@@ -34,7 +34,7 @@ return [
         'l18n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -47,7 +47,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xml:LGL.hidden',
             'config' => [
                 'type' => 'check'
             ]
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
index a55a58f668f98060495e26ca9a0f9193a476d0bd..cb511ea34e5ce00efd2daed5af7355e803aed3d6 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
@@ -195,7 +195,7 @@ class ConfigurationController extends AbstractModuleController
         $saveButton = $buttonBar->makeInputButton()
             ->setName('_savedok')
             ->setValue('1')
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
             ->setForm('configurationform')
             ->setIcon($moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL));
         $saveSplitButton->addItem($saveButton, true);
@@ -205,7 +205,7 @@ class ConfigurationController extends AbstractModuleController
             ->setName('_saveandclosedok')
             ->setClasses('t3js-save-close')
             ->setValue('1')
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
             ->setForm('configurationform')
             ->setIcon($moduleTemplate->getIconFactory()->getIcon(
                 'actions-document-save-close',
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
index ad7c3bae324665011e3eaae82d2cf0ce6b3c3f89..ca437c5f044fbe8aff25121c8b7e30ebd65b1ec8 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
@@ -107,7 +107,7 @@ class UpdateFromTerController extends AbstractController
         } else {
             $lastUpdatedSince = \TYPO3\CMS\Backend\Utility\BackendUtility::calcAge(
                 time() - $lastUpdateTime->format('U'),
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
             );
             $lastUpdateTime = $lastUpdateTime->format($timeFormat);
         }
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
index 36dc63f70e99210bef2bead6a62407a72cf40ea1..9fd21c9af05216e5dbe8c9c6e77dd357acc75366 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
@@ -56,7 +56,7 @@ class TimeSinceLastUpdateViewHelper extends AbstractViewHelper
         }
         return \TYPO3\CMS\Backend\Utility\BackendUtility::calcAge(
             time() - $lastUpdateTime->format('U'),
-            $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears')
+            $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
         );
     }
 }
diff --git a/typo3/sysext/felogin/Configuration/FlexForms/Login.xml b/typo3/sysext/felogin/Configuration/FlexForms/Login.xml
index 675ec74b12ad16e3dc776574271d93b1596d51c2..5100fc23c02d80868a8d455b349d0d49bc9743bb 100644
--- a/typo3/sysext/felogin/Configuration/FlexForms/Login.xml
+++ b/typo3/sysext/felogin/Configuration/FlexForms/Login.xml
@@ -14,7 +14,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
@@ -29,7 +29,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
@@ -44,7 +44,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
@@ -74,7 +74,7 @@
 
 					<recursive>
 						<TCEforms>
-							<label>LLL:EXT:lang/locallang_general.xlf:LGL.recursive</label>
+							<label>LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.recursive</label>
 							<config>
 								<type>select</type>
 								<renderType>selectSingle</renderType>
@@ -174,7 +174,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
@@ -245,7 +245,7 @@
 								<type>check</type>
 								<items type="array">
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:lang/locallang_common.xlf:disable</numIndex>
+										<numIndex index="0">LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:disable</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 								</items>
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index faf5e27b9670d5abad68e8454c2bb2ba88c69f35..b72d211e24e90799312c0a2f576d52405c3b8d8c 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -158,8 +158,8 @@ class FileListController extends ActionController
     public function initializeObject()
     {
         $this->doc = GeneralUtility::makeInstance(DocumentTemplate::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_mod_file_list.xlf');
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
 
         // Setting GPvars:
         $this->id = ($combinedIdentifier = GeneralUtility::_GP('id'));
@@ -395,14 +395,14 @@ class FileListController extends ActionController
                 }
                 ');
             $pageRenderer->loadRequireJsModule('TYPO3/CMS/Filelist/FileDelete');
-            $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_alt_doc.xlf', 'buttons');
+            $pageRenderer->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf', 'buttons');
 
             // Include DragUploader only if we have write access
             if ($this->folderObject->getStorage()->checkUserActionPermission('add', 'File')
                 && $this->folderObject->checkActionPermission('write')
             ) {
                 $pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/DragUploader');
-                $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_core.xlf', 'file_upload');
+                $pageRenderer->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_core.xlf', 'file_upload');
                 $pageRenderer->addInlineLanguageLabelArray([
                     'permissions.read' => $this->getLanguageService()->getLL('read'),
                     'permissions.write' => $this->getLanguageService()->getLL('write'),
@@ -499,7 +499,7 @@ class FileListController extends ActionController
         ]);
 
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Filelist/FileDelete');
-        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_alt_doc.xlf', 'buttons');
+        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf', 'buttons');
     }
 
     /**
@@ -569,7 +569,7 @@ class FileListController extends ActionController
         );
         $refreshButton = $buttonBar->makeLinkButton()
             ->setHref($refreshLink)
-            ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload'))
+            ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.reload'))
             ->setIcon($iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL));
         $buttonBar->addButton($refreshButton, ButtonBar::BUTTON_POSITION_RIGHT);
 
@@ -585,7 +585,7 @@ class FileListController extends ActionController
                 $levelUpButton = $buttonBar->makeLinkButton()
                     ->setHref(BackendUtility::getModuleUrl('file_FilelistList', ['id' => $parentFolder->getCombinedIdentifier()]))
                     ->setOnClick($levelUpClick)
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.upOneLevel'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.upOneLevel'))
                     ->setIcon($iconFactory->getIcon('actions-view-go-up', Icon::SIZE_SMALL));
                 $buttonBar->addButton($levelUpButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
             }
@@ -611,7 +611,7 @@ class FileListController extends ActionController
                     ]
                 ))
                 ->setClasses('t3js-drag-uploader-trigger')
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.upload'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.upload'))
                 ->setIcon($iconFactory->getIcon('actions-edit-upload', Icon::SIZE_SMALL));
             $buttonBar->addButton($uploadButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
         }
@@ -629,7 +629,7 @@ class FileListController extends ActionController
                         'returnUrl' => $this->filelist->listURL(),
                     ]
                 ))
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.new'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.new'))
                 ->setIcon($iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL));
             $buttonBar->addButton($newButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
         }
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 516efb963ef3c7d02da1b14ef3d76968ec1b26f6..b422cb1a463380faa0b66ba9bc95a2c922fe6198 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -228,7 +228,7 @@ class FileList extends AbstractRecordList
         $this->bigControlPanel = $bigControlPanel;
         // Setting the maximum length of the filenames to the user's settings or minimum 30 (= $this->fixedL)
         $this->fixedL = max($this->fixedL, $this->getBackendUser()->uc['titleLen']);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_common.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_common.xlf');
         $this->resourceFactory = ResourceFactory::getInstance();
     }
 
@@ -462,7 +462,7 @@ class FileList extends AbstractRecordList
             $parentFolder = $currentFolder->getParentFolder();
             if ($parentFolder->getIdentifier() !== $currentFolder->getIdentifier() && $currentStorage->isWithinFileMountBoundaries($parentFolder)) {
                 $levelUp = $this->linkWrapDir(
-                    '<span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.upOneLevel')) . '">'
+                    '<span title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.upOneLevel')) . '">'
                     . $this->iconFactory->getIcon('actions-view-go-up', Icon::SIZE_SMALL)->render()
                     . '</span>',
                     $parentFolder
@@ -611,7 +611,7 @@ class FileList extends AbstractRecordList
                     'returnUrl' => $this->listURL()
                 ];
                 $url = BackendUtility::getModuleUrl('record_edit', $urlParameters);
-                $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.editMetadata'));
+                $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata'));
                 $code = '<a class="responsive-title" href="' . htmlspecialchars($url) . '" title="' . $title . '">' . $code . '</a>';
             }
         } catch (\Exception $e) {
@@ -749,7 +749,7 @@ class FileList extends AbstractRecordList
 
                         if ($fileObject->isMissing()) {
                             $theData[$field] .= '<span class="label label-danger label-space-left">'
-                                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_missing'))
+                                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                                 . '</span>';
                             // Thumbnails?
                         } elseif ($this->thumbs && ($this->isImage($ext) || $this->isMediaFile($ext))) {
@@ -871,8 +871,8 @@ class FileList extends AbstractRecordList
         // For normal clipboard, add copy/cut buttons:
         if ($this->clipObj->current === 'normal') {
             $isSel = $this->clipObj->isSelected('_FILE', $md5);
-            $copyTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.copy'));
-            $cutTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.cut'));
+            $copyTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy'));
+            $cutTitle = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut'));
             $copyIcon = $this->iconFactory->getIcon('actions-edit-copy', Icon::SIZE_SMALL)->render();
             $cutIcon = $this->iconFactory->getIcon('actions-edit-cut', Icon::SIZE_SMALL)->render();
 
@@ -939,7 +939,7 @@ class FileList extends AbstractRecordList
         if ($fileOrFolderObject instanceof File && $fileOrFolderObject->checkActionPermission('write') && GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'], $fileOrFolderObject->getExtension())) {
             $url = BackendUtility::getModuleUrl('file_edit', ['target' => $fullIdentifier]);
             $editOnClick = 'top.list_frame.location.href=' . GeneralUtility::quoteJSvalue($url) . '+\'&returnUrl=\'+top.rawurlencode(top.list_frame.document.location.pathname+top.list_frame.document.location.search);return false;';
-            $cells['edit'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($editOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.editcontent') . '">'
+            $cells['edit'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($editOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent') . '">'
                 . $this->iconFactory->getIcon('actions-page-open', Icon::SIZE_SMALL)->render()
                 . '</a>';
         } else {
@@ -949,7 +949,7 @@ class FileList extends AbstractRecordList
             $fileUrl = $fileOrFolderObject->getPublicUrl(true);
             if ($fileUrl) {
                 $aOnClick = 'return top.openUrlInWindow(' . GeneralUtility::quoteJSvalue($fileUrl) . ', \'WebFile\');';
-                $cells['view'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($aOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.view') . '">' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '</a>';
+                $cells['view'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($aOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view') . '">' . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '</a>';
             } else {
                 $cells['view'] = $this->spaceIcon;
             }
@@ -961,14 +961,14 @@ class FileList extends AbstractRecordList
         if ($fileOrFolderObject instanceof File && $fileOrFolderObject->checkActionPermission('replace')) {
             $url = BackendUtility::getModuleUrl('file_replace', ['target' => $fullIdentifier, 'uid' => $fileOrFolderObject->getUid()]);
             $replaceOnClick = 'top.list_frame.location.href = ' . GeneralUtility::quoteJSvalue($url) . '+\'&returnUrl=\'+top.rawurlencode(top.list_frame.document.location.pathname+top.list_frame.document.location.search);return false;';
-            $cells['replace'] = '<a href="#" class="btn btn-default" onclick="' . $replaceOnClick . '"  title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.replace') . '">' . $this->iconFactory->getIcon('actions-edit-replace', Icon::SIZE_SMALL)->render() . '</a>';
+            $cells['replace'] = '<a href="#" class="btn btn-default" onclick="' . $replaceOnClick . '"  title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace') . '">' . $this->iconFactory->getIcon('actions-edit-replace', Icon::SIZE_SMALL)->render() . '</a>';
         }
 
         // rename the file
         if ($fileOrFolderObject->checkActionPermission('rename')) {
             $url = BackendUtility::getModuleUrl('file_rename', ['target' => $fullIdentifier]);
             $renameOnClick = 'top.list_frame.location.href = ' . GeneralUtility::quoteJSvalue($url) . '+\'&returnUrl=\'+top.rawurlencode(top.list_frame.document.location.pathname+top.list_frame.document.location.search);return false;';
-            $cells['rename'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($renameOnClick) . '"  title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.rename') . '">' . $this->iconFactory->getIcon('actions-edit-rename', Icon::SIZE_SMALL)->render() . '</a>';
+            $cells['rename'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($renameOnClick) . '"  title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename') . '">' . $this->iconFactory->getIcon('actions-edit-rename', Icon::SIZE_SMALL)->render() . '</a>';
         } else {
             $cells['rename'] = $this->spaceIcon;
         }
@@ -979,7 +979,7 @@ class FileList extends AbstractRecordList
             } elseif ($fileOrFolderObject instanceof File) {
                 $infoOnClick = 'top.launchView( \'_FILE\', ' . GeneralUtility::quoteJSvalue($fullIdentifier) . ');return false;';
             }
-            $cells['info'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($infoOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.info') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>';
+            $cells['info'] = '<a href="#" class="btn btn-default" onclick="' . htmlspecialchars($infoOnClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>';
         } else {
             $cells['info'] = $this->spaceIcon;
         }
@@ -988,10 +988,10 @@ class FileList extends AbstractRecordList
         if ($fileOrFolderObject->checkActionPermission('delete')) {
             $identifier = $fileOrFolderObject->getIdentifier();
             if ($fileOrFolderObject instanceof Folder) {
-                $referenceCountText = BackendUtility::referenceCount('_FILE', $identifier, ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFolder'));
+                $referenceCountText = BackendUtility::referenceCount('_FILE', $identifier, ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFolder'));
                 $deleteType = 'delete_folder';
             } else {
-                $referenceCountText = BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFile'));
+                $referenceCountText = BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFile'));
                 $deleteType = 'delete_file';
             }
 
@@ -1002,8 +1002,8 @@ class FileList extends AbstractRecordList
             }
 
             $deleteUrl = BackendUtility::getModuleUrl('tce_file');
-            $confirmationMessage = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:mess.delete'), $fileOrFolderObject->getName()) . $referenceCountText;
-            $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.delete');
+            $confirmationMessage = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete'), $fileOrFolderObject->getName()) . $referenceCountText;
+            $title = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete');
             $cells['delete'] = '<a href="#" class="btn btn-default t3js-filelist-delete" data-content="' . htmlspecialchars($confirmationMessage)
                 . '" data-check="' . $confirmationCheck
                 . '" data-delete-url="' . htmlspecialchars($deleteUrl)
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
index 719b64297dd88840ec0d1ce37bf401bcb643101e..020660c96d3fe9ce8e722a942d8637d877b59c38 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
@@ -17,14 +17,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -42,7 +42,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 									>
 										{file.name}
@@ -62,7 +62,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -76,7 +76,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -90,7 +90,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -104,7 +104,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -118,7 +118,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -131,11 +131,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											data-identifier="{file.identifier}"
 											data-veri-code="{veriCode}"
-											data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											data-delete-url="{deleteUrl}"
 											data-delete-type="delete_file"
@@ -154,7 +154,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
diff --git a/typo3/sysext/filelist/ext_tables.php b/typo3/sysext/filelist/ext_tables.php
index fdee841ec57d12e3d996d5641ac70d023a02b24a..24a7e907185d9523411bca3e23ab546e8160387b 100644
--- a/typo3/sysext/filelist/ext_tables.php
+++ b/typo3/sysext/filelist/ext_tables.php
@@ -14,7 +14,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'workspaces' => 'online,custom',
             'icon' => 'EXT:filelist/Resources/Public/Icons/module-filelist.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_file_list.xlf'
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf'
         ]
     );
 }
diff --git a/typo3/sysext/filemetadata/Configuration/TCA/Overrides/sys_file_metadata.php b/typo3/sysext/filemetadata/Configuration/TCA/Overrides/sys_file_metadata.php
index d1e68d998f289159bd67b86de89740971c292f0f..8c52c069860ae74dba193efa34f4d7d9233aad74 100644
--- a/typo3/sysext/filemetadata/Configuration/TCA/Overrides/sys_file_metadata.php
+++ b/typo3/sysext/filemetadata/Configuration/TCA/Overrides/sys_file_metadata.php
@@ -458,7 +458,7 @@ $tca = [
         ],
         'fe_groups' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fe_group',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fe_group',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -466,15 +466,15 @@ $tca = [
                 'maxitems' => 20,
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.hide_at_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hide_at_login',
                         -1
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.any_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.any_login',
                         -2
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.usergroups',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.usergroups',
                         '--div--'
                     ]
                 ],
@@ -492,6 +492,6 @@ $GLOBALS['TCA']['sys_file_metadata'] = array_replace_recursive($GLOBALS['TCA']['
 if (isset($GLOBALS['TCA']['sys_file_metadata']['columns']['categories'])) {
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
         'sys_file_metadata',
-        '--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category,categories'
+        '--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category,categories'
     );
 }
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
index e4b5bd21259ead746496606ac8e6c862ff21bf5b..a00c9834158a2010ef61d1de81327f91aef6c382 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
@@ -74,7 +74,7 @@ class PagePathViewHelper extends AbstractBackendViewHelper
             $title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
         }
         // Setting the path of the page
-        $pagePath = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.path')) . ': <span class="typo3-docheader-pagePath">';
+        $pagePath = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path')) . ': <span class="typo3-docheader-pagePath">';
         // crop the title to title limit (or 50, if not defined)
         $cropLength = empty($GLOBALS['BE_USER']->uc['titleLen']) ? 50 : $GLOBALS['BE_USER']->uc['titleLen'];
         $croppedTitle = GeneralUtility::fixed_lgd_cs($title, -$cropLength);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
index 9734757c427e248b2e4de475ac29522c7c206b08..7b4c1b64a9f824ed82c198f9beaf196c4a7ba7f4 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
@@ -17,14 +17,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -42,7 +42,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -62,7 +62,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -76,7 +76,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -90,7 +90,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -104,7 +104,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -118,7 +118,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -131,11 +131,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -154,7 +154,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -181,14 +181,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -206,7 +206,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -226,7 +226,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -240,7 +240,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -254,7 +254,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -268,7 +268,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -282,7 +282,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -295,11 +295,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -318,7 +318,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -345,14 +345,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -370,7 +370,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -390,7 +390,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -404,7 +404,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -418,7 +418,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -432,7 +432,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -446,7 +446,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -459,11 +459,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -482,7 +482,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -509,14 +509,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -534,7 +534,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -554,7 +554,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -568,7 +568,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -582,7 +582,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -596,7 +596,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -610,7 +610,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -623,11 +623,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -646,7 +646,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -673,14 +673,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -698,7 +698,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -718,7 +718,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -732,7 +732,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -746,7 +746,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -760,7 +760,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -774,7 +774,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -787,11 +787,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -810,7 +810,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -837,14 +837,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -862,7 +862,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -882,7 +882,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -896,7 +896,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -910,7 +910,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -924,7 +924,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -938,7 +938,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -951,11 +951,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -974,7 +974,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1001,14 +1001,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1026,7 +1026,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1046,7 +1046,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1060,7 +1060,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1074,7 +1074,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1088,7 +1088,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1102,7 +1102,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1115,11 +1115,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1138,7 +1138,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1165,14 +1165,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1190,7 +1190,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1210,7 +1210,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1224,7 +1224,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1238,7 +1238,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1252,7 +1252,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1266,7 +1266,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1279,11 +1279,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1302,7 +1302,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1329,14 +1329,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1354,7 +1354,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1374,7 +1374,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1388,7 +1388,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1402,7 +1402,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1416,7 +1416,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1430,7 +1430,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1443,11 +1443,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1466,7 +1466,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1493,14 +1493,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1518,7 +1518,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1538,7 +1538,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1552,7 +1552,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1566,7 +1566,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1580,7 +1580,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1594,7 +1594,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1607,11 +1607,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1630,7 +1630,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1657,14 +1657,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1682,7 +1682,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1702,7 +1702,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1716,7 +1716,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1730,7 +1730,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1744,7 +1744,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1758,7 +1758,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1771,11 +1771,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1794,7 +1794,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1821,14 +1821,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1846,7 +1846,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1866,7 +1866,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1880,7 +1880,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1894,7 +1894,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1908,7 +1908,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1922,7 +1922,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1935,11 +1935,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1958,7 +1958,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1985,14 +1985,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2010,7 +2010,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2030,7 +2030,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2044,7 +2044,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2058,7 +2058,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2072,7 +2072,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2086,7 +2086,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2099,11 +2099,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2122,7 +2122,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -2149,14 +2149,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2174,7 +2174,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2194,7 +2194,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2208,7 +2208,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2222,7 +2222,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2236,7 +2236,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2250,7 +2250,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2263,11 +2263,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2286,7 +2286,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
index 2960d64bc7a040264203864161ad9784ce07b7de..369a84cf08121dafbfcc129f62ed506981b5c084 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
@@ -15,14 +15,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -40,7 +40,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -60,7 +60,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -74,7 +74,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -88,7 +88,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -102,7 +102,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -116,7 +116,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -129,11 +129,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -152,7 +152,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -179,14 +179,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -204,7 +204,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -224,7 +224,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -238,7 +238,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -252,7 +252,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -266,7 +266,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -280,7 +280,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -293,11 +293,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -316,7 +316,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -343,14 +343,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -368,7 +368,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -388,7 +388,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -402,7 +402,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -416,7 +416,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -430,7 +430,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -444,7 +444,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -457,11 +457,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -480,7 +480,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -507,14 +507,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -532,7 +532,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -552,7 +552,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -566,7 +566,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -580,7 +580,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -594,7 +594,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -608,7 +608,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -621,11 +621,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -644,7 +644,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -671,14 +671,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -696,7 +696,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -716,7 +716,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -730,7 +730,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -744,7 +744,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -758,7 +758,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -772,7 +772,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -785,11 +785,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -808,7 +808,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -835,14 +835,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -860,7 +860,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -880,7 +880,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -894,7 +894,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -908,7 +908,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -922,7 +922,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -936,7 +936,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -949,11 +949,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -972,7 +972,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -999,14 +999,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1024,7 +1024,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1044,7 +1044,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1058,7 +1058,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1072,7 +1072,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1086,7 +1086,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1100,7 +1100,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1113,11 +1113,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1136,7 +1136,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1163,14 +1163,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1188,7 +1188,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1208,7 +1208,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1222,7 +1222,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1236,7 +1236,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1250,7 +1250,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1264,7 +1264,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1277,11 +1277,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1300,7 +1300,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1327,14 +1327,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1352,7 +1352,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1372,7 +1372,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1386,7 +1386,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1400,7 +1400,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1414,7 +1414,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1428,7 +1428,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1441,11 +1441,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1464,7 +1464,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1491,14 +1491,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1516,7 +1516,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1536,7 +1536,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1550,7 +1550,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1564,7 +1564,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1578,7 +1578,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1592,7 +1592,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1605,11 +1605,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1628,7 +1628,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1655,14 +1655,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1680,7 +1680,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1700,7 +1700,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1714,7 +1714,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1728,7 +1728,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1742,7 +1742,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1756,7 +1756,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1769,11 +1769,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1792,7 +1792,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1819,14 +1819,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1844,7 +1844,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1864,7 +1864,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1878,7 +1878,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1892,7 +1892,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1906,7 +1906,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1920,7 +1920,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1933,11 +1933,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1956,7 +1956,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -1983,14 +1983,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2008,7 +2008,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2028,7 +2028,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2042,7 +2042,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2056,7 +2056,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2070,7 +2070,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2084,7 +2084,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2097,11 +2097,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2120,7 +2120,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
@@ -2147,14 +2147,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2172,7 +2172,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2192,7 +2192,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2206,7 +2206,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2220,7 +2220,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2234,7 +2234,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2248,7 +2248,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2261,11 +2261,11 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
 											 data-veri-code="{veriCode}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2284,7 +2284,7 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
index 266e6c3f4c2ad9d0280b95b0dc87a7d677e7279b..915a5b977f2cee46f8d3e6f145dcf6f2e253bd35 100644
--- a/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
@@ -59,7 +59,7 @@ call_user_func(function () {
     // Add category tab when categories column exits
     if (!empty($GLOBALS['TCA']['tt_content']['columns']['categories'])) {
         $GLOBALS['TCA']['tt_content']['types']['textmedia']['showitem'] .=
-        ',--div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category,
+        ',--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category,
 				categories';
     }
 
@@ -89,7 +89,7 @@ call_user_func(function () {
                 'type' => 'check',
                 'default' => 0,
                 'items' => [
-                    ['LLL:EXT:lang/locallang_core.xml:labels.enabled', 1]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xml:labels.enabled', 1]
                 ]
             ]
         ],
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index 756015cd4019a4ef816a1f9ef2db05d95e955cdd..6be4291aa15358a8f699973d65b2831b30011c97 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -294,7 +294,7 @@ class FormEditorController extends AbstractBackendController
                 ->setDataAttributes(['identifier' => 'closeButton'])
                 ->setHref(BackendUtility::getModuleUrl('web_FormFormbuilder'))
                 ->setClasses('t3-form-element-close-form-button hidden')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                 ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL));
 
             $saveButton = $buttonBar->makeInputButton()
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index a45ada81cc5681f54f2965a8f8b975ea6f42fde2..ff61acb98ecd0c106267561b92db4675ba554648 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -393,7 +393,7 @@ class FormManagerController extends AbstractBackendController
 
         if (isset($getVars['action']) && $getVars['action'] !== 'index') {
             $backButton = $buttonBar->makeLinkButton()
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:back'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:back'))
                 ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-view-go-up', Icon::SIZE_SMALL))
                 ->setHref($this->getBackendUtility()::getModuleUrl($moduleName));
             $buttonBar->addButton($backButton);
diff --git a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
index 3c60dd0d803dac25f1a57f6b75bad9c507946a98..7a0232ed06ca91506588ce8297f1c070a6cae239 100644
--- a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
+++ b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
@@ -38,12 +38,12 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
                 1 => $GLOBALS['LANG']->sL('LLL:EXT:frontend/Resources/Private/Language/locallang_webinfo.xlf:pages_1')
             ],
             'depth' => [
-                0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-                1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-                2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-                3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-                4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-                999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+                0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+                1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+                2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+                3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+                4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+                999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi')
             ]
         ];
     }
@@ -62,7 +62,7 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
         $dblist->script = BackendUtility::getModuleUrl('web_info');
         $dblist->showIcon = 0;
         $dblist->setLMargin = 0;
-        $dblist->agePrefixes = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears');
+        $dblist->agePrefixes = $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears');
         $dblist->pI_showUser = 1;
 
         switch ((int)$this->pObj->MOD_SETTINGS['pages']) {
diff --git a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
index 0558a7b07579e1de670e076228854ffa94a6ae35..05154cf9891f8c6a70e224ead0a6cd0db1be1aca 100644
--- a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
@@ -58,12 +58,12 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
         $lang = $this->getLanguageService();
         $menuArray = [
             'depth' => [
-                0 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-                1 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-                2 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-                3 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-                4 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-                999 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+                0 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+                1 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+                2 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+                3 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+                4 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+                999 => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi')
             ]
         ];
         // Languages:
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 642f409b57675c2c9049c3cba1a9857f4c2970ae..b9fb41ed539e0d85555995403b1dc16ecdcac33b 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -249,7 +249,7 @@ class AdminPanelView
      */
     public function display()
     {
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_tsfe.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_tsfe.xlf');
         $moduleContent = $updateButton = '';
 
         if ($this->getBackendUser()->uc['TSFE_adminConfig']['display_top']) {
@@ -757,7 +757,7 @@ class AdminPanelView
     /**
      * Translate given key
      *
-     * @param string $key Key for a label in the $LOCAL_LANG array of "sysext/lang/locallang_tsfe.xlf
+     * @param string $key Key for a label in the $LOCAL_LANG array of "sysext/lang/Resources/Private/Language/locallang_tsfe.xlf
      * @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars
      * @return string The value for the $key
      */
diff --git a/typo3/sysext/frontend/Configuration/TCA/backend_layout.php b/typo3/sysext/frontend/Configuration/TCA/backend_layout.php
index 73fad25bab77bff6deb096a899a635d0c88f9fe5..7ca350f45cedb8fe9665946c200e08bab8512536 100644
--- a/typo3/sysext/frontend/Configuration/TCA/backend_layout.php
+++ b/typo3/sysext/frontend/Configuration/TCA/backend_layout.php
@@ -49,7 +49,7 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
diff --git a/typo3/sysext/frontend/Configuration/TCA/fe_groups.php b/typo3/sysext/frontend/Configuration/TCA/fe_groups.php
index 6bf1ae19154de1720d39bec3ada502f8975db0f3..19b420bf04d2731f9301d1ec19c2be10ef073dfa 100644
--- a/typo3/sysext/frontend/Configuration/TCA/fe_groups.php
+++ b/typo3/sysext/frontend/Configuration/TCA/fe_groups.php
@@ -7,7 +7,7 @@ return [
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'enablecolumns' => [
             'disabled' => 'hidden'
         ],
@@ -23,7 +23,7 @@ return [
     ],
     'columns' => [
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
@@ -65,7 +65,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
diff --git a/typo3/sysext/frontend/Configuration/TCA/fe_users.php b/typo3/sysext/frontend/Configuration/TCA/fe_users.php
index 5c72bce84a3a6908106250c04747c69cbd57ddb7..a83a9509d62571270bfa5847934898b4e82b5b01 100644
--- a/typo3/sysext/frontend/Configuration/TCA/fe_users.php
+++ b/typo3/sysext/frontend/Configuration/TCA/fe_users.php
@@ -69,7 +69,7 @@ return [
         ],
         'name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.name',
             'config' => [
                 'type' => 'input',
                 'size' => 40,
@@ -79,7 +79,7 @@ return [
         ],
         'first_name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.first_name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.first_name',
             'config' => [
                 'type' => 'input',
                 'size' => 25,
@@ -89,7 +89,7 @@ return [
         ],
         'middle_name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.middle_name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.middle_name',
             'config' => [
                 'type' => 'input',
                 'size' => 25,
@@ -99,7 +99,7 @@ return [
         ],
         'last_name' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.last_name',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.last_name',
             'config' => [
                 'type' => 'input',
                 'size' => 25,
@@ -109,7 +109,7 @@ return [
         ],
         'address' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.address',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.address',
             'config' => [
                 'type' => 'text',
                 'cols' => 20,
@@ -118,7 +118,7 @@ return [
         ],
         'telephone' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.phone',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.phone',
             'config' => [
                 'type' => 'input',
                 'eval' => 'trim',
@@ -128,7 +128,7 @@ return [
         ],
         'fax' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fax',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fax',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -138,7 +138,7 @@ return [
         ],
         'email' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.email',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.email',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -148,7 +148,7 @@ return [
         ],
         'title' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title_person',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.title_person',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -158,7 +158,7 @@ return [
         ],
         'zip' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.zip',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.zip',
             'config' => [
                 'type' => 'input',
                 'eval' => 'trim',
@@ -168,7 +168,7 @@ return [
         ],
         'city' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.city',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.city',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -178,7 +178,7 @@ return [
         ],
         'country' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.country',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.country',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -188,7 +188,7 @@ return [
         ],
         'www' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.www',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.www',
             'config' => [
                 'type' => 'input',
                 'eval' => 'trim',
@@ -198,7 +198,7 @@ return [
         ],
         'company' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.company',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.company',
             'config' => [
                 'type' => 'input',
                 'eval' => 'trim',
@@ -208,7 +208,7 @@ return [
         ],
         'image' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.image',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.image',
             'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
                 'image',
                 [
@@ -220,14 +220,14 @@ return [
         ],
         'disable' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'config' => [
                 'type' => 'check'
             ]
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -237,7 +237,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -260,7 +260,7 @@ return [
         ],
         'lastlogin' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.lastlogin',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.lastlogin',
             'config' => [
                 'type' => 'input',
                 'readOnly' => true,
diff --git a/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php b/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
index 9db455857c204da9e071d3646826f8338fba3643..4a08cbf3fd7f011c1a4ad02b8c19b2d0f2903b99 100644
--- a/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
+++ b/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
@@ -8,7 +8,7 @@ return [
         'origUid' => 't3_origuid',
         'crdate' => 'crdate',
         'hideAtCopy' => 1,
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
         'enablecolumns' => [
@@ -47,7 +47,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -57,7 +57,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -157,32 +157,32 @@ return [
                     'foreign_types' => [
                         '0' => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_AUDIO => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
 								--palette--;;filePalette'
                         ],
                         \TYPO3\CMS\Core\Resource\File::FILETYPE_APPLICATION => [
                             'showitem' => '
-								--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+								--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 								--palette--;;filePalette'
                         ]
                     ]
@@ -202,7 +202,7 @@ return [
         ],
         'urltype' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -211,7 +211,7 @@ return [
             ]
         ],
         'shortcut' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.shortcut_page',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.shortcut_page',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -239,7 +239,7 @@ return [
             ]
         ],
         'sys_language_uid' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -257,7 +257,7 @@ return [
             ]
         ],
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/typo3/sysext/frontend/Configuration/TCA/sys_domain.php b/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
index fa1d28f88bdf889a04762640f9d5ccddec081f2c..7c127d562b0690f35a89f7b03cdf1c5fd39a187f 100644
--- a/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
+++ b/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
@@ -57,7 +57,7 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
diff --git a/typo3/sysext/frontend/Configuration/TCA/sys_template.php b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
index 5e6bd6678d3a058644a245fd4fe3b05b92c907c8..bbc9b6c2f6abf91365bb48e92c1a62c9efb17cc8 100644
--- a/typo3/sysext/frontend/Configuration/TCA/sys_template.php
+++ b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
@@ -5,7 +5,7 @@ return [
         'descriptionColumn' => 'description',
         'tstamp' => 'tstamp',
         'sortby' => 'sorting',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:sys_template',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
@@ -40,7 +40,7 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
@@ -48,7 +48,7 @@ return [
             ]
         ],
         'starttime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'exclude' => true,
             'config' => [
                 'type' => 'input',
@@ -58,7 +58,7 @@ return [
             ]
         ],
         'endtime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'exclude' => true,
             'config' => [
                 'type' => 'input',
@@ -221,7 +221,7 @@ return [
             ]
         ],
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/typo3/sysext/frontend/Configuration/TCA/tt_content.php b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
index 424f65cadfed2d823e21d99291ec0190ef90827d..e81418d13949d3b4d46e412f1203dd27c46877a2 100644
--- a/typo3/sysext/frontend/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
@@ -15,7 +15,7 @@ return [
         'origUid' => 't3_origuid',
         'type' => 'CType',
         'hideAtCopy' => true,
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'copyAfterDuplFields' => 'colPos,sys_language_uid',
         'useColumnsForDefaultValues' => 'colPos,sys_language_uid,CType',
         'shadowColumnsForNewPlaceholders' => 'colPos',
@@ -53,7 +53,7 @@ return [
     ],
     'columns' => [
         'CType' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -123,19 +123,19 @@ return [
         ],
         'editlock' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:editlock',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:editlock',
             'config' => [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'items' => [
@@ -147,7 +147,7 @@ return [
         ],
         'starttime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -159,7 +159,7 @@ return [
         ],
         'endtime' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -174,7 +174,7 @@ return [
         ],
         'fe_group' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.fe_group',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.fe_group',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
@@ -182,15 +182,15 @@ return [
                 'maxitems' => 20,
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.hide_at_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hide_at_login',
                         -1
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.any_login',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.any_login',
                         -2
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.usergroups',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.usergroups',
                         '--div--'
                     ]
                 ],
@@ -202,14 +202,14 @@ return [
         ],
         'sys_language_uid' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'special' => 'languages',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
                         -1,
                         'flags-multiple'
                     ],
@@ -220,7 +220,7 @@ return [
         'l18n_parent' => [
             'exclude' => true,
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -237,13 +237,13 @@ return [
         ],
         'layout' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.layout',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.layout',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                         '0'
                     ],
                     [
@@ -275,7 +275,7 @@ return [
                         '1'
                     ],
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.normal',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.normal',
                         '0'
                     ],
                     [
@@ -313,7 +313,7 @@ return [
         ],
         'rowDescription' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
@@ -344,13 +344,13 @@ return [
         ],
         'header_layout' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
                     [
-                        'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                        'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value',
                         '0'
                     ],
                     [
@@ -383,7 +383,7 @@ return [
         ],
         'subheader' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.subheader',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.subheader',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -394,7 +394,7 @@ return [
         'bodytext' => [
             'l10n_mode' => 'prefixLangTitle',
             'l10n_cat' => 'text',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.text',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.text',
             'config' => [
                 'type' => 'text',
                 'cols' => '80',
@@ -431,7 +431,7 @@ return [
             ]
         ],
         'image' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.images',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.images',
             'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('image', [
                 'appearance' => [
                     'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
@@ -441,32 +441,32 @@ return [
                 'foreign_types' => [
                     '0' => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 							--palette--;;filePalette'
                     ],
                     \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 							--palette--;;filePalette'
                     ],
                     \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 							--palette--;;filePalette'
                     ],
                     \TYPO3\CMS\Core\Resource\File::FILETYPE_AUDIO => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.audioOverlayPalette;audioOverlayPalette,
 							--palette--;;filePalette'
                     ],
                     \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.videoOverlayPalette;videoOverlayPalette,
 							--palette--;;filePalette'
                     ],
                     \TYPO3\CMS\Core\Resource\File::FILETYPE_APPLICATION => [
                         'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
+							--palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
 							--palette--;;filePalette'
                     ]
                 ]
@@ -576,7 +576,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -588,7 +588,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -688,7 +688,7 @@ return [
         ],
         'pages' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.startingpoint',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.startingpoint',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -706,7 +706,7 @@ return [
         ],
         'recursive' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.recursive',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.recursive',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -813,7 +813,7 @@ return [
         ],
         'select_key' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.code',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.code',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -853,7 +853,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -916,7 +916,7 @@ return [
                 'default' => 1,
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -928,7 +928,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -980,7 +980,7 @@ return [
                 'type' => 'check',
                 'items' => [
                     '1' => [
-                        '0' => 'LLL:EXT:lang/locallang_core.xlf:labels.enabled'
+                        '0' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'
                     ]
                 ]
             ]
@@ -1001,7 +1001,7 @@ return [
             ]
         ],
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -1095,7 +1095,7 @@ return [
                 'type' => 'check',
                 'default' => 0,
                 'items' => [
-                    ['LLL:EXT:lang/locallang_core.xml:labels.enabled', 1]
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xml:labels.enabled', 1]
                 ]
             ]
         ],
diff --git a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
index 8043a9f420b683942b7e3e8b0505635f1f7b0418..5fec58682139b082ea59c65a7de0c31fb3cc1ebc 100644
--- a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
+++ b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
@@ -74,7 +74,7 @@ class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
     {
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_mod_web_func.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_mod_web_func.xlf');
         $this->MCONF = [
             'name' => $this->moduleName,
         ];
@@ -203,7 +203,7 @@ class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
             // View page
             $viewButton = $buttonBar->makeLinkButton()
                 ->setOnClick(BackendUtility::viewOnClick($this->pageinfo['uid'], '', BackendUtility::BEgetRootLine($this->pageinfo['uid'])))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                 ->setIcon($this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL))
                 ->setHref('#');
             $buttonBar->addButton($viewButton);
diff --git a/typo3/sysext/func/ext_tables.php b/typo3/sysext/func/ext_tables.php
index 787ae5805d3ede195765e83b5f2d16861eb557d6..49bea4efa8a274b094145e1a0121dd36ef9df990 100644
--- a/typo3/sysext/func/ext_tables.php
+++ b/typo3/sysext/func/ext_tables.php
@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_func',
             'icon' => 'EXT:func/Resources/Public/Icons/module-func.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_web_func.xlf'
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_func.xlf'
         ]
     );
 }
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index aed779e02d78ffa53baf5b09b3fe663979a7848b..60622c3b423cd52a8d71901413acb4cddb796993 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -314,7 +314,7 @@ class ImportExportController extends BaseScriptClass
         if ($this->returnUrl) {
             $backButton = $buttonBar->makeLinkButton()
                 ->setHref($this->returnUrl)
-                ->setTitle($this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                ->setTitle($this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
             $buttonBar->addButton($backButton);
         }
@@ -330,7 +330,7 @@ class ImportExportController extends BaseScriptClass
                         BackendUtility::BEgetRootLine($this->pageinfo['uid'])
                     );
                     $viewButton = $buttonBar->makeLinkButton()
-                        ->setTitle($this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                        ->setTitle($this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                         ->setHref('#')
                         ->setIcon($this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL))
                         ->setOnClick($onClick);
@@ -689,12 +689,12 @@ class ImportExportController extends BaseScriptClass
             $opt = [
                 '-2' => $this->lang->getLL('makeconfig_tablesOnThisPage'),
                 '-1' => $this->lang->getLL('makeconfig_expandedTree'),
-                '0' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-                '1' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-                '2' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-                '3' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-                '4' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-                '999' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi'),
+                '0' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+                '1' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+                '2' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+                '3' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+                '4' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+                '999' => $this->lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
             ];
             $this->standaloneView->assign('levelSelectOptions', $opt);
             $this->standaloneView->assign('tableSelectOptions', $this->getTableSelectOptions('pages'));
diff --git a/typo3/sysext/impexp/Classes/Task/ImportExportTask.php b/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
index 1f1177bb32d89aad2794468b5595b97cff36e1d9..e84973d6defe8c75e0f57a8d9fc13abe99551c6b 100644
--- a/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
+++ b/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
@@ -114,7 +114,7 @@ class ImportExportTask implements TaskInterface
                     $description = [];
                     // Is public?
                     if ($presetCfg['public']) {
-                        $description[] = $lang->getLL('task.public') . ': ' . $lang->sL('LLL:EXT:lang/locallang_common.xlf:yes');
+                        $description[] = $lang->getLL('task.public') . ': ' . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes');
                     }
                     // Owner
                     $description[] = $lang->getLL('task.owner') . ': '
diff --git a/typo3/sysext/impexp/Classes/View/ExportPageTreeView.php b/typo3/sysext/impexp/Classes/View/ExportPageTreeView.php
index 6eae33460d7a0b862f3e067c899a85210406989d..89535969d619d77d4728cfc218e8e3bd2704d1cb 100644
--- a/typo3/sysext/impexp/Classes/View/ExportPageTreeView.php
+++ b/typo3/sysext/impexp/Classes/View/ExportPageTreeView.php
@@ -45,7 +45,7 @@ class ExportPageTreeView extends BrowseTreeView
      */
     public function wrapTitle($title, $row, $bank = 0)
     {
-        return trim($title) === '' ? '<em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</em>' : htmlspecialchars($title);
+        return trim($title) === '' ? '<em>[' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</em>' : htmlspecialchars($title);
     }
 
     /**
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html b/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
index e9944c0a443742259c71bfccf823d54c2b986c4b..b69b578bf77b6dbca3dcd77bce79970502d73067 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Import/Upload.html
@@ -10,12 +10,12 @@
 	<f:form.hidden name="file[upload][1][data]" value="1" />
 </div>
 <div class="form-group">
-	<f:form.submit class="btn btn-default" name="_upload" value="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:file_upload.php.submit')}" />
+	<f:form.submit class="btn btn-default" name="_upload" value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')}" />
 </div>
 <div class="form-group">
 	<label for="checkOverwriteExistingFiles">
 		<f:form.checkbox name="overwriteExistingFiles" id="checkOverwriteExistingFiles" value="replace" checked="checked" />
-		<f:translate key="LLL:EXT:lang/locallang_misc.xlf:overwriteExistingFiles" />
+		<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:overwriteExistingFiles" />
 	</label>
 </div>
 <f:if condition="{submitted}">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php b/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php
index b486fe5fe3a63df54b9ba4e1c52cecaebd666ca8..f28c83f9c94008ecd35559e0f2e98fa3e930c7f6 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php
@@ -35,7 +35,7 @@ return [
     'columns' => [
 
         't3ver_label' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.versionLabel',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -45,7 +45,7 @@ return [
 
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
             ],
@@ -53,7 +53,7 @@ return [
         'starttime' => [
             'exclude' => true,
             'l10n_mode' => 'mergeIfNotBlank',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
@@ -67,7 +67,7 @@ return [
         'endtime' => [
             'exclude' => true,
             'l10n_mode' => 'mergeIfNotBlank',
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index 688df1f332c35f05bca157c70f0eb6ea38e33a9b..56a4b893af5b9303e7106dbab7780c9eb6a512b1 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -518,7 +518,7 @@ class AdministrationController extends ActionController
         $allLines = $this->administrationRepository->getTree($this->pageUid, $depth, $mode);
 
         $this->view->assignMultiple([
-            'levelTranslations' => explode('|', $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.enterSearchLevels')),
+            'levelTranslations' => explode('|', $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enterSearchLevels')),
             'tree' => $allLines,
             'pageUid' => $this->pageUid,
             'mode' => $mode,
diff --git a/typo3/sysext/indexed_search/Configuration/TCA/index_config.php b/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
index a6367bf58b5b3a2d02a958c95e1b500fbe85579d..29a5610c3faa8268ed53cf64d2b7db19a3d5c2c5 100644
--- a/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
+++ b/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
@@ -22,14 +22,14 @@ return [
     ],
     'columns' => [
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'config' => [
                 'type' => 'check',
                 'default' => '1'
             ]
         ],
         'starttime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -77,11 +77,11 @@ return [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_core.xlf:labels.depth_0', '0'],
-                    ['LLL:EXT:lang/locallang_core.xlf:labels.depth_1', '1'],
-                    ['LLL:EXT:lang/locallang_core.xlf:labels.depth_2', '2'],
-                    ['LLL:EXT:lang/locallang_core.xlf:labels.depth_3', '3'],
-                    ['LLL:EXT:lang/locallang_core.xlf:labels.depth_4', '4']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0', '0'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1', '1'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2', '2'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3', '3'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4', '4']
                 ],
                 'size' => 1,
                 'maxitems' => 1
diff --git a/typo3/sysext/info/Classes/Controller/InfoModuleController.php b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
index 55f160c41f44092015da76a62edac6746ced7c35..338a9072a506654f55aef5946677b1ae3cb7f5bf 100644
--- a/typo3/sysext/info/Classes/Controller/InfoModuleController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
@@ -71,7 +71,7 @@ class InfoModuleController extends BaseScriptClass
     {
         $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
         $this->languageService = $GLOBALS['LANG'];
-        $this->languageService->includeLLFile('EXT:lang/locallang_mod_web_info.xlf');
+        $this->languageService->includeLLFile('EXT:lang/Resources/Private/Language/locallang_mod_web_info.xlf');
 
         $this->backendUser = $GLOBALS['BE_USER'];
 
@@ -167,7 +167,7 @@ class InfoModuleController extends BaseScriptClass
                 '',
                 BackendUtility::BEgetRootLine($this->pageinfo['uid'])
             ))
-            ->setTitle($this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+            ->setTitle($this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-view', Icon::SIZE_SMALL));
         $buttonBar->addButton($viewButton, ButtonBar::BUTTON_POSITION_LEFT, 1);
         // Shortcut
diff --git a/typo3/sysext/info/ext_tables.php b/typo3/sysext/info/ext_tables.php
index 54bfefd0fbed30ade0fa3df721534f4be3461a26..04fb6c52750a8319a2e0ae025a65ad21292ee473 100644
--- a/typo3/sysext/info/ext_tables.php
+++ b/typo3/sysext/info/ext_tables.php
@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_info',
             'icon' => 'EXT:info/Resources/Public/Icons/module-info.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_web_info.xlf'
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_info.xlf'
         ]
     );
 }
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index a54f8ecda4616bc187fc97fc2b72acf44c13d4a9..d2dbd523a867188d662c2d1da85f9a2e3e4f06ed 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -156,7 +156,7 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
                     $value = $languageService->getLL('status_updateIncomplete');
                     $severity = Status::WARNING;
                     $url = BackendUtility::getModuleUrl('system_extinstall');
-                    $message = sprintf($languageService->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_update'), '<a href="' . htmlspecialchars($url) . '">', '</a>');
+                    $message = sprintf($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_update'), '<a href="' . htmlspecialchars($url) . '">', '</a>');
                     break;
                 }
             }
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index 6ae0fc015743abdc8d803dfb525bdf356451a522..c51aad9b8223747c1cc59920e147644437a2c7ad 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -62,7 +62,7 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
             $value = $GLOBALS['LANG']->getLL('status_insecure');
             $severity = Status::ERROR;
             $changeInstallToolPasswordUrl = BackendUtility::getModuleUrl('system_extinstall');
-            $message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:warning.installtool_default_password'),
+            $message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.installtool_default_password'),
                 '<a href="' . htmlspecialchars($changeInstallToolPasswordUrl) . '">', '</a>');
         }
         return GeneralUtility::makeInstance(Status::class,
@@ -85,10 +85,10 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
                 $severity = Status::WARNING;
                 $disableInstallToolUrl = GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL') . '&adminCmd=remove_ENABLE_INSTALL_TOOL';
                 $value = $GLOBALS['LANG']->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_enabledPermanently');
-                $message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_enabled'),
+                $message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_enabled'),
                     '<code style="white-space: nowrap;">' . $enableInstallToolFile . '</code>');
                 $message .= ' <a href="' . htmlspecialchars($disableInstallToolUrl) . '">' .
-                    $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_enabled_cmd') . '</a>';
+                    $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_enabled_cmd') . '</a>';
             } else {
                 if (EnableFileService::installToolEnableFileLifetimeExpired()) {
                     EnableFileService::removeInstallToolEnableFile();
@@ -99,7 +99,7 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
                     $message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_installEnabledTemporarily'),
                         '<code style="white-space: nowrap;">' . $enableInstallToolFile . '</code>', floor((@filemtime($enableInstallToolFile) + EnableFileService::INSTALL_TOOL_ENABLE_FILE_LIFETIME - time()) / 60));
                     $message .= ' <a href="' . htmlspecialchars($disableInstallToolUrl) . '">' .
-                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_enabled_cmd') . '</a>';
+                        $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_enabled_cmd') . '</a>';
                 }
             }
         }
diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php
index ffaa17a468eab99a89ac166a52e9bacee0683169..c75cc16479fbff1c146d992ff6c48467a469fc89 100644
--- a/typo3/sysext/lang/Classes/Controller/LanguageController.php
+++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php
@@ -278,7 +278,7 @@ class LanguageController extends ActionController
         /** @var Menu $menu */
         $menu = GeneralUtility::makeInstance(Menu::class);
         $menu->setIdentifier('_languageMenu');
-        $menu->setLabel($this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.language'));
+        $menu->setLabel($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language'));
 
         /** @var MenuItem $languageListMenuItem */
         $languageListMenuItem = GeneralUtility::makeInstance(MenuItem::class);
diff --git a/typo3/sysext/lang/locallang_alt_doc.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_alt_doc.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_alt_doc.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_alt_doc.xlf
diff --git a/typo3/sysext/lang/locallang_alt_intro.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_alt_intro.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_alt_intro.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_alt_intro.xlf
diff --git a/typo3/sysext/lang/locallang_browse_links.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_browse_links.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf
diff --git a/typo3/sysext/lang/locallang_common.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_common.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_common.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_common.xlf
diff --git a/typo3/sysext/lang/locallang_core.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_core.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_core.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_core.xlf
diff --git a/typo3/sysext/lang/locallang_general.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_general.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_general.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_general.xlf
diff --git a/typo3/sysext/lang/locallang_login.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_login.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_login.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_login.xlf
diff --git a/typo3/sysext/lang/locallang_misc.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_misc.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_misc.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_misc.xlf
diff --git a/typo3/sysext/lang/locallang_mod_admintools.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_admintools.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_admintools.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_admintools.xlf
diff --git a/typo3/sysext/lang/locallang_mod_file.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_file.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_file.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_file.xlf
diff --git a/typo3/sysext/lang/locallang_mod_file_list.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_file_list.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_file_list.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_file_list.xlf
diff --git a/typo3/sysext/lang/locallang_mod_help.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_help.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_help.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_help.xlf
diff --git a/typo3/sysext/lang/locallang_mod_help_about.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_help_about.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_help_about.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_help_about.xlf
diff --git a/typo3/sysext/lang/locallang_mod_help_cshmanual.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_help_cshmanual.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_help_cshmanual.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_help_cshmanual.xlf
diff --git a/typo3/sysext/lang/locallang_mod_system.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_system.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_system.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_system.xlf
diff --git a/typo3/sysext/lang/locallang_mod_user_ws.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_user_ws.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_user_ws.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_user_ws.xlf
diff --git a/typo3/sysext/lang/locallang_mod_usertools.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_usertools.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_usertools.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_usertools.xlf
diff --git a/typo3/sysext/lang/locallang_mod_web.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_web.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_web.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_web.xlf
diff --git a/typo3/sysext/lang/locallang_mod_web_func.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_func.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_web_func.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_func.xlf
diff --git a/typo3/sysext/lang/locallang_mod_web_info.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_info.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_web_info.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_info.xlf
diff --git a/typo3/sysext/lang/locallang_mod_web_list.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_list.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_mod_web_list.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_mod_web_list.xlf
diff --git a/typo3/sysext/lang/locallang_show_rechis.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_show_rechis.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_show_rechis.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_show_rechis.xlf
diff --git a/typo3/sysext/lang/locallang_t3lib_fullsearch.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_t3lib_fullsearch.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
diff --git a/typo3/sysext/lang/locallang_tca.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_tca.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_tca.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_tca.xlf
diff --git a/typo3/sysext/lang/locallang_tcemain.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_tcemain.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_tcemain.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_tcemain.xlf
diff --git a/typo3/sysext/lang/locallang_tsfe.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_tsfe.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_tsfe.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_tsfe.xlf
diff --git a/typo3/sysext/lang/locallang_tsparser.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_tsparser.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_tsparser.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_tsparser.xlf
diff --git a/typo3/sysext/lang/locallang_view_help.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_view_help.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_view_help.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_view_help.xlf
diff --git a/typo3/sysext/lang/locallang_wizards.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_wizards.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_wizards.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_wizards.xlf
diff --git a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
index 21d55d83c3df06fffacdc8ab3f756f2f7dd4ec80..7b2e0f65689c74d9abb44bac6bffbfba8c4838da 100644
--- a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
+++ b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
@@ -357,12 +357,12 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
         // Build level selector
         $options = [];
         $availableOptions = [
-            0 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-            1 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-            2 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-            3 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-            4 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-            999 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+            0 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+            1 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+            2 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+            3 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+            4 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+            999 => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi')
         ];
         foreach ($availableOptions as $optionValue => $optionLabel) {
             $options[] = '<option value="' . $optionValue . '"' . ($optionValue === (int)$this->searchLevel ? ' selected="selected"' : '') . '>' . htmlspecialchars($optionLabel) . '</option>';
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index 4311894e4ec6f87885fbae4fdb36b0bfe900bbca..0993b070fc613dcac41f24da9a9cd59984f90da4 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -597,7 +597,7 @@ class ValidatorTask extends AbstractTask
         $depth = (int)$this->getDepth();
         $additionalInformation[] = $lang->sL($this->languageFile . ':tasks.validate.page') . ': ' . $pageLabel;
         $additionalInformation[] = $lang->sL($this->languageFile . ':tasks.validate.depth') . ': '
-            . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_' . ($depth === 999 ? 'infi' : $depth));
+            . $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_' . ($depth === 999 ? 'infi' : $depth));
         $additionalInformation[] = $lang->sL($this->languageFile . ':tasks.validate.email') . ': '
             . $this->getEmail();
 
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
index af0b94bbd09e43b2c5bad514473915e907228e76..4e14294814d118ad57a5cb1d43a24cada1c10148 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
@@ -116,12 +116,12 @@ class ValidatorTaskAdditionalFieldProvider implements AdditionalFieldProviderInt
         // input for depth
         $fieldId = 'task_depth';
         $fieldValueArray = [
-            '0' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-            '1' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-            '2' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-            '3' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-            '4' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-            '999' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+            '0' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+            '1' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+            '2' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+            '3' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+            '4' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+            '999' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi')
         ];
         $fieldCode = '<select class="form-control" name="tx_scheduler[linkvalidator][depth]" id="' . $fieldId . '">';
         foreach ($fieldValueArray as $depth => $label) {
diff --git a/typo3/sysext/opendocs/Resources/Private/Templates/DropDown.html b/typo3/sysext/opendocs/Resources/Private/Templates/DropDown.html
index ef23bfb6dbd3e82c941ca8537db9f605c71bf577..bd432cd25ea3189b487275407f0f6f8f972435d5 100644
--- a/typo3/sysext/opendocs/Resources/Private/Templates/DropDown.html
+++ b/typo3/sysext/opendocs/Resources/Private/Templates/DropDown.html
@@ -28,7 +28,7 @@
                             </a>
                         </div>
                         <div class="dropdown-table-column dropdown-table-actions">
-                            <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-close t3js-topbar-opendocs-close" data-opendocsidentifier="{openDocument.md5sum}" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:rm.closeDoc')}">
+                            <a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-close t3js-topbar-opendocs-close" data-opendocsidentifier="{openDocument.md5sum}" title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc')}">
                                 <core:icon identifier="actions-close" alternativeMarkupIdentifier="inline" />
                             </a>
                         </div>
@@ -57,4 +57,4 @@
             </div>
         </f:if>
     </f:else>
-</f:if>
\ No newline at end of file
+</f:if>
diff --git a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
index b88450ed4608cf76501a7d4258288dd06ed44a6f..72cd58aba875f66ef95c87604e1ec09f704a7e37 100644
--- a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php
@@ -152,7 +152,7 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn
             return '';
         }
         $link = '<p><a href="' . htmlspecialchars(GeneralUtility::linkThisScript(['setTempDBmount' => 0])) . '" class="btn btn-primary">'
-            . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.temporaryDBmount')) . '</a></p>';
+            . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.temporaryDBmount')) . '</a></p>';
 
         return $link;
     }
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index 58143c44afbad7b7fcd1ba7418df957ca475340b..278fdc3185ef95ec10effa1837569dc8349dc599 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -291,7 +291,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
                 $pDim = '';
             }
             // Create file icon:
-            $size = ' (' . GeneralUtility::formatSize($fileObject->getSize(), $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:byteSizeUnits')) . ($pDim ? ', ' . $pDim : '') . ')';
+            $size = ' (' . GeneralUtility::formatSize($fileObject->getSize(), $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:byteSizeUnits')) . ($pDim ? ', ' . $pDim : '') . ')';
             $icon = '<span title="' . htmlspecialchars($fileObject->getName() . $size) . '">' . $this->iconFactory->getIconForResource($fileObject, Icon::SIZE_SMALL) . '</span>';
             // Create links for adding the file:
             $filesIndex = count($this->elements);
@@ -413,7 +413,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
                     $addParams,
                     'id="checkDisplayThumbs"'
                 )
-                . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:displayThumbs')) . '</label></div>';
+                . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:displayThumbs')) . '</label></div>';
             $out .= $thumbNailCheck;
         } else {
             $out .= '<div style="padding-top: 15px;"></div>';
diff --git a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
index d673fd429117ef772ec01455e8ce02ec54739d73..15a7dada0230cbb98149c9d12488ac124a426764 100644
--- a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
@@ -127,7 +127,7 @@ abstract class AbstractLinkBrowserController
      */
     protected function init()
     {
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_browse_links.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_browse_links.xlf');
     }
 
     /**
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
index 136433df90f3b53839058bbdfcc069f80fe5ede5..4b570f709cfb4e3ce9c53da882f9a9b0d5b0f351 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
@@ -71,7 +71,7 @@ class ElementBrowserController
      */
     protected function init()
     {
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_browse_links.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_browse_links.xlf');
 
         $this->mode = GeneralUtility::_GP('mode');
     }
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
index dbbf642a36fa40647af119aa5f3a9895712571a1..93a2ad2cf0b51439d788efc0e8446633689a3301 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
@@ -90,7 +90,7 @@ class ElementBrowserFramesetController
 		');
 
         // build the header part
-        $documentTemplate->startPage($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:TYPO3_Element_Browser'));
+        $documentTemplate->startPage($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:TYPO3_Element_Browser'));
 
         // URL for the inner main frame:
         $url = $moduleUrl . rawurlencode($mode) . '&bparams=' . rawurlencode($bparams);
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
index f1d00f63304096a476b1c5af27a92bd105a52eaf..22b6fee7f638f538b21a67743f9ca030b32cd2ca 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
@@ -204,7 +204,7 @@ class FileLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
         // Get size and icon:
         $size = GeneralUtility::formatSize(
             $fileOrFolderObject->getSize(),
-            $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:byteSizeUnits')
+            $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:byteSizeUnits')
         );
 
         return [
diff --git a/typo3/sysext/recordlist/Classes/RecordList.php b/typo3/sysext/recordlist/Classes/RecordList.php
index 57329261886fa43f333352ac8af8a43e50b6524f..ea0085c9d60cbbdd1624ba7f580d7335095e46e7 100644
--- a/typo3/sysext/recordlist/Classes/RecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList.php
@@ -194,7 +194,7 @@ class RecordList extends AbstractModule
     public function __construct()
     {
         parent::__construct();
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_mod_web_list.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf');
         $this->moduleTemplate->getPageRenderer()->loadJquery();
         $this->moduleTemplate->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Recordlist/FieldSelectBox');
         $this->moduleTemplate->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Recordlist/Recordlist');
@@ -230,7 +230,7 @@ class RecordList extends AbstractModule
         $this->menuConfig();
         // Store session data
         $backendUser->setAndSaveSessionData(self::class, $sessionData);
-        $this->getPageRenderer()->addInlineLanguageLabelFile('EXT:lang/locallang_mod_web_list.xlf');
+        $this->getPageRenderer()->addInlineLanguageLabelFile('EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf');
     }
 
     /**
@@ -566,7 +566,7 @@ class RecordList extends AbstractModule
             $searchButton
                 ->setHref('#')
                 ->setClasses('t3js-toggle-search-toolbox')
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.searchIcon'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.searchIcon'))
                 ->setIcon($this->iconFactory->getIcon('actions-search', Icon::SIZE_SMALL));
             $this->moduleTemplate->getDocHeaderComponent()->getButtonBar()->addButton($searchButton,
                 ButtonBar::BUTTON_POSITION_LEFT, 90);
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 973262fd805609d49606480e44ca2880246cf701..56e6200d4a7cb80f21a75577a28937438ee39975 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -588,7 +588,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList
         foreach ($searchLevelItems as $kv => $label) {
             $opt[] = '<option value="' . $kv . '"' . ($kv === $this->searchLevels ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
         }
-        $lMenu = '<select class="form-control" name="search_levels" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.search_levels')) . '" id="search_levels">' . implode('', $opt) . '</select>';
+        $lMenu = '<select class="form-control" name="search_levels" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.search_levels')) . '" id="search_levels">' . implode('', $opt) . '</select>';
         // Table with the search box:
         $content = '<div class="db_list-searchbox-form db_list-searchbox-toolbar module-docheader-bar module-docheader-bar-search t3js-module-docheader-bar t3js-module-docheader-bar-search" id="db_list-searchbox-toolbar" style="display: ' . ($this->searchString == '' ? 'none' : 'block') . ';">
 			' . $formElements[0] . '
@@ -597,19 +597,19 @@ class AbstractDatabaseRecordList extends AbstractRecordList
                         <div class="panel-body">
                             <div class="form-inline form-inline-spaced">
                                 <div class="form-group">
-									<input class="form-control" type="search" placeholder="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.enterSearchString')) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.searchString')) . '" name="search_field" id="search_field" value="' . htmlspecialchars($this->searchString) . '" />
+									<input class="form-control" type="search" placeholder="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enterSearchString')) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.searchString')) . '" name="search_field" id="search_field" value="' . htmlspecialchars($this->searchString) . '" />
                                 </div>
                                 <div class="form-group">
-									<label for="search_levels">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.label.search_levels')) . ': </label>
+									<label for="search_levels">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.label.search_levels')) . ': </label>
 									' . $lMenu . '
                                 </div>
                                 <div class="form-group">
-									<label for="showLimit">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.label.limit')) . ': </label>
-									<input class="form-control" type="number" min="0" max="10000" placeholder="10" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.limit')) . '" name="showLimit" id="showLimit" value="' . htmlspecialchars(($this->showLimit ? $this->showLimit : '')) . '" />
+									<label for="showLimit">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.label.limit')) . ': </label>
+									<input class="form-control" type="number" min="0" max="10000" placeholder="10" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.limit')) . '" name="showLimit" id="showLimit" value="' . htmlspecialchars(($this->showLimit ? $this->showLimit : '')) . '" />
                                 </div>
                                 <div class="form-group">
-									<button type="submit" class="btn btn-default" name="search" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.title.search')) . '">
-										' . $iconFactory->getIcon('actions-search', Icon::SIZE_SMALL)->render() . ' ' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.search')) . '
+									<button type="submit" class="btn btn-default" name="search" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.title.search')) . '">
+										' . $iconFactory->getIcon('actions-search', Icon::SIZE_SMALL)->render() . ' ' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.search')) . '
                                     </button>
                                 </div>
                             </div>
@@ -1057,7 +1057,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList
         $origCode = $code;
         // If the title is blank, make a "no title" label:
         if ((string)$code === '') {
-            $code = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.no_title')) . ']</i> - '
+            $code = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title')) . ']</i> - '
                 . htmlspecialchars(BackendUtility::getRecordTitle($table, $row));
         } else {
             $code = htmlspecialchars($code, ENT_QUOTES, 'UTF-8', false);
@@ -1085,7 +1085,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList
                 if ($table == 'pages' || $table == 'tt_content') {
                     $code = '<a href="#" onclick="' . htmlspecialchars(
                         BackendUtility::viewOnClick(($table == 'tt_content' ? $this->id . '#' . $row['uid'] : $row['uid']))
-                    ) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">' . $code . '</a>';
+                    ) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">' . $code . '</a>';
                 }
                 break;
             case 'info':
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index 95764d292017fdbe9d703e9dcd3e8692f511b69c..311e3a69cc19e41dd78b2c663b741d03c48effe8 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -260,7 +260,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             if (!in_array($this->pageRow['doktype'], $noViewDokTypes)) {
                 $onClick = htmlspecialchars(BackendUtility::viewOnClick($this->id, '', BackendUtility::BEgetRootLine($this->id)));
                 $buttons['view'] = '<a href="#" onclick="' . $onClick . '" title="'
-                    . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">'
+                    . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">'
                     . $this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '</a>';
             }
             // New record on pages that are not locked by editlock
@@ -299,7 +299,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             }
             // Cache
             $buttons['cache'] = '<a href="' . htmlspecialchars(($this->listURL() . '&clear_cache=1')) . '" title="'
-                . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.clear_cache')) . '">'
+                . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clear_cache')) . '">'
                 . $this->iconFactory->getIcon('actions-system-cache-clear', Icon::SIZE_SMALL)->render() . '</a>';
             if ($this->table && (!isset($module->modTSconfig['properties']['noExportRecordsLinks'])
                 || (isset($module->modTSconfig['properties']['noExportRecordsLinks'])
@@ -307,20 +307,20 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             ) {
                 // CSV
                 $buttons['csv'] = '<a href="' . htmlspecialchars(($this->listURL() . '&csv=1')) . '" title="'
-                    . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.csv')) . '">'
+                    . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.csv')) . '">'
                     . $this->iconFactory->getIcon('actions-document-export-csv', Icon::SIZE_SMALL)->render() . '</a>';
                 // Export
                 if (ExtensionManagementUtility::isLoaded('impexp')) {
                     $url = BackendUtility::getModuleUrl('xMOD_tximpexp', ['tx_impexp[action]' => 'export']);
                     $buttons['export'] = '<a href="' . htmlspecialchars($url . '&tx_impexp[list][]='
                             . rawurlencode($this->table . ':' . $this->id)) . '" title="'
-                        . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.export')) . '">'
+                        . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.export')) . '">'
                         . $this->iconFactory->getIcon('actions-document-export-t3d', Icon::SIZE_SMALL)->render() . '</a>';
                 }
             }
             // Reload
             $buttons['reload'] = '<a href="' . htmlspecialchars($this->listURL()) . '" title="'
-                . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload')) . '">'
+                . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.reload')) . '">'
                 . $this->iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL)->render() . '</a>';
             // Shortcut
             if ($backendUser->mayMakeShortcut()) {
@@ -334,7 +334,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             if ($this->returnUrl) {
                 $href = htmlspecialchars(GeneralUtility::linkThisUrl($this->returnUrl, ['id' => $this->id]));
                 $buttons['back'] = '<a href="' . $href . '" class="typo3-goBack" title="'
-                    . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack')) . '">'
+                    . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack')) . '">'
                     . $this->iconFactory->getIcon('actions-view-go-back', Icon::SIZE_SMALL)->render() . '</a>';
             }
         }
@@ -394,7 +394,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                 $viewButton = $buttonBar->makeLinkButton()
                     ->setHref('#')
                     ->setOnClick($onClick)
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-view', Icon::SIZE_SMALL));
                 $buttonBar->addButton($viewButton, ButtonBar::BUTTON_POSITION_LEFT, 20);
             }
@@ -432,7 +432,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             // Cache
             $clearCacheButton = $buttonBar->makeLinkButton()
                 ->setHref($this->listURL() . '&clear_cache=1')
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.clear_cache'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clear_cache'))
                 ->setIcon($this->iconFactory->getIcon('actions-system-cache-clear', Icon::SIZE_SMALL));
             $buttonBar->addButton($clearCacheButton, ButtonBar::BUTTON_POSITION_RIGHT);
             if ($this->table && (!isset($module->modTSconfig['properties']['noExportRecordsLinks'])
@@ -442,7 +442,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                 // CSV
                 $csvButton = $buttonBar->makeLinkButton()
                     ->setHref($this->listURL() . '&csv=1')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.csv'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.csv'))
                     ->setIcon($this->iconFactory->getIcon('actions-document-export-csv', Icon::SIZE_SMALL));
                 $buttonBar->addButton($csvButton, ButtonBar::BUTTON_POSITION_LEFT, 40);
                 // Export
@@ -450,7 +450,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                     $url = BackendUtility::getModuleUrl('xMOD_tximpexp', ['tx_impexp[action]' => 'export']);
                     $exportButton = $buttonBar->makeLinkButton()
                         ->setHref($url . '&tx_impexp[list][]=' . rawurlencode($this->table . ':' . $this->id))
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.export'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.export'))
                         ->setIcon($this->iconFactory->getIcon('actions-document-export-t3d', Icon::SIZE_SMALL));
                     $buttonBar->addButton($exportButton, ButtonBar::BUTTON_POSITION_LEFT, 40);
                 }
@@ -458,7 +458,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             // Reload
             $reloadButton = $buttonBar->makeLinkButton()
                 ->setHref($this->listURL())
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.reload'))
                 ->setIcon($this->iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL));
             $buttonBar->addButton($reloadButton, ButtonBar::BUTTON_POSITION_RIGHT);
             // Shortcut
@@ -484,7 +484,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             if ($this->returnUrl) {
                 $href = htmlspecialchars(GeneralUtility::linkThisUrl($this->returnUrl, ['id' => $this->id]));
                 $buttons['back'] = '<a href="' . $href . '" class="typo3-goBack" title="'
-                    . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack')) . '">'
+                    . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack')) . '">'
                     . $this->iconFactory->getIcon('actions-view-go-back', Icon::SIZE_SMALL) . '</a>';
             }
         }
@@ -604,8 +604,8 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
         $selectFields = array_unique($selectFields);
         $fieldListFields = $this->makeFieldList($table, 1);
         if (empty($fieldListFields) && $GLOBALS['TYPO3_CONF_VARS']['BE']['debug']) {
-            $message = sprintf(htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:missingTcaColumnsMessage')), $table, $table);
-            $messageTitle = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:missingTcaColumnsMessageTitle'));
+            $message = sprintf(htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:missingTcaColumnsMessage')), $table, $table);
+            $messageTitle = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:missingTcaColumnsMessageTitle'));
             /** @var FlashMessage $flashMessage */
             $flashMessage = GeneralUtility::makeInstance(
                 FlashMessage::class,
@@ -705,8 +705,8 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                 if (!$this->table) {
                     $href = htmlspecialchars(($this->listURL() . '&collapse[' . $table . ']=' . ($tableCollapsed ? '0' : '1')));
                     $title = $tableCollapsed
-                        ? htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.expandTable'))
-                        : htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.collapseTable'));
+                        ? htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.expandTable'))
+                        : htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.collapseTable'));
                     $icon = '<span class="collapseIcon">' . $this->iconFactory->getIcon(($tableCollapsed ? 'actions-view-list-expand' : 'actions-view-list-collapse'), Icon::SIZE_SMALL)->render() . '</span>';
                     $collapseIcon = '<a href="' . $href . '" title="' . $title . '" class="pull-right t3js-toggle-recordlist" data-table="' . htmlspecialchars($table) . '" data-toggle="collapse" data-target="#recordlist-' . htmlspecialchars($table) . '">' . $icon . '</a>';
                 }
@@ -1064,15 +1064,15 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             switch ((string)$fCol) {
                 case '_PATH_':
                     // Path
-                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels._PATH_')) . ']</i>';
+                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels._PATH_')) . ']</i>';
                     break;
                 case '_REF_':
                     // References
-                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:c__REF_')) . ']</i>';
+                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_')) . ']</i>';
                     break;
                 case '_LOCALIZATION_':
                     // Path
-                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels._LOCALIZATION_')) . ']</i>';
+                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels._LOCALIZATION_')) . ']</i>';
                     break;
                 case '_LOCALIZATION_b':
                     // Path
@@ -1311,8 +1311,8 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
         $currentPage = floor($this->firstElementNumber / $this->iLimit) + 1;
         // Compile first, previous, next, last and refresh buttons
         if ($currentPage > 1) {
-            $labelFirst = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:first'));
-            $labelPrevious = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:previous'));
+            $labelFirst = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:first'));
+            $labelPrevious = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:previous'));
             $first = '<li><a href="' . $listURL . '&pointer=' . $this->getPointerForPage(1) . '" title="' . $labelFirst . '">'
                 . $this->iconFactory->getIcon('actions-view-paging-first', Icon::SIZE_SMALL)->render() . '</a></li>';
             $previous = '<li><a href="' . $listURL . '&pointer=' . $this->getPointerForPage($currentPage - 1) . '" title="' . $labelPrevious . '">'
@@ -1322,8 +1322,8 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             $previous = '<li class="disabled"><span>' . $this->iconFactory->getIcon('actions-view-paging-previous', Icon::SIZE_SMALL)->render() . '</span></li>';
         }
         if ($currentPage < $totalPages) {
-            $labelNext = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:next'));
-            $labelLast = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:last'));
+            $labelNext = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:next'));
+            $labelLast = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:last'));
             $next = '<li><a href="' . $listURL . '&pointer=' . $this->getPointerForPage($currentPage + 1) . '" title="' . $labelNext . '">'
                 . $this->iconFactory->getIcon('actions-view-paging-next', Icon::SIZE_SMALL)->render() . '</a></li>';
             $last = '<li><a href="' . $listURL . '&pointer=' . $this->getPointerForPage($totalPages) . '" title="' . $labelLast . '">'
@@ -1335,7 +1335,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
         $reload = '<li><a href="#" onclick="document.dblistForm.action=' . GeneralUtility::quoteJSvalue($listURL
             . '&pointer=') . '+calculatePointer(document.getElementById(' . GeneralUtility::quoteJSvalue('jumpPage-' . $renderPart)
             . ').value); document.dblistForm.submit(); return true;" title="'
-            . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:reload')) . '">'
+            . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:reload')) . '">'
             . $this->iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL)->render() . '</a></li>';
         if ($renderPart === 'top') {
             // Add js to traverse a page select input to a pointer value
@@ -1361,7 +1361,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
             . '&pointer=') . '+calculatePointer(this.value); document.dblistForm.submit(); } return true;" />
 			';
         $pageIndicatorText = sprintf(
-            $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:pageIndicator'),
+            $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:pageIndicator'),
             $pageNumberInput,
             $totalPages
         );
@@ -1371,7 +1371,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
         } else {
             $lastElementNumber = $this->totalItems;
         }
-        $rangeIndicator = '<li><span>' . sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:rangeIndicator'), ($this->firstElementNumber + 1), $lastElementNumber) . '</span></li>';
+        $rangeIndicator = '<li><span>' . sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:rangeIndicator'), ($this->firstElementNumber + 1), $lastElementNumber) . '</span></li>';
 
         $titleColumn = $this->fieldArray[0];
         $data = [
@@ -1439,7 +1439,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                         '',
                         ($table === 'tt_content' ? '#' . $row['uid'] : '')
                     )
-                ) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">'
+                ) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">'
                 . $this->iconFactory->getIcon('actions-view', Icon::SIZE_SMALL)->render() . '</a>';
             $this->addActionToCellGroup($cells, $viewAction, 'view');
         }
@@ -1589,9 +1589,9 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                     $refCountMsg = BackendUtility::referenceCount(
                         $table,
                         $row['uid'],
-                        ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToRecord'),
+                        ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToRecord'),
                         $this->getReferenceCount($table, $row['uid'])) . BackendUtility::translationCount($table, $row['uid'],
-                        ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.translationsOfRecord')
+                        ' ' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.translationsOfRecord')
                     );
                 }
 
@@ -1744,7 +1744,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
 
                 $cells['copy'] = '<a class="btn btn-default" href="#" onclick="'
                     . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 1, ($isSel === 'copy'), ['returnUrl' => ''])) . ');')
-                    . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.copy')) . '">'
+                    . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy')) . '">'
                     . $copyIcon->render() . '</a>';
 
                 // Check permission to cut page or content
@@ -1761,7 +1761,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                     if ($permsEdit) {
                         $cells['cut'] = '<a class="btn btn-default" href="#" onclick="'
                         . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 0, ($isSel === 'cut'), ['returnUrl' => ''])) . ');')
-                        . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.cut')) . '">'
+                        . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut')) . '">'
                         . $cutIcon->render() . '</a>';
                     } else {
                         $cells['cut'] = $this->spaceIcon;
@@ -1770,7 +1770,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
                     if ($table !== 'pages' && $this->calcPerms & Permission::CONTENT_EDIT) {
                         $cells['cut'] = '<a class="btn btn-default" href="#" onclick="'
                         . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 0, ($isSel === 'cut'), ['returnUrl' => ''])) . ');')
-                        . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.cut')) . '">'
+                        . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut')) . '">'
                         . $cutIcon->render() . '</a>';
                     } else {
                         $cells['cut'] = $this->spaceIcon;
@@ -1983,7 +1983,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
 						<tr>
 							<th class="col-checkbox checkbox" colspan="2">
 								<label><input type="checkbox" class="checkbox checkAll" ' . ($checkAllChecked ? ' checked="checked"' : '') . '>
-								' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.toggleall')) . '</label>
+								' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.toggleall')) . '</label>
 							</th>
 						</tr>
 					</thead>
@@ -1993,7 +1993,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList
 				</table>
 			</div>
 			<input type="submit" name="search" class="btn btn-default" value="'
-            . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.setFields')) . '"/>
+            . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.setFields')) . '"/>
 			' . $formElements[1];
         return '<div class="fieldSelectBox">' . $content . '</div>';
     }
diff --git a/typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php b/typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php
index 9ee5945d35e11457573fb069a4a579602b5a58f7..78a2a72ba6563b677ecf56283775bafd9641d185 100644
--- a/typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php
+++ b/typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php
@@ -68,7 +68,7 @@ class FolderUtilityRenderer
         $markup[] = '<div class="element-browser-section element-browser-createfolder">';
         $markup[] = '<form action="' . htmlspecialchars($formAction)
             . '" method="post" name="editform" enctype="multipart/form-data">';
-        $markup[] = '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:create_folder.title')) . ':</h3>';
+        $markup[] = '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:create_folder.title')) . ':</h3>';
         $markup[] = '<p><strong>' . htmlspecialchars($lang->getLL('path')) . ':</strong>'
             . htmlspecialchars($folderObject->getIdentifier()) . '</p>';
 
@@ -88,7 +88,7 @@ class FolderUtilityRenderer
         $markup[] = '<input type="hidden" name="redirect" value="' . htmlspecialchars($redirectValue) . '" />';
         $markup[] = '</div><div class="col-xs-4">';
         $markup[] = '<input class="btn btn-default" type="submit" name="submit" value="'
-            . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:create_folder.submit')) . '" />';
+            . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:create_folder.submit')) . '" />';
 
         $markup[] = '</div></div></form>';
         $markup[] = '</div>';
@@ -135,7 +135,7 @@ class FolderUtilityRenderer
         $markup[] = '<div class="element-browser-section element-browser-upload">';
         $markup[] = '   <form action="' . htmlspecialchars($formAction)
             . '" method="post" name="editform" enctype="multipart/form-data">';
-        $markup[] = '   <h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle')) . ':</h3>';
+        $markup[] = '   <h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.pagetitle')) . ':</h3>';
         $markup[] = '   <p><strong>' . htmlspecialchars($lang->getLL('path')) . ':</strong>' . htmlspecialchars($header) . '</p>';
         // Traverse the number of upload fields:
         for ($a = 1; $a <= $count; $a++) {
@@ -157,7 +157,7 @@ class FolderUtilityRenderer
         if (!empty($fileExtList)) {
             $markup[] = '<div class="form-group">';
             $markup[] = '    <label>';
-            $markup[] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.allowedFileExtensions')) . '<br/>';
+            $markup[] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.allowedFileExtensions')) . '<br/>';
             $markup[] = '    </label>';
             $markup[] = '    <div class="form-control">';
             $markup[] = implode(' ', $fileExtList);
@@ -168,11 +168,11 @@ class FolderUtilityRenderer
         $markup[] = '<div class="checkbox">';
         $markup[] = '    <label>';
         $markup[] = '    <input type="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="replace" />';
-        $markup[] = htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_misc.xlf:overwriteExistingFiles'));
+        $markup[] = htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:overwriteExistingFiles'));
         $markup[] = '    </label>';
         $markup[] = '</div>';
         $markup[] = '<input class="btn btn-default" type="submit" name="submit" value="'
-            . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.submit')) . '" />';
+            . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')) . '" />';
 
         $markup[] = '   </form>';
         $markup[] = '</div>';
@@ -198,7 +198,7 @@ class FolderUtilityRenderer
             $markup[] = '<div class="element-browser-section element-browser-mediaurls">';
             $markup[] = '   <form action="' . htmlspecialchars($formAction)
                 . '" method="post" name="editform1" id="typo3-addMediaForm" enctype="multipart/form-data">';
-            $markup[] = '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media')) . ':</h3>';
+            $markup[] = '<h3>' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media')) . ':</h3>';
             $markup[] = '<p><strong>' . htmlspecialchars($lang->getLL('path')) . ':</strong>' . htmlspecialchars($header) . '</p>';
             $markup[] = '<div class="row form-group"><div class="col-xs-8">';
             $markup[] = '<input type="hidden" name="file[newMedia][0][target]" value="'
@@ -206,15 +206,15 @@ class FolderUtilityRenderer
             $markup[] = '<input type="hidden" name="file[newMedia][0][allowed]" value="'
                 . htmlspecialchars(implode(',', $allowedExtensions)) . '" />';
             $markup[] = '<input type="text" name="file[newMedia][0][url]" class="form-control" placeholder="'
-                . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.placeholder')) . '" />';
+                . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.placeholder')) . '" />';
             $markup[] = '</div><div class="col-xs-4">';
             $markup[] = '<button class="btn btn-default">'
-                . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.submit')) . '</button>';
+                . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.submit')) . '</button>';
 
             $markup[] = '</div></div>';
             $markup[] = '<div class="form-group">';
             $markup[] = '    <label>';
-            $markup[] = $lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.allowedProviders') . '<br/>';
+            $markup[] = $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:online_media.new_media.allowedProviders') . '<br/>';
             $markup[] = '    </label>';
             $markup[] = '    <div class="form-control">';
             $markup[] = implode(' ', $fileExtList);
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
index 599b93a2b8b04a35af94961070b5f115d63b9c84..7526095d5d0f4d09483fb08e1284ecd4021445b2 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/File.html
@@ -4,12 +4,12 @@
 
 <div class="row link-browser-section link-browser-filetree">
 	<div class="col-xs-6">
-		<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:folderTree" /></h3>
+		<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:folderTree" /></h3>
 		{tree -> f:format.raw()}
 	</div>
 	<div class="col-xs-6">
 		<f:if condition="{selectedFolder}">
-			<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:files" /></h3>
+			<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:files" /></h3>
 			<span title="{selectedFolder.identifier}">
 				{selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
 			</span>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
index 1bcc75b908597e63a646d1a3fd32e3c84dd5fe25..d98a65680a79fc15554178e06cbf99b88fc6048b 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Folder.html
@@ -1,11 +1,11 @@
 <div class="row link-browser-section link-browser-filetree">
 	<div class="col-xs-6">
-		<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:folderTree" /></h3>
+		<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:folderTree" /></h3>
 		{tree -> f:format.raw()}
 	</div>
 	<div class="col-xs-6">
 		<f:if condition="{selectedFolder}">
-			<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:folders" /></h3>
+			<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:folders" /></h3>
 			<span class="{f:if(condition: '{selectedFolder.combinedIdentifier} == {currentIdentifier}', then: 'bg-success')}" title="{selectedFolder.identifier}">
 				{selectedFolderIcon -> f:format.raw()} {selectedFolderTitle}
 			</span>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
index 9e7488183905d2300600d69501bc4d1f98d514b9..d2ffc40b0ac4f2160b751c6b96251d43587cd804 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Mail.html
@@ -1,12 +1,12 @@
 <div class="link-browser-section link-browser-tab-content-mail">
 	<form action="" id="lmailform" class="form-horizontal">
 		<div class="form-group form-group-sm">
-			<label class="col-xs-4 control-label"><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:emailAddress" /></label>
+			<label class="col-xs-4 control-label"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:emailAddress" /></label>
 			<div class="col-xs-6">
 				<input type="text" name="lemail" size="20" class="form-control" value="{email}" />
 			</div>
 			<div class="col-xs-2">
-				<input class="btn btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:lang/locallang_browse_links.xlf:setLink')}" />
+				<input class="btn btn-default" type="submit" value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
 			</div>
 		</div>
 	</form>
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
index 17882de94a14636512ecc62326eec5156b55b5d2..af57a41b75a10a0582558414c20ced11c4a866e4 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Page.html
@@ -1,10 +1,10 @@
 <div class="link-browser-section link-browser-pagetree">
 	<div class="col-xs-6">
-		<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:pageTree" /></h3>
+		<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:pageTree" /></h3>
 		<f:if condition="{temporaryTreeMountCancelLink}">
 			<p>
 				<a href="{temporaryTreeMountCancelLink}" class="btn btn-primary">
-					<f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.temporaryDBmount" />
+					<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.temporaryDBmount" />
 				</a>
 			</p>
 		</f:if>
@@ -12,7 +12,7 @@
 	</div>
 	<div class="col-xs-6">
 		<f:if condition="{expandActivePage}">
-			<h3><f:translate key="LLL:EXT:lang/locallang_browse_links.xlf:contentElements" /></h3>
+			<h3><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:contentElements" /></h3>
 			<ul class="list-tree list-tree-root list-tree-root-clean">
 				<li class="list-tree-control-open">
 					<span class="list-tree-group">
diff --git a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
index 9aa6fc04806867880b29ba28849fc30f74e52f21..ea3ae0950c7237e40d55eb9b055314d6decd85f4 100644
--- a/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
+++ b/typo3/sysext/recordlist/Resources/Private/Templates/LinkBrowser/Url.html
@@ -7,7 +7,7 @@
 			</div>
 			<div class="col-xs-2">
 				<input class="btn btn-default" type="submit"
-							 value="{f:translate(key: 'LLL:EXT:lang/locallang_browse_links.xlf:setLink')}" />
+							 value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:setLink')}" />
 			</div>
 		</div>
 	</form>
diff --git a/typo3/sysext/recordlist/ext_tables.php b/typo3/sysext/recordlist/ext_tables.php
index ccc6d94ce11c7cbf9cf1a24767b22dff3d49e2d6..927463f3aa45f063842274a5c282ea5f5d337bd2 100644
--- a/typo3/sysext/recordlist/ext_tables.php
+++ b/typo3/sysext/recordlist/ext_tables.php
@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_list',
             'icon' => 'EXT:recordlist/Resources/Public/Icons/module-list.svg',
-            'labels' => 'LLL:EXT:lang/locallang_mod_web_list.xlf'
+            'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf'
         ]
     );
 
@@ -26,29 +26,29 @@ if (TYPO3_MODE === 'BE') {
 		TCEMAIN.linkHandler {
 			page {
 				handler = TYPO3\\CMS\\Recordlist\\LinkHandler\\PageLinkHandler
-				label = LLL:EXT:lang/locallang_browse_links.xlf:page
+				label = LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:page
 			}
 			file {
 				handler = TYPO3\\CMS\\Recordlist\\LinkHandler\\FileLinkHandler
-				label = LLL:EXT:lang/locallang_browse_links.xlf:file
+				label = LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:file
 				displayAfter = page
 				scanAfter = page
 			}
 			folder {
 				handler = TYPO3\\CMS\\Recordlist\\LinkHandler\\FolderLinkHandler
-				label = LLL:EXT:lang/locallang_browse_links.xlf:folder
+				label = LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:folder
 				displayAfter = file
 				scanAfter = file
 			}
 			url {
 				handler = TYPO3\\CMS\\Recordlist\\LinkHandler\\UrlLinkHandler
-				label = LLL:EXT:lang/locallang_browse_links.xlf:extUrl
+				label = LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:extUrl
 				displayAfter = folder
 				scanAfter = mail
 			}
 			mail {
 				handler = TYPO3\\CMS\\Recordlist\\LinkHandler\\MailLinkHandler
-				label = LLL:EXT:lang/locallang_browse_links.xlf:email
+				label = LLL:EXT:lang/Resources/Private/Language/locallang_browse_links.xlf:email
 				displayAfter = url
 			}
 		}
diff --git a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
index fccbe77bbea81c006a1370bd3231e2b446870ef1..1fe98c53e99b4cfa9ef9064388ee6dc54fa5cc17 100644
--- a/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
+++ b/typo3/sysext/recycler/Resources/Private/Templates/RecyclerModule/Index.html
@@ -14,12 +14,12 @@
 			</div>
 			<div class="form-group">
 				<select name="depth" class="form-control">
-					<option value="0"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_0" /></option>
-					<option value="1"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_1" /></option>
-					<option value="2"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_2" /></option>
-					<option value="3"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_3" /></option>
-					<option value="4"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_4" /></option>
-					<option value="999"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_infi" /></option>
+					<option value="0"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
+					<option value="1"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
+					<option value="2"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
+					<option value="3"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
+					<option value="4"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
+					<option value="999"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
 				</select>
 			</div>
 			<div class="form-group">
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 987e7f0d48f3fcd8af1b5085e2b5e90302bf9938..6058b632f3c021bc91f6a917b8308b53299a0d6e 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -94,7 +94,7 @@ class ConfigurationStatus implements StatusProviderInterface
             $value = $this->getLanguageService()->getLL('status_empty');
             $severity = ReportStatus::WARNING;
             $url =  BackendUtility::getModuleUrl('system_dbint') . '&id=0&SET[function]=refindex';
-            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.backend_reference_index'), '<a href="' . htmlspecialchars($url) . '">', '</a>', BackendUtility::datetime($lastRefIndexUpdate));
+            $message = sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.backend_reference_index'), '<a href="' . htmlspecialchars($url) . '">', '</a>', BackendUtility::datetime($lastRefIndexUpdate));
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_referenceIndex'), $value, $message, $severity);
     }
@@ -178,7 +178,7 @@ class ConfigurationStatus implements StatusProviderInterface
         if (!empty($failedConnections)) {
             $value = $this->getLanguageService()->getLL('status_connectionFailed');
             $severity = ReportStatus::WARNING;
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.memcache_not_usable') . '<br /><br />' . '<ul><li>' . implode('</li><li>', $failedConnections) . '</li></ul>';
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.memcache_not_usable') . '<br /><br />' . '<ul><li>' . implode('</li><li>', $failedConnections) . '</li></ul>';
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_memcachedConfiguration'), $value, $message, $severity);
     }
@@ -192,11 +192,11 @@ class ConfigurationStatus implements StatusProviderInterface
     protected function getDeprecationLogStatus()
     {
         $title = $this->getLanguageService()->getLL('status_configuration_DeprecationLog');
-        $value = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:disabled');
+        $value = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:disabled');
         $message = '';
         $severity = ReportStatus::OK;
         if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['enableDeprecationLog']) {
-            $value = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:enabled');
+            $value = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:enabled');
             $message = '<p>' . $this->getLanguageService()->getLL('status_configuration_DeprecationLogEnabled') . '</p>';
             $severity = ReportStatus::NOTICE;
             $logFile = GeneralUtility::getDeprecationLogFileName();
diff --git a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
index 3503f9db0191713a6afbb8b5ac72862d446d5d18..c170f4e87f7e37451f6bf764462ae8eb4305f6da 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
@@ -62,7 +62,7 @@ class SecurityStatus implements StatusProviderInterface
         if (empty($GLOBALS['TYPO3_CONF_VARS']['FE']['cHashIncludePageId'])) {
             $value = $this->getLanguageService()->getLL('status_insecure');
             $severity = ReportStatus::ERROR;
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_cache_flooding');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_cache_flooding');
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_cacheFloodingProtection'), $value, $message, $severity);
     }
@@ -80,7 +80,7 @@ class SecurityStatus implements StatusProviderInterface
         if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] === GeneralUtility::ENV_TRUSTED_HOSTS_PATTERN_ALLOW_ALL) {
             $value = $this->getLanguageService()->getLL('status_insecure');
             $severity = ReportStatus::ERROR;
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_trustedhosts');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_trustedhosts');
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_trustedHostsPattern'), $value, $message, $severity);
     }
@@ -137,7 +137,7 @@ class SecurityStatus implements StatusProviderInterface
                     ]
                 );
                 $message = sprintf(
-                    $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.backend_admin'),
+                    $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.backend_admin'),
                     '<a href="' . htmlspecialchars($editUserAccountUrl) . '">',
                     '</a>'
                 );
@@ -161,7 +161,7 @@ class SecurityStatus implements StatusProviderInterface
             $severity = ReportStatus::ERROR;
             $url = 'install/index.php?redirect_url=index.php' . urlencode('?TYPO3_INSTALL[type]=config#set_encryptionKey');
             $message = sprintf(
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.install_encryption'),
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_encryption'),
                 '<a href="' . $url . '">',
                 '</a>'
             );
@@ -186,7 +186,7 @@ class SecurityStatus implements StatusProviderInterface
             $value = $this->getLanguageService()->getLL('status_insecure');
             $severity = ReportStatus::ERROR;
             $message = sprintf(
-                $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_deny_pattern_partsNotPresent'),
+                $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_deny_pattern_partsNotPresent'),
                 '<br /><pre>' . htmlspecialchars(FILE_DENY_PATTERN_DEFAULT) . '</pre><br />'
             );
         }
@@ -208,7 +208,7 @@ class SecurityStatus implements StatusProviderInterface
             && GeneralUtility::verifyFilenameAgainstDenyPattern('.htaccess')) {
             $value = $this->getLanguageService()->getLL('status_insecure');
             $severity = ReportStatus::ERROR;
-            $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:warning.file_deny_htaccess');
+            $message = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_deny_htaccess');
         }
         return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_htaccessUploadProtection'), $value, $message, $severity);
     }
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
index 953872773f80b4351782126a11e72ad872db752d..381ec0d6f875832f46556f439f85fbbf95fb32bd 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
@@ -477,7 +477,7 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
                     $addParams,
                     'id="checkDisplayThumbs"'
                 )
-                              . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:displayThumbs')) . '</label></div>';
+                              . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:displayThumbs')) . '</label></div>';
             $out .= $thumbNailCheck;
         } else {
             $out .= '<div style="padding-top: 15px;"></div>';
diff --git a/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php b/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
index af760b8f93de2e8fbff048b01f2e715a8da20dbc..f0700d2f458cb4e02ba820e175abe985d6afa244 100644
--- a/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
+++ b/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
@@ -20,14 +20,14 @@ return [
     ],
     'columns' => [
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'starttime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -37,7 +37,7 @@ return [
             ]
         ],
         'endtime' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -51,15 +51,15 @@ return [
             ]
         ],
         'sys_language_uid' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', '-1'],
-                    ['LLL:EXT:lang/locallang_general.xlf:LGL.default_value', '0']
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', '-1'],
+                    ['LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.default_value', '0']
                 ],
                 'default' => 0,
                 'showIconTable' => true,
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index a8539603e75058b2f8f8df5f36f8c7c12f75d4c9..2a799cc93ca913c27e86b52b48db56e0c5d78e5d 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -731,7 +731,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
         $table = [];
 
         // Disable checkbox
-        $label = '<label>' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:disable') . '</label>';
+        $label = '<label>' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:disable') . '</label>';
         $table[] =
             '<div class="form-section" id="task_disable_row"><div class="form-group">'
                 . BackendUtility::wrapInHelp($this->cshKey, 'task_disable', $label)
@@ -1038,7 +1038,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
             foreach ($taskGroup['tasks'] as $schedulerRecord) {
                 // Define action icons
                 $link = htmlspecialchars($this->moduleUri . '&CMD=edit&tx_scheduler[uid]=' . $schedulerRecord['uid']);
-                $editAction = '<a class="btn btn-default" href="' . $link . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:edit')) . '" class="icon">' .
+                $editAction = '<a class="btn btn-default" href="' . $link . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:edit')) . '" class="icon">' .
                     $this->moduleTemplate->getIconFactory()->getIcon('actions-open', Icon::SIZE_SMALL)->render() . '</a>';
                 if ((int)$schedulerRecord['disable'] === 1) {
                     $translationKey = 'enable';
@@ -1049,21 +1049,21 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                 }
                 $toggleHiddenAction = '<a class="btn btn-default" href="' . htmlspecialchars($this->moduleUri
                     . '&CMD=toggleHidden&tx_scheduler[uid]=' . $schedulerRecord['uid']) . '" title="'
-                    . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:' . $translationKey))
+                    . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:' . $translationKey))
                     . '" class="icon">' . $icon->render() . '</a>';
                 $deleteAction = '<a class="btn btn-default t3js-modal-trigger" href="' . htmlspecialchars($this->moduleUri . '&CMD=delete&tx_scheduler[uid]=' . $schedulerRecord['uid']) . '" '
                     . ' data-severity="warning"'
-                    . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:delete')) . '"'
-                    . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:cancel')) . '"'
+                    . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:delete')) . '"'
+                    . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')) . '"'
                     . ' data-content="' . htmlspecialchars($this->getLanguageService()->getLL('msg.delete')) . '"'
-                    . ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:delete')) . '" class="icon">' .
+                    . ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:delete')) . '" class="icon">' .
                     $this->moduleTemplate->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</a>';
                 $stopAction = '<a class="btn btn-default t3js-modal-trigger" href="' . htmlspecialchars($this->moduleUri . '&CMD=stop&tx_scheduler[uid]=' . $schedulerRecord['uid']) . '" '
                     . ' data-severity="warning"'
-                    . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:stop')) . '"'
-                    . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:cancel')) . '"'
+                    . ' data-title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:stop')) . '"'
+                    . ' data-button-close-text="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')) . '"'
                     . ' data-content="' . htmlspecialchars($this->getLanguageService()->getLL('msg.stop')) . '"'
-                    . ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:stop')) . '" class="icon">' .
+                    . ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:stop')) . '" class="icon">' .
                     $this->moduleTemplate->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL)->render() . '</a>';
                 $runAction = '<a class="btn btn-default" href="' . htmlspecialchars($this->moduleUri . '&tx_scheduler[execute][]=' . $schedulerRecord['uid']) . '" title="' . htmlspecialchars($this->getLanguageService()->getLL('action.run_task')) . '" class="icon">' .
                     $this->moduleTemplate->getIconFactory()->getIcon('extensions-scheduler-run-task', Icon::SIZE_SMALL)->render() . '</a>';
@@ -1143,9 +1143,9 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                     }
                     // Get multiple executions setting
                     if ($task->getExecution()->getMultiple()) {
-                        $multiple = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:yes');
+                        $multiple = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes');
                     } else {
-                        $multiple = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:no');
+                        $multiple = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:no');
                     }
                     // Define checkbox
                     $startExecutionElement = '<label class="btn btn-default btn-checkbox"><input type="checkbox" name="tx_scheduler[execute][]" value="' . $schedulerRecord['uid'] . '" id="task_' . $schedulerRecord['uid'] . '"><span class="t3-icon fa"></span></label>';
@@ -1544,7 +1544,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
         // Add and Reload
         if (empty($this->CMD) || $this->CMD === 'list' || $this->CMD === 'delete' || $this->CMD === 'stop' || $this->CMD === 'toggleHidden') {
             $reloadButton = $buttonBar->makeLinkButton()
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.reload'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-refresh', Icon::SIZE_SMALL))
                 ->setHref($this->moduleUri);
             $buttonBar->addButton($reloadButton, ButtonBar::BUTTON_POSITION_RIGHT, 1);
@@ -1560,7 +1560,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
         if ($this->CMD === 'add' || $this->CMD === 'edit') {
             // Close
             $closeButton = $buttonBar->makeLinkButton()
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:cancel'))
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL))
                 ->setOnClick('document.location=' . GeneralUtility::quoteJSvalue($this->moduleUri))
                 ->setHref('#');
@@ -1572,21 +1572,21 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                 ->setValue('save')
                 ->setForm('tx_scheduler_form')
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:save'));
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:save'));
             $saveButtonDropdown->addItem($saveButton);
             $saveAndNewButton = $buttonBar->makeInputButton()
                 ->setName('CMD')
                 ->setValue('savenew')
                 ->setForm('tx_scheduler_form')
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save-new', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:saveAndCreateNewDoc'));
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:saveAndCreateNewDoc'));
             $saveButtonDropdown->addItem($saveAndNewButton);
             $saveAndCloseButton = $buttonBar->makeInputButton()
                 ->setName('CMD')
                 ->setValue('saveclose')
                 ->setForm('tx_scheduler_form')
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save-close', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:saveAndClose'));
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:saveAndClose'));
             $saveButtonDropdown->addItem($saveAndCloseButton);
             $buttonBar->addButton($saveButtonDropdown, ButtonBar::BUTTON_POSITION_LEFT, 3);
         }
@@ -1597,7 +1597,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                 ->setValue('delete')
                 ->setForm('tx_scheduler_form')
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL))
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:delete'));
+                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:delete'));
             $buttonBar->addButton($deleteButton, ButtonBar::BUTTON_POSITION_LEFT, 4);
         }
         // Shortcut
diff --git a/typo3/sysext/scheduler/Configuration/TCA/tx_scheduler_task_group.php b/typo3/sysext/scheduler/Configuration/TCA/tx_scheduler_task_group.php
index d75dd421ad4b75e65872a0d13f30cb340c137073..1f2dec83563236852f3f36d111a4e279be1b077f 100644
--- a/typo3/sysext/scheduler/Configuration/TCA/tx_scheduler_task_group.php
+++ b/typo3/sysext/scheduler/Configuration/TCA/tx_scheduler_task_group.php
@@ -39,7 +39,7 @@ return [
             ],
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.disable',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable',
             'exclude' => true,
             'config' => [
                 'type' => 'check',
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
index 7c00e1920e3cf69b04ed842b75416a5e430fd725..06a93a211d66147338073a255f37955d9145c7c9 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
@@ -23,7 +23,7 @@
 			<f:for each="{registeredClasses}" key="class" as="classInfo">
 				<tr>
 					<td>
-						<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}">
+						<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:new')}">
 							{classInfo.title}
 						</a>
 					</td>
@@ -32,7 +32,7 @@
 					<td>
 						<div class="btn-group" role="group">
 							<span class="btn btn-default">
-								<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}">
+								<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:new')}">
 									<core:icon identifier="actions-document-new" />
 								</a>
 							</span>
@@ -42,4 +42,4 @@
 			</f:for>
 		</tbody>
 	</table>
-</div>
\ No newline at end of file
+</div>
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 8eb7e5f5e01eeeb34d25c8d22265d5cf9b324f8c..71d4d6c423286e9816b3fd1cb7e38a15e5fb8298 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -434,7 +434,7 @@ class SetupModuleController extends AbstractModule
 
         $saveButton = $buttonBar->makeInputButton()
             ->setName('data[save]')
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
             ->setValue('1')
             ->setForm('SetupModuleController')
             ->setShowLabelText(true)
diff --git a/typo3/sysext/setup/ext_tables.php b/typo3/sysext/setup/ext_tables.php
index 00a17e367ca546b25221dd4b574ce76fe161ab18..f0e7f90383710dc71e516c2883e196510c988bc8 100644
--- a/typo3/sysext/setup/ext_tables.php
+++ b/typo3/sysext/setup/ext_tables.php
@@ -58,7 +58,7 @@ if (TYPO3_MODE === 'BE') {
                 'csh' => 'passwordCurrent',
             ],
             'avatar' => [
-                'label' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.avatar',
+                'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.avatar',
                 'type' => 'avatar',
                 'table' => 'be_users',
                 'allowed' => $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
diff --git a/typo3/sysext/sv/Classes/Report/ServicesListReport.php b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
index 7f0e620d55e22cb35fed05ab85e23df7033303b4..eb5c3b1eeca7a1b385478c452fc1c0bf0024422a 100644
--- a/typo3/sysext/sv/Classes/Report/ServicesListReport.php
+++ b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
@@ -119,14 +119,14 @@ class ServicesListReport implements ReportInterface
             'OperatingSystem' => $serviceInformation['os'] ?: $this->getLanguageService()->getLL('any'),
             'RequiredExecutables' => $serviceInformation['exec'] ?: '-',
             'AvailabilityClass' => 'danger',
-            'Available' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:no'),
+            'Available' => $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:no'),
         ];
 
         try {
             $serviceDetails = ExtensionManagementUtility::findServiceByKey($serviceKey);
             if ($serviceDetails['available']) {
                 $result['AvailabilityClass'] = 'success';
-                $result['Available'] = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:yes');
+                $result['Available'] = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:yes');
             }
         } catch (Exception $e) {
         }
@@ -149,7 +149,7 @@ class ServicesListReport implements ReportInterface
             $searchPathData = $this->getServicePathStatus($isValid);
             $result[] = [
                 'class' => $searchPathData['statusCSSClass'],
-                'accessible' => 'LLL:EXT:lang/locallang_common.xlf:' . $searchPathData['accessible'],
+                'accessible' => 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:' . $searchPathData['accessible'],
                 'path' => GeneralUtility::fixWindowsFilePath($path),
             ];
         }
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 09a00221cab459ab13ca94a272f99b09f45c7c91..584bff35f39f6ec38f01a38e5504d58010293356 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -381,30 +381,30 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
                         <fieldset class="form-section">
                             <h4 class="form-section-headline">' . $this->getLanguageService()->getLL('action_t1_legend_generalFields') . '</h4>
                             <div class="form-group">
-                                <label for="field_disable">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.disable') . '</label>
+                                <label for="field_disable">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.disable') . '</label>
                                 <input type="checkbox" id="field_disable" name="data[disable]" value="1" class="checkbox" ' . ($vars['disable'] == 1 ? ' checked="checked" ' : '') . ' />
                             </div>
                             <div class="form-group">
-                                <label for="field_realname">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.name') . '</label>
+                                <label for="field_realname">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.name') . '</label>
                                 <input type="text" id="field_realname" class="form-control" name="data[realName]" value="' . htmlspecialchars($vars['realName']) . '" />
                             </div>
                             <div class="form-group">
-                                <label for="field_username">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tca.xlf:be_users.username') . '</label>
+                                <label for="field_username">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.username') . '</label>
                                 <input type="text" id="field_username" class="form-control" name="data[username]" value="' . htmlspecialchars($vars['username']) . '" />
                             </div>
                             <div class="form-group">
-                                <label for="field_password">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tca.xlf:be_users.password') . '</label>
+                                <label for="field_password">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.password') . '</label>
                                 <input type="password" id="field_password" class="form-control" name="data[password]" value="" />
                             </div>
                             <div class="form-group">
-                                <label for="field_email">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.email') . '</label>
+                                <label for="field_email">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.email') . '</label>
                                 <input type="text" id="field_email" class="form-control" name="data[email]" value="' . htmlspecialchars($vars['email']) . '" />
                             </div>
                         </fieldset>
                         <fieldset class="form-section">
                             <h4 class="form-section-headline">' . $this->getLanguageService()->getLL('action_t1_legend_configuration') . '</h4>
                             <div class="form-group">
-                                <label for="field_usergroup">' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup') . '</label>
+                                <label for="field_usergroup">' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_users.usergroup') . '</label>
                                 <select id="field_usergroup" class="form-control" name="data[usergroup][]" multiple="multiple">
                                     ' . $this->getUsergroups($record, $vars) . '
                                 </select>
diff --git a/typo3/sysext/sys_action/Configuration/TCA/sys_action.php b/typo3/sysext/sys_action/Configuration/TCA/sys_action.php
index 7e4c1c7ae7b353498995473d07999687a0158476..59760eb76e64a13e450791cc33a31c3e658899de 100644
--- a/typo3/sysext/sys_action/Configuration/TCA/sys_action.php
+++ b/typo3/sysext/sys_action/Configuration/TCA/sys_action.php
@@ -6,7 +6,7 @@ return [
         'tstamp' => 'tstamp',
         'default_sortby' => 'ORDER BY title',
         'sortby' => 'sorting',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'title' => 'LLL:EXT:sys_action/Resources/Private/Language/locallang_tca.xlf:sys_action',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
@@ -26,7 +26,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.title',
             'config' => [
                 'type' => 'input',
                 'size' => 25,
@@ -35,7 +35,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 10,
@@ -49,7 +49,7 @@ return [
             ]
         ],
         'type' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.type',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
diff --git a/typo3/sysext/sys_note/Configuration/TCA/sys_note.php b/typo3/sysext/sys_note/Configuration/TCA/sys_note.php
index 3d35de3f41754c386c5544bcfd8f1b5cdb2c0be7..f29d5f075de103f80385b8641a09be14b66be212 100644
--- a/typo3/sysext/sys_note/Configuration/TCA/sys_note.php
+++ b/typo3/sysext/sys_note/Configuration/TCA/sys_note.php
@@ -6,7 +6,7 @@ return [
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser',
-        'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
+        'prependAtCopy' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
         'delete' => 'deleted',
         'title' => 'LLL:EXT:sys_note/Resources/Private/Language/locallang_tca.xlf:sys_note',
         'typeicon_classes' => [
@@ -19,7 +19,7 @@ return [
     ],
     'columns' => [
         'category' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.category',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.category',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
diff --git a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
index b1e8b3b4923f916ebd0260a7ce8955e8b4cc3c81..acd06b06438a18fa9725a660ea68e13659fb4492 100644
--- a/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
+++ b/typo3/sysext/sys_note/Resources/Private/Templates/Note/List.html
@@ -36,7 +36,7 @@
 							<a href="{notes:editLink(id:note.uid)}" class="btn btn-default btn-sm">
 								<core:icon identifier="actions-open" />
 							</a>
-							<a href="{notes:deleteLink(id:note.uid)}" class="btn btn-default btn-sm t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:lang/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:cancel')}">
+							<a href="{notes:deleteLink(id:note.uid)}" class="btn btn-default btn-sm t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')}">
 								<core:icon identifier="actions-edit-delete" />
 							</a>
 						</div>
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index eb05c6c9ca5f5665647852fac108a59422f9f259..72bd8fb4c2c65ce81911f5ed322dd1f15b567e56 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -322,7 +322,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                     '',
                     BackendUtility::BEgetRootLine($this->pageinfo['uid'])
                 ))
-                ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+                ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
                 ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-view', Icon::SIZE_SMALL));
             $buttonBar->addButton($viewButton, ButtonBar::BUTTON_POSITION_LEFT, 99);
             if ($this->extClassConf['name'] === TypoScriptTemplateInformationModuleFunctionController::class) {
@@ -342,13 +342,13 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                             'actions-document-save',
                             Icon::SIZE_SMALL
                         ))
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'));
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'));
 
                     $saveAndCloseButton = $buttonBar->makeInputButton()
                         ->setName('_saveandclosedok')
                         ->setValue('1')
                         ->setForm('TypoScriptTemplateModuleController')
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'))
                         ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                             'actions-document-save-close',
                             Icon::SIZE_SMALL
@@ -363,7 +363,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                     // CLOSE button
                     $closeButton = $buttonBar->makeLinkButton()
                         ->setHref(BackendUtility::getModuleUrl('web_ts', ['id' => $this->id]))
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
                         ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                             'actions-document-close',
                             Icon::SIZE_SMALL
@@ -372,7 +372,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                 } else {
                     $newButton = $buttonBar->makeLinkButton()
                         ->setHref(BackendUtility::getModuleUrl('web_ts', $urlParameters))
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:db_new.php.pagetitle'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:db_new.php.pagetitle'))
                         ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                             'actions-document-new',
                             Icon::SIZE_SMALL
@@ -386,7 +386,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                     ->setName('_savedok')
                     ->setValue('1')
                     ->setForm('TypoScriptTemplateModuleController')
-                    ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc'))
+                    ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.saveDoc'))
                     ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                         'actions-document-save',
                         Icon::SIZE_SMALL
@@ -402,7 +402,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                     $backButton = $buttonBar->makeLinkButton()
                         ->setHref(BackendUtility::getModuleUrl('web_ts', $urlParameters))
                         ->setClasses('typo3-goBack')
-                        ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
+                        ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.goBack'))
                         ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
                             'actions-view-go-back',
                             Icon::SIZE_SMALL
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/InformationModule.html b/typo3/sysext/tstemplate/Resources/Private/Templates/InformationModule.html
index 6b2090dd25f3a038af78d1b57e186b22fe559d0e..ef1dd56f44a792d3d85dee3c8d00740cb644f4c2 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/InformationModule.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/InformationModule.html
@@ -52,8 +52,8 @@
 
 <f:section name="TemplateTableRow">
     <tr>
-        <td><a href="{line.url}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:editField')}"><strong>{line.label}</strong></a></td>
+        <td><a href="{line.url}" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:editField')}"><strong>{line.label}</strong></a></td>
         <td width="80%">{line.data}</td>
-        <td><a href="{line.url}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:editField')}"><span class="btn btn-default"><core:icon identifier="actions-open" /></span></a></td>
+        <td><a href="{line.url}" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:editField')}"><span class="btn btn-default"><core:icon identifier="actions-open" /></span></a></td>
     </tr>
 </f:section>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
index b667827cc084bae283e1fcbe1ba977a3bf46962f..f7bac104a2afeba976715eb0a9f9691371cab781 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/TemplateObjectBrowserModuleFunction.html
@@ -138,7 +138,7 @@
 																				 value="{postSearchField}"/></div>
 				</div>
 				<input class="btn btn-default tsob-search-submit" type="submit" name="search"
-							 value="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:search')}"/>
+							 value="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:search')}"/>
 			</div>
 			<div class="checkbox">
 				<label for="checkTs_browser_regexsearch">
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index c516a6232ea66eb7be6901d0b3e802fcaa979207..d9b0a3baae04a2114342122d171be9d74ccc0dd2 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -243,7 +243,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
         if ($this->recordFound && $GLOBALS['TCA'][$this->table]['ctrl']['versioningWS']) {
             // View page
             $buttons['view'] = '
-				<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], '', BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage')) . '">
+				<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], '', BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">
 					' . $this->moduleTemplate->getIconFactory()->getIcon('actions-document-view', Icon::SIZE_SMALL)->render() . '
 				</a>';
             // Shortcut
@@ -257,7 +257,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
                     'id' => $this->pageinfo['uid'],
                     'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
                 ]
-            )) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList')) . '</a>';
+            )) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showList')) . '</a>';
         }
         return $buttons;
     }
@@ -388,7 +388,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 					<td>' . $row['t3ver_count'] . '</td>
 					<td>' . $row['pid'] . '</td>
 					<td>
-						<a href="' . htmlspecialchars($editUrl) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.edit')) . '">
+						<a href="' . htmlspecialchars($editUrl) . '" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.edit')) . '">
 							' . $this->moduleTemplate->getIconFactory()->getIcon('actions-open', Icon::SIZE_SMALL)->render() . '
 						</a>' . htmlspecialchars($row['t3ver_label']) . '
 					</td>
@@ -547,9 +547,9 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
             'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
         ]);
         $adminLink = '<div class="btn-group btn-group-sm" role="group">';
-        $adminLink .= '<a class="btn btn-default" href="' . htmlspecialchars($editUrl) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.edit')) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-open', Icon::SIZE_SMALL)->render() . '</a>';
+        $adminLink .= '<a class="btn btn-default" href="' . htmlspecialchars($editUrl) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.edit')) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-open', Icon::SIZE_SMALL)->render() . '</a>';
         // Delete link:
-        $adminLink .= '<a class="btn btn-default" href="' . htmlspecialchars(BackendUtility::getLinkToDataHandlerAction('&cmd[' . $table . '][' . $row['uid'] . '][delete]=1')) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.delete')) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</a>';
+        $adminLink .= '<a class="btn btn-default" href="' . htmlspecialchars(BackendUtility::getLinkToDataHandlerAction('&cmd[' . $table . '][' . $row['uid'] . '][delete]=1')) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete')) . '">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</a>';
         $adminLink .= '</div>';
         if ($table === 'pages') {
             // If another page module was specified, replace the default Page module with the new one
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 7328d677d4fe596844741df9e3d827b625e060be..91b63560078aa8b462d9342dcb7a9ace48fdb79d 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -964,9 +964,9 @@ class DataHandlerHook
             // Set log entry for live record:
             $propArr = $dataHandler->getRecordPropertiesFromRow($table, $swapVersion);
             if ($propArr['_ORIG_pid'] == -1) {
-                $label = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.offline_record_updated');
+                $label = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tcemain.xlf:version_swap.offline_record_updated');
             } else {
-                $label = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.online_record_updated');
+                $label = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tcemain.xlf:version_swap.online_record_updated');
             }
             $theLogId = $dataHandler->log($table, $id, 2, $propArr['pid'], 0, $label, 10, [$propArr['header'], $table . ':' . $id], $propArr['event_pid']);
             $dataHandler->setHistory($table, $id, $theLogId);
@@ -975,9 +975,9 @@ class DataHandlerHook
             // Set log entry for offline record:
             $propArr = $dataHandler->getRecordPropertiesFromRow($table, $curVersion);
             if ($propArr['_ORIG_pid'] == -1) {
-                $label = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.offline_record_updated');
+                $label = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tcemain.xlf:version_swap.offline_record_updated');
             } else {
-                $label = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.online_record_updated');
+                $label = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tcemain.xlf:version_swap.online_record_updated');
             }
             $theLogId = $dataHandler->log($table, $swapWith, 2, $propArr['pid'], 0, $label, 10, [$propArr['header'], $table . ':' . $swapWith], $propArr['event_pid']);
             $dataHandler->setHistory($table, $swapWith, $theLogId);
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index f9ee7b78a5464d521ce5665e20754916a3108d42..3f3e7acdc1e71b288b30c15aeb25bb63c70cfd96 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -67,22 +67,22 @@ class VersionView
                 $management = '
 					<a class="btn btn-default" href="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_txversionM1', ['table' => 'pages', 'uid' => $onlineId])) . '">
 						' . $iconFactory->getIcon('actions-version-page-open', Icon::SIZE_SMALL)->render() . '
-						' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:ver.mgm')) . '
+						' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ver.mgm')) . '
 					</a>';
                 // Create onchange handler:
                 $onChange = 'window.location.href=this.options[this.selectedIndex].value;';
                 // Controls:
                 if ($id == $onlineId) {
-                    $controls = '<strong class="text-success">' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:ver.online')) . '</strong>';
+                    $controls = '<strong class="text-success">' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ver.online')) . '</strong>';
                 } elseif (!$noAction) {
                     $href = BackendUtility::getLinkToDataHandlerAction(
                         '&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id . '&cmd[pages][' . $onlineId . '][version][action]=swap',
                         GeneralUtility::linkThisScript(['id' => $onlineId])
                     );
                     $controls = '
-						<a href="' . htmlspecialchars($href) . '" class="btn btn-default" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:ver.swapPage')) . '">
+						<a href="' . htmlspecialchars($href) . '" class="btn btn-default" title="' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ver.swapPage')) . '">
 							' . $iconFactory->getIcon('actions-version-swap-version', Icon::SIZE_SMALL)->render() . '
-							' . htmlspecialchars($lang->sL('LLL:EXT:lang/locallang_core.xlf:ver.swap')) . '
+							' . htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:ver.swap')) . '
 						</a>';
                 }
                 // Write out HTML code:
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index 2baa31191897e79e5e79482f8c5383d2c51bf0a1..90abb708c2f608d288767913c755703f83cbdafb 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -62,7 +62,7 @@ class ViewModuleController extends ActionController
         $showButton = $buttonBar->makeLinkButton()
             ->setHref($this->getTargetUrl())
             ->setOnClick('window.open(this.href, \'newTYPO3frontendWindow\').focus();return false;')
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage'))
+            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage'))
             ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-document-view', Icon::SIZE_SMALL));
         $buttonBar->addButton($showButton);
 
@@ -265,8 +265,8 @@ class ViewModuleController extends ActionController
         }
         $languages = [
             0 => isset($modSharedTSconfig['properties']['defaultLanguageLabel'])
-                    ? $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')'
-                    : $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage')
+                    ? $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')'
+                    : $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage')
         ];
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_language');
         $queryBuilder->getRestrictions()
diff --git a/typo3/sysext/wizard_crpages/Resources/Private/Templates/CreatePagesWizard.html b/typo3/sysext/wizard_crpages/Resources/Private/Templates/CreatePagesWizard.html
index 96294e422d4a61bdcb202e567d6d5d7123aff835..bb699b16f1315e8a7bfbd88501926b82ea0150a6 100644
--- a/typo3/sysext/wizard_crpages/Resources/Private/Templates/CreatePagesWizard.html
+++ b/typo3/sysext/wizard_crpages/Resources/Private/Templates/CreatePagesWizard.html
@@ -79,7 +79,7 @@
             </div>
             <div class="form-group col-sm-6">
                 <label>
-                    <f:translate key="LLL:EXT:lang/locallang_general.xlf:LGL.type"/>
+                    <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.type"/>
                 </label>
                 <div class="form-control-wrap">
                     <div class="input-group">
diff --git a/typo3/sysext/wizard_sortpages/Resources/Private/Templates/SortPagesWizard.html b/typo3/sysext/wizard_sortpages/Resources/Private/Templates/SortPagesWizard.html
index 49a0d6e3c5b2b25e178451e57efa1d96835a8447..c5d66eb951067f9f7ccb5aa96cd69276d0952acb 100644
--- a/typo3/sysext/wizard_sortpages/Resources/Private/Templates/SortPagesWizard.html
+++ b/typo3/sysext/wizard_sortpages/Resources/Private/Templates/SortPagesWizard.html
@@ -51,8 +51,8 @@
     <a class="btn btn-default t3js-modal-trigger"
         href="{button.href}"
         data-severity="warning"
-        data-title="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:pleaseConfirm')}"
-        data-button-close-text="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:cancel')}"
+        data-title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:pleaseConfirm')}"
+        data-button-close-text="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_common.xlf:cancel')}"
         data-content="{f:translate(key: '{LLPrefix}wiz_changeOrder_msg1')}" >
         <f:translate key="{LLPrefix}{button.title}"/></a>
 </f:section>
diff --git a/typo3/sysext/workspaces/Classes/Backend/ToolbarItems/WorkspaceSelectorToolbarItem.php b/typo3/sysext/workspaces/Classes/Backend/ToolbarItems/WorkspaceSelectorToolbarItem.php
index d41a5c46a0bf71c61a7ddc8d2175fb6fb552944d..e08f4d2e5ed99800651dbf30b8bab88565a799ee 100644
--- a/typo3/sysext/workspaces/Classes/Backend/ToolbarItems/WorkspaceSelectorToolbarItem.php
+++ b/typo3/sysext/workspaces/Classes/Backend/ToolbarItems/WorkspaceSelectorToolbarItem.php
@@ -71,7 +71,7 @@ class WorkspaceSelectorToolbarItem implements ToolbarItemInterface
         if (empty($this->availableWorkspaces)) {
             return '';
         }
-        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.workspace'));
+        $title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace'));
         $icon = $this->iconFactory->getIcon('apps-toolbar-menu-workspace', Icon::SIZE_SMALL)->render('inline');
         return '
             <span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
@@ -149,7 +149,7 @@ class WorkspaceSelectorToolbarItem implements ToolbarItemInterface
         }
 
         $workspaceMenu = [
-            '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.workspace')) . '</h3>',
+            '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.workspace')) . '</h3>',
             '<hr>',
             '<div class="dropdown-table">' . implode(LF, $workspaceSections['top']) . '</div>',
             (!empty($workspaceSections['items']) ? '<hr>' : ''),
diff --git a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
index c583cd2a7d75f8fe641148be52597c487728277b..92f8572b97ebd73c3d8a0ac09ee31df74af45814 100644
--- a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
@@ -79,15 +79,15 @@ class AbstractController extends ActionController
         $this->pageRenderer->addInlineSetting('Workspaces', 'language', $this->getLanguageSelection());
         $this->pageRenderer->addInlineLanguageLabelArray([
             'title' => $lang->getLL('title'),
-            'path' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.path'),
-            'table' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.table'),
-            'depth' => $lang->sL('LLL:EXT:lang/locallang_mod_web_perm.xlf:Depth'),
-            'depth_0' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-            'depth_1' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-            'depth_2' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-            'depth_3' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-            'depth_4' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
-            'depth_infi' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+            'path' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.path'),
+            'table' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.table'),
+            'depth' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_perm.xlf:Depth'),
+            'depth_0' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+            'depth_1' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+            'depth_2' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+            'depth_3' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+            'depth_4' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+            'depth_infi' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi')
         ]);
         $this->pageRenderer->addInlineLanguageLabelFile('EXT:workspaces/Resources/Private/Language/locallang.xlf');
         $this->assignExtensionSettings();
diff --git a/typo3/sysext/workspaces/Classes/Domain/Record/WorkspaceRecord.php b/typo3/sysext/workspaces/Classes/Domain/Record/WorkspaceRecord.php
index 5ad88aee201c5a4c761572f02807447b3defe718..bdc66c7c63bce102552e7a53c8d79b499446ad00 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Record/WorkspaceRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Record/WorkspaceRecord.php
@@ -28,7 +28,7 @@ class WorkspaceRecord extends AbstractRecord
     protected $internalStages = [
         StagesService::STAGE_EDIT_ID => [
             'name' => 'edit',
-            'label' => 'LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing'
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_editing'
         ],
         StagesService::STAGE_PUBLISH_ID => [
             'name' => 'publish',
@@ -36,7 +36,7 @@ class WorkspaceRecord extends AbstractRecord
         ],
         StagesService::STAGE_PUBLISH_EXECUTE_ID => [
             'name' => 'execute',
-            'label' => 'LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_publish'
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_publish'
         ],
     ];
 
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index a2e346a50bd248a4f1a05b809c38358b22c21850..cee3f2441ce44c02ffbcb61413b9fbb982eca444 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -269,13 +269,13 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
     {
         switch ($ver_stage) {
             case self::STAGE_PUBLISH_EXECUTE_ID:
-                $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_publish');
+                $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_publish');
                 break;
             case self::STAGE_PUBLISH_ID:
                 $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod.xlf:stage_ready_to_publish');
                 break;
             case self::STAGE_EDIT_ID:
-                $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing');
+                $stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_editing');
                 break;
             default:
                 $stageTitle = $this->getPropertyOfCurrentWorkspaceStage($ver_stage, 'title');
@@ -329,7 +329,7 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
             $nextStage[] = [
                 'uid' => self::STAGE_EDIT_ID,
                 'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "'
-                    . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing') . '"'
+                    . $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_editing') . '"'
             ];
         }
         return $nextStage;
diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
index 12c75c17168e686c70a4d937f7797f7a256b26e5..941c8f0593b812b5d187269e11371aad756029a8 100644
--- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
@@ -117,7 +117,7 @@ class WorkspaceService implements SingletonInterface
         $title = false;
         switch ($wsId) {
             case self::LIVE_WORKSPACE_ID:
-                $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xlf:shortcut_onlineWS');
+                $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:shortcut_onlineWS');
                 break;
             default:
                 $labelField = $GLOBALS['TCA']['sys_workspace']['ctrl']['label'];
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
index 0b41a1397449e646f2474a11260d5ea96ffef4c2..40de211c5959f7a8efce8ca9e421412d9b76ce0c 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
@@ -3,7 +3,7 @@ return [
     'ctrl' => [
         'label' => 'title',
         'tstamp' => 'tstamp',
-        'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace',
+        'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace',
         'adminOnly' => true,
         'rootLevel' => 1,
         'delete' => 'deleted',
@@ -14,7 +14,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.title',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
@@ -23,7 +23,7 @@ return [
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.description',
             'config' => [
                 'type' => 'text',
                 'rows' => 5,
@@ -31,7 +31,7 @@ return [
             ]
         ],
         'adminusers' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.adminusers',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.adminusers',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -49,7 +49,7 @@ return [
             ]
         ],
         'members' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.members',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.members',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -67,7 +67,7 @@ return [
             ]
         ],
         'db_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:db_mountpoints',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:db_mountpoints',
             'config' => [
                 'type' => 'group',
                 'internal_type' => 'db',
@@ -84,7 +84,7 @@ return [
             ]
         ],
         'file_mountpoints' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:file_mountpoints',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectCheckBox',
@@ -96,7 +96,7 @@ return [
             ]
         ],
         'publish_time' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.publish_time',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.publish_time',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -105,7 +105,7 @@ return [
             ]
         ],
         'unpublish_time' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.unpublish_time',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.unpublish_time',
             'config' => [
                 'type' => 'input',
                 'size' => 8,
@@ -118,21 +118,21 @@ return [
             'displayCond' => 'FALSE'
         ],
         'freeze' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.freeze',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.freeze',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'live_edit' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.live_edit',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.live_edit',
             'config' => [
                 'type' => 'check',
                 'default' => 0
             ]
         ],
         'swap_modes' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.swap_modes',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.swap_modes',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -144,7 +144,7 @@ return [
             ]
         ],
         'publish_access' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.publish_access',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.publish_access',
             'config' => [
                 'type' => 'check',
                 'items' => [
@@ -154,7 +154,7 @@ return [
             ]
         ],
         'stagechg_notification' => [
-            'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.stagechg_notification',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_workspace.stagechg_notification',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -324,14 +324,14 @@ return [
     ],
     'types' => [
         '0' => ['showitem' => 'title,description,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.users,adminusers,members,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.users,adminusers,members,
 			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.notification_settings, stagechg_notification,
 				--palette--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.palette.stage.edit;stage.edit, edit_notification_defaults,
 				--palette--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.palette.stage.publish;stage.publish, publish_notification_defaults,
 				--palette--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.palette.stage.execute;stage.execute, execute_notification_defaults,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.mountpoints,db_mountpoints,file_mountpoints,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.publishing,publish_time,unpublish_time,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.mountpoints,db_mountpoints,file_mountpoints,
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.publishing,publish_time,unpublish_time,
 			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_filemounts.tabs.staging,custom_stages,
-			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.other,freeze,live_edit,swap_modes,publish_access']
+			--div--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_filemounts.tabs.other,freeze,live_edit,swap_modes,publish_access']
     ]
 ];
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
index 762076a6fedf95c10a3eb9cf4808046fa728a50d..5570afd7d5568c619717cad5924d59012b7002e0 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
@@ -16,7 +16,7 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
+            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.title',
             'config' => [
                 'type' => 'input',
                 'size' => 20,
diff --git a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
index 7d19d2292b7e516147189386145c51b4be947fe2..f9ab9faf7a88cf3fe6974865d1d2ee30c1193de0 100644
--- a/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
+++ b/typo3/sysext/workspaces/Resources/Private/Partials/WorkingTable.html
@@ -19,12 +19,12 @@
 				<form id="workspace-settings-form" class="form-inline form-inline-spaced">
 					<div class="form-group">
 						<select name="depth" class="form-control" disabled>
-							<option value="0"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_0" /></option>
-							<option value="1"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_1" /></option>
-							<option value="2"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_2" /></option>
-							<option value="3"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_3" /></option>
-							<option value="4"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_4" /></option>
-							<option value="999"><f:translate key="LLL:EXT:lang/locallang_core.xlf:labels.depth_infi" /></option>
+							<option value="0"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0" /></option>
+							<option value="1"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1" /></option>
+							<option value="2"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2" /></option>
+							<option value="3"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3" /></option>
+							<option value="4"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4" /></option>
+							<option value="999"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi" /></option>
 						</select>
 					</div>
 					<div class="form-group">