diff --git a/build/media/editors/codemirror/css/codemirror.css b/build/media/plg_editors_codemirror/css/codemirror.css
similarity index 100%
rename from build/media/editors/codemirror/css/codemirror.css
rename to build/media/plg_editors_codemirror/css/codemirror.css
diff --git a/build/media/editors/tinymce/css/tinymce-builder.css b/build/media/plg_editors_tinymce/css/tinymce-builder.css
similarity index 100%
rename from build/media/editors/tinymce/css/tinymce-builder.css
rename to build/media/plg_editors_tinymce/css/tinymce-builder.css
diff --git a/build/media/editors/tinymce/js/tinymce-builder.js b/build/media/plg_editors_tinymce/js/tinymce-builder.js
similarity index 100%
rename from build/media/editors/tinymce/js/tinymce-builder.js
rename to build/media/plg_editors_tinymce/js/tinymce-builder.js
diff --git a/build/media_src/editors/tinymce/js/plugins/dragdrop/plugin.es6.js b/build/media_src/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
similarity index 100%
rename from build/media_src/editors/tinymce/js/plugins/dragdrop/plugin.es6.js
rename to build/media_src/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
diff --git a/build/media_src/editors/tinymce/js/tinymce.es6.js b/build/media_src/plg_editors_tinymce/js/tinymce.es6.js
similarity index 100%
rename from build/media_src/editors/tinymce/js/tinymce.es6.js
rename to build/media_src/plg_editors_tinymce/js/tinymce.es6.js
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
index babc2330b0350..1b8c6dacb9803 100644
--- a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -58,8 +58,8 @@
 HTMLHelper::_('behavior.core');
 HTMLHelper::_('jquery.ui', array('core', 'sortable'));
 HTMLHelper::_('stylesheet', 'media/vendor/tinymce/skins/lightgray/skin.min.css', array('version' => 'auto', 'relative' => false));
-HTMLHelper::_('stylesheet', 'editors/tinymce/tinymce-builder.css', array('version' => 'auto', 'relative' => true));
-HTMLHelper::_('script', 'editors/tinymce/tinymce-builder.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('stylesheet', 'plg_editors_tinymce/tinymce-builder.css', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'plg_editors_tinymce/tinymce-builder.js', array('version' => 'auto', 'relative' => true));
 
 if ($languageFile)
 {
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php b/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
index 8da51d8c0a0ab..88c42063bf6f1 100644
--- a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
+++ b/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
@@ -32,7 +32,7 @@
 $b                   = hexdec($color{5} . $color{6});
 $highlightMatchColor = 'rgba(' . $r . ', ' . $g . ', ' . $b . ', .5)';
 
-HTMLHelper::_('stylesheet', 'editors/codemirror/codemirror.css', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('stylesheet', 'plg_editors_codemirror/codemirror.css', array('version' => 'auto', 'relative' => true));
 
 Factory::getDocument()->addStyleDeclaration(
 <<<CSS
diff --git a/plugins/editors/tinymce/field/tinymcebuilder.php b/plugins/editors/tinymce/field/tinymcebuilder.php
index 69a735def07b1..ad3bbbd628af5 100644
--- a/plugins/editors/tinymce/field/tinymcebuilder.php
+++ b/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -164,8 +164,8 @@ protected function getLayoutData()
 
 		// Check for TinyMCE language file
 		$language      = Factory::getLanguage();
-		$languageFile1 = 'media/editors/tinymce/langs/' . $language->getTag() . '.js';
-		$languageFile2 = 'media/editors/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js';
+		$languageFile1 = 'media/vendor/tinymce/langs/' . $language->getTag() . '.js';
+		$languageFile2 = 'media/vendor/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js';
 
 		$data['languageFile'] = '';
 
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index d2cd29d14c670..97206e23fa9eb 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -63,7 +63,7 @@ public function onInit()
 	{
 		HTMLHelper::_('behavior.core');
 		HTMLHelper::_('script', $this->_basePath . '/tinymce.min.js', array('version' => 'auto'));
-		HTMLHelper::_('script', 'editors/tinymce/tinymce.min.js', array('version' => 'auto', 'relative' => true));
+		HTMLHelper::_('script', 'plg_editors_tinymce/tinymce.min.js', array('version' => 'auto', 'relative' => true));
 	}
 
 	/**
@@ -139,11 +139,6 @@ public function onDisplay(
 		{
 			$btns = $this->tinyButtons($id, $buttons);
 
-			if (!empty($btns['names']))
-			{
-				HTMLHelper::_('script', 'editors/tinymce/tiny-close.min.js', array('version' => 'auto', 'relative' => true), array('defer' => 'defer'));
-			}
-
 			// Set editor to readonly mode
 			if (!empty($params['readonly']))
 			{
@@ -474,7 +469,7 @@ public function onDisplay(
 
 		if ($dragdrop && $user->authorise('core.create', 'com_media'))
 		{
-			$externalPlugins['jdragndrop'] = Uri::root() . 'media/editors/tinymce/js/plugins/dragdrop/plugin.min.js';
+			$externalPlugins['jdragndrop'] = Uri::root() . 'media/plg_editors_tinymce/js/plugins/dragdrop/plugin.min.js';
 
 			$allowImgPaste = true;
 			$isSubDir      = '';
diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html
index 3422c6245ffeb..55bd7a21c496f 100644
--- a/templates/system/incompatible.html
+++ b/templates/system/incompatible.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Joomla: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
   <style>body{margin:0;padding:0;font:14px / 18px sans-serif;color:#555;background-color:transparent}html{background:#f1f1f1;background:-moz-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:-webkit-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:radial-gradient(ellipse at center,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background-repeat:no-repeat;background-attachment:fixed}ol,ul{padding:0;margin:0;list-style:none}a{color:#0084b4;text-decoration:none;outline:0}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,0.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,0.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}p,label{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:bold;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:normal;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,0.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-  <script>window.errorLocale = {"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+  <script>window.errorLocale = {"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body ><!-- Sets the minimum PHP version, IMPORTANT DO NOT REMOVE -->
 <div class="container">