diff --git a/.gitignore b/.gitignore
index edd55b606..2d7490ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ test.php
 g4s_tree
 itzimara*
 nemoluv*
+cheditor*
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index 0ebc1d5de..038291819 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -18,7 +18,7 @@ if ($row['cnt'])
 // 게시판 테이블 생성
 $sql = get_table_define($g4['write_prefix'] . $bo_table);
 $sql = str_replace($g4['write_prefix'] . $bo_table, $g4['write_prefix'] . $target_table, $sql);
-sql_query($sql);
+sql_query($sql, false);
 
 $file_copy = array();
 
@@ -118,7 +118,7 @@ $sql = " insert into {$g4['board_table']}
                 bo_8 = '{$board['bo_8']}',
                 bo_9 = '{$board['bo_9']}',
                 bo_10 = '{$board['bo_10']}' ";
-sql_query($sql);
+sql_query($sql, false);
 
 // 게시판 폴더 생성
 @mkdir(G4_DATA_PATH.'/file/'.$target_table, G4_DIR_PERMISSION);
@@ -141,8 +141,8 @@ if ($copy_case == 'schema_data_both') {
         // 김선용 201007 :
         if(is_dir(G4_DATA_PATH.'/file/'.$bo_table.'/'.$entry)){
             $dd = dir(G4_DATA_PATH.'/file/'.$bo_table.'/'.$entry);
-            @mkdir(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry G4_DIR_PERMISSION);
-            @chmod(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry G4_DIR_PERMISSION);
+            @mkdir(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry, G4_DIR_PERMISSION);
+            @chmod(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry, G4_DIR_PERMISSION);
             while ($entry2 = $dd->read()) {
                 if ($entry2 == '.' || $entry2 == '..') continue;
                 @copy(G4_DATA_PATH.'/file/'.$bo_table.'/'.$entry.'/'.$entry2, G4_DATA_PATH.'/file/'.$target_table.'/'.$entry.'/'.$entry2);
@@ -153,7 +153,7 @@ if ($copy_case == 'schema_data_both') {
         }
         else {
             @copy(G4_DATA_PATH.'/file/'.$bo_table.'/'.$entry, G4_DATA_PATH.'/file/'.$target_table.'/'.$entry);
-            @chmod(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry G4_DIR_PERMISSION);
+            @chmod(G4_DATA_PATH.'/file/'.$target_table.'/'.$entry, G4_DIR_PERMISSION);
             $copy_file++;
         }
     }
@@ -161,18 +161,18 @@ if ($copy_case == 'schema_data_both') {
 
     // 글복사
     $sql = " insert into {$g4['write_prefix']}$target_table select * from {$g4['write_prefix']}$bo_table ";
-    sql_query($sql);
+    sql_query($sql, false);
 
     // 게시글수 저장
     $sql = " select bo_count_write, bo_count_comment from {$g4['board_table']} where bo_table = '$bo_table' ";
     $row = sql_fetch($sql);
     $sql = " update {$g4['board_table']} set bo_count_write = '{$row['bo_count_write']}', bo_count_comment = '{$row['bo_count_comment']}' where bo_table = '$target_table' ";
-    sql_query($sql);
+    sql_query($sql, false);
 
     // 4.00.01
     // 위의 코드는 같은 테이블명을 사용하였다는 오류가 발생함. (희한하네 ㅡㅡ;)
     $sql = " select * from {$g4['board_file_table']} where bo_table = '$bo_table' ";
-    $result = sql_query($sql);
+    $result = sql_query($sql, false);
     for ($i=0; $row=sql_fetch_array($result); $i++)
         $file_copy[$i] = $row;
 }
@@ -192,7 +192,7 @@ if (count($file_copy)) {
                          bf_height = '{$file_copy[$i]['bf_height']}',
                          bf_type = '{$file_copy[$i]['bf_type']}',
                          bf_datetime = '{$file_copy[$i]['bf_datetime']}' ";
-        sql_query($sql, FALSE);
+        sql_query($sql, false);
     }
 }
 
diff --git a/adm/board_form.php b/adm/board_form.php
index 9a517847b..093745514 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -1,7 +1,7 @@
 <?php
 $sub_menu = "300100";
 include_once('./_common.php');
-include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
+include_once(G4_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], 'w');
 
diff --git a/adm/config_form.php b/adm/config_form.php
index 32a6f7bfa..21e00865b 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -30,6 +30,16 @@ if(!isset($config['cf_gcaptcha_mp3'])) {
                     ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
 }
 
+if(!isset($config['cf_gcaptcha_mp3'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
+}
+
+if(!isset($config['cf_editor'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_editor` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
+}
+
 if(!isset($config['cf_googl_shorturl_apikey'])) {
     sql_query(" ALTER TABLE `{$g4['config_table']}`
                     ADD `cf_googl_shorturl_apikey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
@@ -286,6 +296,21 @@ $pg_anchor = '<ul class="anchor">
             </select>
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="cf_editor">에디터 선택</label></th>
+        <td colspan="3">
+            <?php echo help(G4_EDITOR_URL.' 밑의 DHTML 에디터 폴더를 선택합니다.') ?>
+            <select name="cf_editor" id="cf_editor">
+            <?php
+            $arr = get_skin_dir('', G4_EDITOR_PATH);
+            for ($i=0; $i<count($arr); $i++) {
+                if ($i == 0) echo "<option value=\"\">사용안함</option>";
+                echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_editor'], $arr[$i]).">".$arr[$i]."</option>\n";
+            }
+            ?>
+            </select>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="cf_gcaptcha_mp3">음성캡챠 선택<strong class="sound_only">필수</strong></label></th>
         <td colspan="3">
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index 881239c7c..2abfc9915 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -101,6 +101,7 @@ $sql = " update {$g4['config_table']}
                  cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
                  cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
                  cf_gcaptcha_mp3 = '{$_POST['cf_gcaptcha_mp3']}',
+                 cf_editor = '{$_POST['cf_editor']}',
                  cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}',
                  cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
                  cf_kcpcert_use = '{$_POST['cf_kcpcert_use']}',
diff --git a/adm/mail_form.php b/adm/mail_form.php
index fc1df022a..415657e75 100644
--- a/adm/mail_form.php
+++ b/adm/mail_form.php
@@ -1,7 +1,7 @@
 <?php
 $sub_menu = "200300";
 include_once('./_common.php');
-include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
+include_once(G4_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], 'r');
 
@@ -44,7 +44,7 @@ include_once('./admin.head.php');
     </tr>
     <tr>
         <th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>
-        <td><?php echo editor_html("ma_content", $ma['ma_content'], '400'); ?></td>
+        <td><?php echo editor_html("ma_content", $ma['ma_content']); ?></td>
     </tr>
     </tbody>
     </table>
@@ -65,13 +65,17 @@ function fmailform_check(f)
     errfld = "";
 
     check_field(f.ma_subject, "제목을 입력하세요.");
-    check_field(f.ma_content, "내용을 입력하세요.");
+    //check_field(f.ma_content, "내용을 입력하세요.");
 
     if (errmsg != "") {
         alert(errmsg);
         errfld.focus();
         return false;
     }
+
+    <?php echo get_editor_js("ma_content"); ?>
+    <?php echo chk_editor_js("ma_content"); ?>
+    
     return true;
 }
 
diff --git a/bbs/write.php b/bbs/write.php
index e6ac6970c..71099e646 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -1,6 +1,6 @@
 <?php
 include_once('./_common.php');
-include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
+include_once(G4_EDITOR_LIB);
 include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 set_session('ss_bo_table', $_REQUEST['bo_table']);
@@ -371,14 +371,14 @@ if ($is_guest) {
 }
 
 $is_dhtml_editor = false;
-$editor_js = '';
 // 모바일에서는 DHTML 에디터 사용불가
-if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_level']) {
+if ($config['cf_editor'] && !G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_level']) {
     $is_dhtml_editor = true;
-    $editor_js .= get_editor_js('wr_content', $is_dhtml_editor);
-    $editor_js .= chk_editor_js('wr_content', $is_dhtml_editor);
 }
 $editor_html = editor_html('wr_content', $content, $is_dhtml_editor);
+$editor_js = '';
+$editor_js .= get_editor_js('wr_content', $is_dhtml_editor);
+$editor_js .= chk_editor_js('wr_content', $is_dhtml_editor);
 
 // 임시 저장된 글 갯수
 $autosave_count = autosave_count($member['mb_id']);
diff --git a/common.php b/common.php
index 9d360364c..ef6a00491 100644
--- a/common.php
+++ b/common.php
@@ -163,8 +163,12 @@ ini_set("session.cookie_domain", G4_COOKIE_DOMAIN);
 // 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
 $config = sql_fetch(" select * from {$g4['config_table']} ");
 
-define('G4_HTTP_BBS_URL',   https_url(G4_BBS_DIR, false));
-define('G4_HTTPS_BBS_URL',  https_url(G4_BBS_DIR, true));
+define('G4_HTTP_BBS_URL',  https_url(G4_BBS_DIR, false));
+define('G4_HTTPS_BBS_URL', https_url(G4_BBS_DIR, true));
+if ($config['cf_editor']) 
+    define('G4_EDITOR_LIB', G4_EDITOR_PATH."/{$config['cf_editor']}/editor.lib.php");
+else
+    define('G4_EDITOR_LIB', G4_LIB_PATH."/editor.lib.php");
 
 //==============================================================================
 // Mobile 모바일 설정
diff --git a/config.php b/config.php
index f78408bf8..1243aee60 100644
--- a/config.php
+++ b/config.php
@@ -46,7 +46,7 @@ define('G4_LIB_DIR',        'lib');
 define('G4_PLUGIN_DIR',     'plugin');
 define('G4_SKIN_DIR',       'skin');
 define('G4_GCAPTCHA_DIR',   'gcaptcha');
-define('G4_CKEDITOR_DIR',   'ckeditor');
+define('G4_EDITOR_DIR',     'editor');
 define('G4_MOBILE_DIR',     'mobile');
 
 define('G4_KCPCERT_DIR',    'kcpcert');
@@ -80,7 +80,7 @@ define('G4_JS_URL',         G4_URL.'/'.G4_JS_DIR);
 define('G4_SKIN_URL',       G4_URL.'/'.G4_SKIN_DIR);
 define('G4_PLUGIN_URL',     G4_URL.'/'.G4_PLUGIN_DIR);
 define('G4_GCAPTCHA_URL',   G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR);
-define('G4_CKEDITOR_URL',   G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로
+define('G4_EDITOR_URL',     G4_PLUGIN_URL.'/'.G4_EDITOR_DIR);
 define('G4_KCPCERT_URL',    G4_PLUGIN_URL.'/'.G4_KCPCERT_DIR);
 define('G4_SNS_URL',        G4_PLUGIN_URL.'/'.G4_SNS_DIR);
 define('G4_SYNDI_URL',      G4_PLUGIN_URL.'/'.G4_SYNDI_DIR);
@@ -95,7 +95,7 @@ define('G4_LIB_PATH',       G4_PATH.'/'.G4_LIB_DIR);
 define('G4_PLUGIN_PATH',    G4_PATH.'/'.G4_PLUGIN_DIR);
 define('G4_SKIN_PATH',      G4_PATH.'/'.G4_SKIN_DIR);
 define('G4_GCAPTCHA_PATH',  G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR);
-define('G4_CKEDITOR_PATH',  G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR);
+define('G4_EDITOR_PATH',    G4_PLUGIN_PATH.'/'.G4_EDITOR_DIR);
 
 define('G4_KCPCERT_PATH',   G4_PLUGIN_PATH.'/'.G4_KCPCERT_DIR);
 
diff --git a/head.sub.php b/head.sub.php
index c1ebd903c..7f069dc09 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -63,6 +63,7 @@ var g4_is_admin  = "<?php echo isset($is_admin)?$is_admin:''; ?>";
 var g4_is_mobile = "<?php echo G4_IS_MOBILE ?>";
 var g4_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g4_sca       = "<?php echo isset($sca)?$sca:''; ?>";
+var g4_editor    = "<?php echo isset($config['cf_editor'])?$config['cf_editor']:''; ?>";
 var g4_cookie_domain = "<?php echo G4_COOKIE_DOMAIN ?>";
 <?php
 if ($is_admin) {
diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql
index 6eee7a123..746eb61d1 100644
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@@ -279,6 +279,7 @@ CREATE TABLE IF NOT EXISTS `g4s_config` (
   `cf_mobile_connect_skin` varchar(255) NOT NULL DEFAULT '',
   `cf_mobile_member_skin` varchar(255) NOT NULL DEFAULT '',
   `cf_gcaptcha_mp3` varchar(255) NOT NULL DEFAULT '',
+  `cf_editor` varchar(255) NOT NULL DEFAULT '',
   `cf_googl_shorturl_apikey` varchar(255) NOT NULL DEFAULT '',
   `cf_kcpcert_site_cd` varchar(255) NOT NULL DEFAULT '',
   `cf_kcpcert_use` enum('','test','service') NOT NULL DEFAULT '',
diff --git a/install/install.inc.php b/install/install.inc.php
index 089a0926e..85f79c799 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -71,14 +71,27 @@ if (!is_dir($data_path))
 $write_data_dir = true;
 // data 디렉토리에 파일 생성 가능한지 검사.
 if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-    if (!(is_readable($data_path) && is_writeable($data_path) && is_executable($data_path)))
-    {
-    ?>
-        <p><?php echo G4_DATA_DIR ?> 디렉토리의 퍼미션을 707로 변경하여 주십시오.<br /><br />
-        $> chmod 707 <?php echo G4_DATA_DIR ?> 또는 chmod uo+rwx <?php echo G4_DATA_DIR ?><br /><br />
-        위 명령 실행후 브라우저를 새로고침 하십시오.</p>
-    <?php
-        $write_data_dir = false;
+    $sapi_type = php_sapi_name(); 
+    if (substr($sapi_type, 0, 3) == 'cgi') { 
+        if (!(is_readable($data_path) && is_executable($data_path)))
+        {
+        ?>
+            <p><?php echo G4_DATA_DIR ?> 디렉토리의 퍼미션을 705로 변경하여 주십시오.<br /><br />
+            $> chmod 705 <?php echo G4_DATA_DIR ?> 또는 chmod uo+rx <?php echo G4_DATA_DIR ?><br /><br />
+            위 명령 실행후 브라우저를 새로고침 하십시오.</p>
+        <?php
+            $write_data_dir = false;
+        }
+    } else {
+        if (!(is_readable($data_path) && is_writeable($data_path) && is_executable($data_path)))
+        {
+        ?>
+            <p><?php echo G4_DATA_DIR ?> 디렉토리의 퍼미션을 707로 변경하여 주십시오.<br /><br />
+            $> chmod 707 <?php echo G4_DATA_DIR ?> 또는 chmod uo+rwx <?php echo G4_DATA_DIR ?><br /><br />
+            위 명령 실행후 브라우저를 새로고침 하십시오.</p>
+        <?php
+            $write_data_dir = false;
+        }
     }
 }
 ?>
\ No newline at end of file
diff --git a/js/autosave.js b/js/autosave.js
index f9684db1a..bc295d9f8 100644
--- a/js/autosave.js
+++ b/js/autosave.js
@@ -7,8 +7,11 @@ var save_wr_content = null;
 
 function autosave() {
     $("form#fwrite").each(function() {
-        if (typeof(CKEDITOR.instances.wr_content)!="undefined")
+        if (g4_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") {
             this.wr_content.value = CKEDITOR.instances.wr_content.getData();
+        } else if (g4_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") {
+            this.wr_content.value = ed_wr_content.outputBodyHTML();
+        }
         // 변수에 저장해 놓은 값과 다를 경우에만 임시 저장함
         if (save_wr_subject != this.wr_subject.value || save_wr_content != this.wr_content.value) {
             $.ajax({
@@ -72,8 +75,10 @@ $(function(){
             var subject = $(data).find("item").find("subject").text();
             var content = $(data).find("item").find("content").text();
             $("#wr_subject").val(subject);
-            if (typeof(CKEDITOR.instances.wr_content)!="undefined") {
+            if (g4_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") {
                 CKEDITOR.instances.wr_content.setData(content);
+            } else if (g4_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") {
+                ed_wr_content.putContents(content);
             } else {
                 $("#fwrite #wr_content").val(content);
             }
diff --git a/lib/editor.lib.php b/lib/editor.lib.php
new file mode 100644
index 000000000..d3650ad83
--- /dev/null
+++ b/lib/editor.lib.php
@@ -0,0 +1,27 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+/*
+    환경설정에서 에디터 선택이 없는 경우에 사용하는 라이브러리 입니다.
+    에디터 선택시 "선택없음"이 아닌 경우 plugin/editor 하위 디렉토리의 각 에디터이름/editor.lib.php 를 수정하시기 바랍니다.
+*/
+
+function editor_html($id, $content)
+{
+    return "<textarea id=\"$id\" name=\"$id\" style=\"width:100%;\" maxlength=\"65536\">$content</textarea>";
+}
+
+
+// textarea 로 값을 넘긴다. javascript 반드시 필요
+function get_editor_js($id)
+{
+    return "var {$id}_editor = document.getElementById('{$id}');\n";
+}
+
+
+//  textarea 의 값이 비어 있는지 검사
+function chk_editor_js($id)
+{
+    return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
+}
+?>
\ No newline at end of file
diff --git a/plugin/ckeditor/CHANGES.md b/plugin/editor/ckeditor4/CHANGES.md
similarity index 100%
rename from plugin/ckeditor/CHANGES.md
rename to plugin/editor/ckeditor4/CHANGES.md
diff --git a/plugin/ckeditor/LICENSE.md b/plugin/editor/ckeditor4/LICENSE.md
similarity index 100%
rename from plugin/ckeditor/LICENSE.md
rename to plugin/editor/ckeditor4/LICENSE.md
diff --git a/plugin/ckeditor/README.md b/plugin/editor/ckeditor4/README.md
similarity index 100%
rename from plugin/ckeditor/README.md
rename to plugin/editor/ckeditor4/README.md
diff --git a/plugin/ckeditor/build-config.js b/plugin/editor/ckeditor4/build-config.js
similarity index 100%
rename from plugin/ckeditor/build-config.js
rename to plugin/editor/ckeditor4/build-config.js
diff --git a/plugin/ckeditor/ckeditor.js b/plugin/editor/ckeditor4/ckeditor.js
similarity index 100%
rename from plugin/ckeditor/ckeditor.js
rename to plugin/editor/ckeditor4/ckeditor.js
diff --git a/plugin/ckeditor/config.js b/plugin/editor/ckeditor4/config.js
similarity index 99%
rename from plugin/ckeditor/config.js
rename to plugin/editor/ckeditor4/config.js
index 0326750a6..87b0d8669 100644
--- a/plugin/ckeditor/config.js
+++ b/plugin/editor/ckeditor4/config.js
@@ -108,7 +108,7 @@ CKEDITOR.editorConfig = function( config ) {
     config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;";
     config.enterMode = CKEDITOR.ENTER_DIV;
     config.shiftEnterMode = CKEDITOR.ENTER_DIV;
-    config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images";
+    config.filebrowserUploadUrl = g4_editor_url+"/upload.php?type=Images";
     config.keystrokes=[
         // Formatting
         [ CKEDITOR.CTRL + 81 /*Q*/, 'blockquote' ],
diff --git a/plugin/ckeditor/contents.css b/plugin/editor/ckeditor4/contents.css
similarity index 100%
rename from plugin/ckeditor/contents.css
rename to plugin/editor/ckeditor4/contents.css
diff --git a/plugin/ckeditor/ckeditor.lib.php b/plugin/editor/ckeditor4/editor.lib.php
similarity index 56%
rename from plugin/ckeditor/ckeditor.lib.php
rename to plugin/editor/ckeditor4/editor.lib.php
index 1e7e1a12f..b341cf9df 100644
--- a/plugin/ckeditor/ckeditor.lib.php
+++ b/plugin/editor/ckeditor4/editor.lib.php
@@ -1,20 +1,22 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-function editor_html($id, $content, $ckeditor=true, $class="")
+function editor_html($id, $content, $is_dhtml_editor=true)
 {
-    global $g4;
+    global $g4, $config;
     static $js = true;
 
+    $editor_url = G4_EDITOR_URL.'/'.$config['cf_editor'];
+
     $html = "";
     $html .= "<span class=\"sound_only\">웹에디터 시작</span>";
-    if ($ckeditor)
+    if ($is_dhtml_editor)
         $html .= '<script>document.write("<div class=\'cke_sc\'><button type=\'button\' class=\'btn_cke_sc\'>단축키 일람</button></div>");</script>';
 
     if ($js) {
-        $html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/ckeditor.js"></script>';
-        $html .= "\n".'<script>var g4_ckeditor_url = "'.G4_CKEDITOR_URL.'";</script>';
-        $html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/config.js"></script>';
+        $html .= "\n".'<script src="'.$editor_url.'/ckeditor.js"></script>';
+        $html .= "\n".'<script>var g4_editor_url = "'.$editor_url.'";</script>';
+        $html .= "\n".'<script src="'.$editor_url.'/config.js"></script>';
         $html .= "\n<script>";
         $html .= '
         $(function(){
@@ -23,7 +25,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
                     $(this).next("div.cke_sc_def").remove();
                     $(this).text("단축키 일람");
                 } else {
-                    $(this).after("<div class=\'cke_sc_def\' />").next("div.cke_sc_def").load("'.G4_CKEDITOR_URL.'/shortcut.html");
+                    $(this).after("<div class=\'cke_sc_def\' />").next("div.cke_sc_def").load("'.$editor_url.'/shortcut.html");
                     $(this).text("단축키 일람 닫기");
                 }
             });
@@ -35,17 +37,17 @@ function editor_html($id, $content, $ckeditor=true, $class="")
         $js = false;
     }
 
-    $ckeditor_class = $ckeditor ? "ckeditor" : "";
-    $html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$ckeditor_class $class\" style=\"width:100%;\" maxlength=\"65536\">$content</textarea>";
+    $ckeditor_class = $is_dhtml_editor ? "ckeditor" : "";
+    $html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$ckeditor_class\" style=\"width:100%;\" maxlength=\"65536\">$content</textarea>";
     $html .= "\n<span class=\"sound_only\">웹 에디터 끝</span>";
     return $html;
 }
 
 
 // textarea 로 값을 넘긴다. javascript 반드시 필요
-function get_editor_js($id, $ckeditor=true)
+function get_editor_js($id, $is_dhtml_editor=true)
 {
-    if ( $ckeditor ) {
+    if ($is_dhtml_editor) {
         return "var {$id}_editor_data = CKEDITOR.instances.{$id}.getData();\n";
     } else {
         return "var {$id}_editor = document.getElementById('{$id}');\n";
@@ -54,12 +56,12 @@ function get_editor_js($id, $ckeditor=true)
 
 
 //  textarea 의 값이 비어 있는지 검사
-function chk_editor_js($id, $ckeditor=true, $textarea_name="내용을")
+function chk_editor_js($id, $is_dhtml_editor=true)
 {
-    if ( $ckeditor ) {
-        return "if (!{$id}_editor_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\nif (typeof(f.wr_content)!=\"undefined\") f.wr_content.value = {$id}_editor_data;\n";
+    if ($is_dhtml_editor) {
+        return "if (!{$id}_editor_data) { alert(\"내용을 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\nif (typeof(f.wr_content)!=\"undefined\") f.wr_content.value = {$id}_editor_data;\n";
     } else {
-        return "if (!{$id}_editor.value) { alert(\"$textarea_name 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
+        return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
     }
 }
 ?>
\ No newline at end of file
diff --git a/plugin/ckeditor/lang/af.js b/plugin/editor/ckeditor4/lang/af.js
similarity index 100%
rename from plugin/ckeditor/lang/af.js
rename to plugin/editor/ckeditor4/lang/af.js
diff --git a/plugin/ckeditor/lang/ar.js b/plugin/editor/ckeditor4/lang/ar.js
similarity index 100%
rename from plugin/ckeditor/lang/ar.js
rename to plugin/editor/ckeditor4/lang/ar.js
diff --git a/plugin/ckeditor/lang/bg.js b/plugin/editor/ckeditor4/lang/bg.js
similarity index 100%
rename from plugin/ckeditor/lang/bg.js
rename to plugin/editor/ckeditor4/lang/bg.js
diff --git a/plugin/ckeditor/lang/bn.js b/plugin/editor/ckeditor4/lang/bn.js
similarity index 100%
rename from plugin/ckeditor/lang/bn.js
rename to plugin/editor/ckeditor4/lang/bn.js
diff --git a/plugin/ckeditor/lang/bs.js b/plugin/editor/ckeditor4/lang/bs.js
similarity index 100%
rename from plugin/ckeditor/lang/bs.js
rename to plugin/editor/ckeditor4/lang/bs.js
diff --git a/plugin/ckeditor/lang/ca.js b/plugin/editor/ckeditor4/lang/ca.js
similarity index 100%
rename from plugin/ckeditor/lang/ca.js
rename to plugin/editor/ckeditor4/lang/ca.js
diff --git a/plugin/ckeditor/lang/cs.js b/plugin/editor/ckeditor4/lang/cs.js
similarity index 100%
rename from plugin/ckeditor/lang/cs.js
rename to plugin/editor/ckeditor4/lang/cs.js
diff --git a/plugin/ckeditor/lang/cy.js b/plugin/editor/ckeditor4/lang/cy.js
similarity index 100%
rename from plugin/ckeditor/lang/cy.js
rename to plugin/editor/ckeditor4/lang/cy.js
diff --git a/plugin/ckeditor/lang/da.js b/plugin/editor/ckeditor4/lang/da.js
similarity index 100%
rename from plugin/ckeditor/lang/da.js
rename to plugin/editor/ckeditor4/lang/da.js
diff --git a/plugin/ckeditor/lang/de.js b/plugin/editor/ckeditor4/lang/de.js
similarity index 100%
rename from plugin/ckeditor/lang/de.js
rename to plugin/editor/ckeditor4/lang/de.js
diff --git a/plugin/ckeditor/lang/el.js b/plugin/editor/ckeditor4/lang/el.js
similarity index 100%
rename from plugin/ckeditor/lang/el.js
rename to plugin/editor/ckeditor4/lang/el.js
diff --git a/plugin/ckeditor/lang/en-au.js b/plugin/editor/ckeditor4/lang/en-au.js
similarity index 100%
rename from plugin/ckeditor/lang/en-au.js
rename to plugin/editor/ckeditor4/lang/en-au.js
diff --git a/plugin/ckeditor/lang/en-ca.js b/plugin/editor/ckeditor4/lang/en-ca.js
similarity index 100%
rename from plugin/ckeditor/lang/en-ca.js
rename to plugin/editor/ckeditor4/lang/en-ca.js
diff --git a/plugin/ckeditor/lang/en-gb.js b/plugin/editor/ckeditor4/lang/en-gb.js
similarity index 100%
rename from plugin/ckeditor/lang/en-gb.js
rename to plugin/editor/ckeditor4/lang/en-gb.js
diff --git a/plugin/ckeditor/lang/en.js b/plugin/editor/ckeditor4/lang/en.js
similarity index 100%
rename from plugin/ckeditor/lang/en.js
rename to plugin/editor/ckeditor4/lang/en.js
diff --git a/plugin/ckeditor/lang/eo.js b/plugin/editor/ckeditor4/lang/eo.js
similarity index 100%
rename from plugin/ckeditor/lang/eo.js
rename to plugin/editor/ckeditor4/lang/eo.js
diff --git a/plugin/ckeditor/lang/es.js b/plugin/editor/ckeditor4/lang/es.js
similarity index 100%
rename from plugin/ckeditor/lang/es.js
rename to plugin/editor/ckeditor4/lang/es.js
diff --git a/plugin/ckeditor/lang/et.js b/plugin/editor/ckeditor4/lang/et.js
similarity index 100%
rename from plugin/ckeditor/lang/et.js
rename to plugin/editor/ckeditor4/lang/et.js
diff --git a/plugin/ckeditor/lang/eu.js b/plugin/editor/ckeditor4/lang/eu.js
similarity index 100%
rename from plugin/ckeditor/lang/eu.js
rename to plugin/editor/ckeditor4/lang/eu.js
diff --git a/plugin/ckeditor/lang/fa.js b/plugin/editor/ckeditor4/lang/fa.js
similarity index 100%
rename from plugin/ckeditor/lang/fa.js
rename to plugin/editor/ckeditor4/lang/fa.js
diff --git a/plugin/ckeditor/lang/fi.js b/plugin/editor/ckeditor4/lang/fi.js
similarity index 100%
rename from plugin/ckeditor/lang/fi.js
rename to plugin/editor/ckeditor4/lang/fi.js
diff --git a/plugin/ckeditor/lang/fo.js b/plugin/editor/ckeditor4/lang/fo.js
similarity index 100%
rename from plugin/ckeditor/lang/fo.js
rename to plugin/editor/ckeditor4/lang/fo.js
diff --git a/plugin/ckeditor/lang/fr-ca.js b/plugin/editor/ckeditor4/lang/fr-ca.js
similarity index 100%
rename from plugin/ckeditor/lang/fr-ca.js
rename to plugin/editor/ckeditor4/lang/fr-ca.js
diff --git a/plugin/ckeditor/lang/fr.js b/plugin/editor/ckeditor4/lang/fr.js
similarity index 100%
rename from plugin/ckeditor/lang/fr.js
rename to plugin/editor/ckeditor4/lang/fr.js
diff --git a/plugin/ckeditor/lang/gl.js b/plugin/editor/ckeditor4/lang/gl.js
similarity index 100%
rename from plugin/ckeditor/lang/gl.js
rename to plugin/editor/ckeditor4/lang/gl.js
diff --git a/plugin/ckeditor/lang/gu.js b/plugin/editor/ckeditor4/lang/gu.js
similarity index 100%
rename from plugin/ckeditor/lang/gu.js
rename to plugin/editor/ckeditor4/lang/gu.js
diff --git a/plugin/ckeditor/lang/he.js b/plugin/editor/ckeditor4/lang/he.js
similarity index 100%
rename from plugin/ckeditor/lang/he.js
rename to plugin/editor/ckeditor4/lang/he.js
diff --git a/plugin/ckeditor/lang/hi.js b/plugin/editor/ckeditor4/lang/hi.js
similarity index 100%
rename from plugin/ckeditor/lang/hi.js
rename to plugin/editor/ckeditor4/lang/hi.js
diff --git a/plugin/ckeditor/lang/hr.js b/plugin/editor/ckeditor4/lang/hr.js
similarity index 100%
rename from plugin/ckeditor/lang/hr.js
rename to plugin/editor/ckeditor4/lang/hr.js
diff --git a/plugin/ckeditor/lang/hu.js b/plugin/editor/ckeditor4/lang/hu.js
similarity index 100%
rename from plugin/ckeditor/lang/hu.js
rename to plugin/editor/ckeditor4/lang/hu.js
diff --git a/plugin/ckeditor/lang/is.js b/plugin/editor/ckeditor4/lang/is.js
similarity index 100%
rename from plugin/ckeditor/lang/is.js
rename to plugin/editor/ckeditor4/lang/is.js
diff --git a/plugin/ckeditor/lang/it.js b/plugin/editor/ckeditor4/lang/it.js
similarity index 100%
rename from plugin/ckeditor/lang/it.js
rename to plugin/editor/ckeditor4/lang/it.js
diff --git a/plugin/ckeditor/lang/ja.js b/plugin/editor/ckeditor4/lang/ja.js
similarity index 100%
rename from plugin/ckeditor/lang/ja.js
rename to plugin/editor/ckeditor4/lang/ja.js
diff --git a/plugin/ckeditor/lang/ka.js b/plugin/editor/ckeditor4/lang/ka.js
similarity index 100%
rename from plugin/ckeditor/lang/ka.js
rename to plugin/editor/ckeditor4/lang/ka.js
diff --git a/plugin/ckeditor/lang/km.js b/plugin/editor/ckeditor4/lang/km.js
similarity index 100%
rename from plugin/ckeditor/lang/km.js
rename to plugin/editor/ckeditor4/lang/km.js
diff --git a/plugin/ckeditor/lang/ko.js b/plugin/editor/ckeditor4/lang/ko.js
similarity index 100%
rename from plugin/ckeditor/lang/ko.js
rename to plugin/editor/ckeditor4/lang/ko.js
diff --git a/plugin/ckeditor/lang/ku.js b/plugin/editor/ckeditor4/lang/ku.js
similarity index 100%
rename from plugin/ckeditor/lang/ku.js
rename to plugin/editor/ckeditor4/lang/ku.js
diff --git a/plugin/ckeditor/lang/lt.js b/plugin/editor/ckeditor4/lang/lt.js
similarity index 100%
rename from plugin/ckeditor/lang/lt.js
rename to plugin/editor/ckeditor4/lang/lt.js
diff --git a/plugin/ckeditor/lang/lv.js b/plugin/editor/ckeditor4/lang/lv.js
similarity index 100%
rename from plugin/ckeditor/lang/lv.js
rename to plugin/editor/ckeditor4/lang/lv.js
diff --git a/plugin/ckeditor/lang/mk.js b/plugin/editor/ckeditor4/lang/mk.js
similarity index 100%
rename from plugin/ckeditor/lang/mk.js
rename to plugin/editor/ckeditor4/lang/mk.js
diff --git a/plugin/ckeditor/lang/mn.js b/plugin/editor/ckeditor4/lang/mn.js
similarity index 100%
rename from plugin/ckeditor/lang/mn.js
rename to plugin/editor/ckeditor4/lang/mn.js
diff --git a/plugin/ckeditor/lang/ms.js b/plugin/editor/ckeditor4/lang/ms.js
similarity index 100%
rename from plugin/ckeditor/lang/ms.js
rename to plugin/editor/ckeditor4/lang/ms.js
diff --git a/plugin/ckeditor/lang/nb.js b/plugin/editor/ckeditor4/lang/nb.js
similarity index 100%
rename from plugin/ckeditor/lang/nb.js
rename to plugin/editor/ckeditor4/lang/nb.js
diff --git a/plugin/ckeditor/lang/nl.js b/plugin/editor/ckeditor4/lang/nl.js
similarity index 100%
rename from plugin/ckeditor/lang/nl.js
rename to plugin/editor/ckeditor4/lang/nl.js
diff --git a/plugin/ckeditor/lang/no.js b/plugin/editor/ckeditor4/lang/no.js
similarity index 100%
rename from plugin/ckeditor/lang/no.js
rename to plugin/editor/ckeditor4/lang/no.js
diff --git a/plugin/ckeditor/lang/pl.js b/plugin/editor/ckeditor4/lang/pl.js
similarity index 100%
rename from plugin/ckeditor/lang/pl.js
rename to plugin/editor/ckeditor4/lang/pl.js
diff --git a/plugin/ckeditor/lang/pt-br.js b/plugin/editor/ckeditor4/lang/pt-br.js
similarity index 100%
rename from plugin/ckeditor/lang/pt-br.js
rename to plugin/editor/ckeditor4/lang/pt-br.js
diff --git a/plugin/ckeditor/lang/pt.js b/plugin/editor/ckeditor4/lang/pt.js
similarity index 100%
rename from plugin/ckeditor/lang/pt.js
rename to plugin/editor/ckeditor4/lang/pt.js
diff --git a/plugin/ckeditor/lang/ro.js b/plugin/editor/ckeditor4/lang/ro.js
similarity index 100%
rename from plugin/ckeditor/lang/ro.js
rename to plugin/editor/ckeditor4/lang/ro.js
diff --git a/plugin/ckeditor/lang/ru.js b/plugin/editor/ckeditor4/lang/ru.js
similarity index 100%
rename from plugin/ckeditor/lang/ru.js
rename to plugin/editor/ckeditor4/lang/ru.js
diff --git a/plugin/ckeditor/lang/sk.js b/plugin/editor/ckeditor4/lang/sk.js
similarity index 100%
rename from plugin/ckeditor/lang/sk.js
rename to plugin/editor/ckeditor4/lang/sk.js
diff --git a/plugin/ckeditor/lang/sl.js b/plugin/editor/ckeditor4/lang/sl.js
similarity index 100%
rename from plugin/ckeditor/lang/sl.js
rename to plugin/editor/ckeditor4/lang/sl.js
diff --git a/plugin/ckeditor/lang/sr-latn.js b/plugin/editor/ckeditor4/lang/sr-latn.js
similarity index 100%
rename from plugin/ckeditor/lang/sr-latn.js
rename to plugin/editor/ckeditor4/lang/sr-latn.js
diff --git a/plugin/ckeditor/lang/sr.js b/plugin/editor/ckeditor4/lang/sr.js
similarity index 100%
rename from plugin/ckeditor/lang/sr.js
rename to plugin/editor/ckeditor4/lang/sr.js
diff --git a/plugin/ckeditor/lang/sv.js b/plugin/editor/ckeditor4/lang/sv.js
similarity index 100%
rename from plugin/ckeditor/lang/sv.js
rename to plugin/editor/ckeditor4/lang/sv.js
diff --git a/plugin/ckeditor/lang/th.js b/plugin/editor/ckeditor4/lang/th.js
similarity index 100%
rename from plugin/ckeditor/lang/th.js
rename to plugin/editor/ckeditor4/lang/th.js
diff --git a/plugin/ckeditor/lang/tr.js b/plugin/editor/ckeditor4/lang/tr.js
similarity index 100%
rename from plugin/ckeditor/lang/tr.js
rename to plugin/editor/ckeditor4/lang/tr.js
diff --git a/plugin/ckeditor/lang/ug.js b/plugin/editor/ckeditor4/lang/ug.js
similarity index 100%
rename from plugin/ckeditor/lang/ug.js
rename to plugin/editor/ckeditor4/lang/ug.js
diff --git a/plugin/ckeditor/lang/uk.js b/plugin/editor/ckeditor4/lang/uk.js
similarity index 100%
rename from plugin/ckeditor/lang/uk.js
rename to plugin/editor/ckeditor4/lang/uk.js
diff --git a/plugin/ckeditor/lang/vi.js b/plugin/editor/ckeditor4/lang/vi.js
similarity index 100%
rename from plugin/ckeditor/lang/vi.js
rename to plugin/editor/ckeditor4/lang/vi.js
diff --git a/plugin/ckeditor/lang/zh-cn.js b/plugin/editor/ckeditor4/lang/zh-cn.js
similarity index 100%
rename from plugin/ckeditor/lang/zh-cn.js
rename to plugin/editor/ckeditor4/lang/zh-cn.js
diff --git a/plugin/ckeditor/lang/zh.js b/plugin/editor/ckeditor4/lang/zh.js
similarity index 100%
rename from plugin/ckeditor/lang/zh.js
rename to plugin/editor/ckeditor4/lang/zh.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ar.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ar.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/bg.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/bg.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ca.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ca.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/cs.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/cs.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/cy.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/cy.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/da.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/da.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/de.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/de.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/el.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/el.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/en.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/en.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/eo.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/eo.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/et.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/et.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fa.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fa.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fi.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fi.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fr.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/fr.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/gu.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/gu.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/he.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/he.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hi.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hi.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hr.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hr.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hu.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/hu.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/it.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/it.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ku.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ku.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/lt.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/lt.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/lv.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/lv.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/mk.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/mk.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/mn.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/mn.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/nb.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/nb.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/nl.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/nl.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/no.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/no.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pl.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pl.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pt-br.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pt-br.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pt.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/pt.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ro.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ro.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ru.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ru.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/sk.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/sk.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/sl.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/sl.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/tr.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/tr.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ug.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/ug.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/uk.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/uk.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/vi.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/vi.js
diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/zh-cn.js
similarity index 100%
rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
rename to plugin/editor/ckeditor4/plugins/a11yhelp/dialogs/lang/zh-cn.js
diff --git a/plugin/ckeditor/plugins/about/dialogs/about.js b/plugin/editor/ckeditor4/plugins/about/dialogs/about.js
similarity index 100%
rename from plugin/ckeditor/plugins/about/dialogs/about.js
rename to plugin/editor/ckeditor4/plugins/about/dialogs/about.js
diff --git a/plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/plugin/editor/ckeditor4/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to plugin/editor/ckeditor4/plugins/about/dialogs/logo_ckeditor.png
diff --git a/plugin/ckeditor/plugins/clipboard/dialogs/paste.js b/plugin/editor/ckeditor4/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from plugin/ckeditor/plugins/clipboard/dialogs/paste.js
rename to plugin/editor/ckeditor4/plugins/clipboard/dialogs/paste.js
diff --git a/plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js b/plugin/editor/ckeditor4/plugins/colordialog/dialogs/colordialog.js
similarity index 100%
rename from plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js
rename to plugin/editor/ckeditor4/plugins/colordialog/dialogs/colordialog.js
diff --git a/plugin/ckeditor/plugins/dialog/dialogDefinition.js b/plugin/editor/ckeditor4/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from plugin/ckeditor/plugins/dialog/dialogDefinition.js
rename to plugin/editor/ckeditor4/plugins/dialog/dialogDefinition.js
diff --git a/plugin/ckeditor/plugins/div/dialogs/div.js b/plugin/editor/ckeditor4/plugins/div/dialogs/div.js
similarity index 100%
rename from plugin/ckeditor/plugins/div/dialogs/div.js
rename to plugin/editor/ckeditor4/plugins/div/dialogs/div.js
diff --git a/plugin/ckeditor/plugins/fakeobjects/images/spacer.gif b/plugin/editor/ckeditor4/plugins/fakeobjects/images/spacer.gif
similarity index 100%
rename from plugin/ckeditor/plugins/fakeobjects/images/spacer.gif
rename to plugin/editor/ckeditor4/plugins/fakeobjects/images/spacer.gif
diff --git a/plugin/ckeditor/plugins/find/dialogs/find.js b/plugin/editor/ckeditor4/plugins/find/dialogs/find.js
similarity index 100%
rename from plugin/ckeditor/plugins/find/dialogs/find.js
rename to plugin/editor/ckeditor4/plugins/find/dialogs/find.js
diff --git a/plugin/ckeditor/plugins/flash/dialogs/flash.js b/plugin/editor/ckeditor4/plugins/flash/dialogs/flash.js
similarity index 100%
rename from plugin/ckeditor/plugins/flash/dialogs/flash.js
rename to plugin/editor/ckeditor4/plugins/flash/dialogs/flash.js
diff --git a/plugin/ckeditor/plugins/flash/images/placeholder.png b/plugin/editor/ckeditor4/plugins/flash/images/placeholder.png
similarity index 100%
rename from plugin/ckeditor/plugins/flash/images/placeholder.png
rename to plugin/editor/ckeditor4/plugins/flash/images/placeholder.png
diff --git a/plugin/ckeditor/plugins/forms/dialogs/button.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/button.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/button.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/button.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/checkbox.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/checkbox.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/checkbox.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/checkbox.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/form.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/form.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/form.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/form.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/hiddenfield.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/hiddenfield.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/radio.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/radio.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/radio.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/radio.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/select.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/select.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/select.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/select.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/textarea.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/textarea.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/textarea.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/textarea.js
diff --git a/plugin/ckeditor/plugins/forms/dialogs/textfield.js b/plugin/editor/ckeditor4/plugins/forms/dialogs/textfield.js
similarity index 100%
rename from plugin/ckeditor/plugins/forms/dialogs/textfield.js
rename to plugin/editor/ckeditor4/plugins/forms/dialogs/textfield.js
diff --git a/plugin/ckeditor/plugins/forms/images/hiddenfield.gif b/plugin/editor/ckeditor4/plugins/forms/images/hiddenfield.gif
similarity index 100%
rename from plugin/ckeditor/plugins/forms/images/hiddenfield.gif
rename to plugin/editor/ckeditor4/plugins/forms/images/hiddenfield.gif
diff --git a/plugin/ckeditor/plugins/icons.png b/plugin/editor/ckeditor4/plugins/icons.png
similarity index 100%
rename from plugin/ckeditor/plugins/icons.png
rename to plugin/editor/ckeditor4/plugins/icons.png
diff --git a/plugin/ckeditor/plugins/iframe/dialogs/iframe.js b/plugin/editor/ckeditor4/plugins/iframe/dialogs/iframe.js
similarity index 100%
rename from plugin/ckeditor/plugins/iframe/dialogs/iframe.js
rename to plugin/editor/ckeditor4/plugins/iframe/dialogs/iframe.js
diff --git a/plugin/ckeditor/plugins/iframe/images/placeholder.png b/plugin/editor/ckeditor4/plugins/iframe/images/placeholder.png
similarity index 100%
rename from plugin/ckeditor/plugins/iframe/images/placeholder.png
rename to plugin/editor/ckeditor4/plugins/iframe/images/placeholder.png
diff --git a/plugin/ckeditor/plugins/image/dialogs/image.js b/plugin/editor/ckeditor4/plugins/image/dialogs/image.js
similarity index 100%
rename from plugin/ckeditor/plugins/image/dialogs/image.js
rename to plugin/editor/ckeditor4/plugins/image/dialogs/image.js
diff --git a/plugin/ckeditor/plugins/image/images/noimage.png b/plugin/editor/ckeditor4/plugins/image/images/noimage.png
similarity index 100%
rename from plugin/ckeditor/plugins/image/images/noimage.png
rename to plugin/editor/ckeditor4/plugins/image/images/noimage.png
diff --git a/plugin/ckeditor/plugins/link/dialogs/anchor.js b/plugin/editor/ckeditor4/plugins/link/dialogs/anchor.js
similarity index 100%
rename from plugin/ckeditor/plugins/link/dialogs/anchor.js
rename to plugin/editor/ckeditor4/plugins/link/dialogs/anchor.js
diff --git a/plugin/ckeditor/plugins/link/dialogs/link.js b/plugin/editor/ckeditor4/plugins/link/dialogs/link.js
similarity index 100%
rename from plugin/ckeditor/plugins/link/dialogs/link.js
rename to plugin/editor/ckeditor4/plugins/link/dialogs/link.js
diff --git a/plugin/ckeditor/plugins/link/images/anchor.png b/plugin/editor/ckeditor4/plugins/link/images/anchor.png
similarity index 100%
rename from plugin/ckeditor/plugins/link/images/anchor.png
rename to plugin/editor/ckeditor4/plugins/link/images/anchor.png
diff --git a/plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js b/plugin/editor/ckeditor4/plugins/liststyle/dialogs/liststyle.js
similarity index 100%
rename from plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js
rename to plugin/editor/ckeditor4/plugins/liststyle/dialogs/liststyle.js
diff --git a/plugin/ckeditor/plugins/magicline/images/icon.png b/plugin/editor/ckeditor4/plugins/magicline/images/icon.png
similarity index 100%
rename from plugin/ckeditor/plugins/magicline/images/icon.png
rename to plugin/editor/ckeditor4/plugins/magicline/images/icon.png
diff --git a/plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif b/plugin/editor/ckeditor4/plugins/pagebreak/images/pagebreak.gif
similarity index 100%
rename from plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif
rename to plugin/editor/ckeditor4/plugins/pagebreak/images/pagebreak.gif
diff --git a/plugin/ckeditor/plugins/pastefromword/filter/default.js b/plugin/editor/ckeditor4/plugins/pastefromword/filter/default.js
similarity index 100%
rename from plugin/ckeditor/plugins/pastefromword/filter/default.js
rename to plugin/editor/ckeditor4/plugins/pastefromword/filter/default.js
diff --git a/plugin/ckeditor/plugins/preview/preview.html b/plugin/editor/ckeditor4/plugins/preview/preview.html
similarity index 100%
rename from plugin/ckeditor/plugins/preview/preview.html
rename to plugin/editor/ckeditor4/plugins/preview/preview.html
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_address.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_address.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_address.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_address.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_blockquote.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_blockquote.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_blockquote.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_blockquote.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_div.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_div.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_div.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_div.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h1.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h1.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h1.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h1.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h2.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h2.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h2.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h2.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h3.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h3.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h3.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h3.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h4.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h4.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h4.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h4.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h5.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h5.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h5.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h5.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h6.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_h6.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_h6.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_h6.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_p.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_p.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_p.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_p.png
diff --git a/plugin/ckeditor/plugins/showblocks/images/block_pre.png b/plugin/editor/ckeditor4/plugins/showblocks/images/block_pre.png
similarity index 100%
rename from plugin/ckeditor/plugins/showblocks/images/block_pre.png
rename to plugin/editor/ckeditor4/plugins/showblocks/images/block_pre.png
diff --git a/plugin/ckeditor/plugins/smiley/dialogs/smiley.js b/plugin/editor/ckeditor4/plugins/smiley/dialogs/smiley.js
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/dialogs/smiley.js
rename to plugin/editor/ckeditor4/plugins/smiley/dialogs/smiley.js
diff --git a/plugin/ckeditor/plugins/smiley/images/angel_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/angel_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/angel_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/angel_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/angry_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/angry_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/angry_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/angry_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/broken_heart.gif b/plugin/editor/ckeditor4/plugins/smiley/images/broken_heart.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/broken_heart.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/broken_heart.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/confused_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/confused_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/confused_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/confused_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/cry_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/cry_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/cry_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/cry_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/devil_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/devil_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/devil_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/devil_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/embaressed_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/embaressed_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/embarrassed_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/embarrassed_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/envelope.gif b/plugin/editor/ckeditor4/plugins/smiley/images/envelope.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/envelope.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/envelope.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/heart.gif b/plugin/editor/ckeditor4/plugins/smiley/images/heart.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/heart.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/heart.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/kiss.gif b/plugin/editor/ckeditor4/plugins/smiley/images/kiss.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/kiss.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/kiss.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/lightbulb.gif b/plugin/editor/ckeditor4/plugins/smiley/images/lightbulb.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/lightbulb.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/lightbulb.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/omg_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/omg_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/omg_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/omg_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/regular_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/regular_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/regular_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/regular_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/sad_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/sad_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/sad_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/sad_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/shades_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/shades_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/shades_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/shades_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/teeth_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/teeth_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/teeth_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/teeth_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/thumbs_down.gif b/plugin/editor/ckeditor4/plugins/smiley/images/thumbs_down.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/thumbs_down.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/thumbs_down.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/thumbs_up.gif b/plugin/editor/ckeditor4/plugins/smiley/images/thumbs_up.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/thumbs_up.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/thumbs_up.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/tongue_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/tongue_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/tongue_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/tongue_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/tounge_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/tounge_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/tounge_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/tounge_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/plugin/ckeditor/plugins/smiley/images/wink_smile.gif b/plugin/editor/ckeditor4/plugins/smiley/images/wink_smile.gif
similarity index 100%
rename from plugin/ckeditor/plugins/smiley/images/wink_smile.gif
rename to plugin/editor/ckeditor4/plugins/smiley/images/wink_smile.gif
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/_translationstatus.txt
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ca.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ca.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/cs.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/cs.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/cy.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/cy.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/de.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/de.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/el.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/el.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/en.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/en.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/eo.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/eo.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/et.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/et.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fa.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fa.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fi.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fi.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fr.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/fr.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/he.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/he.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/hr.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/hr.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/it.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/it.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ku.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ku.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/lv.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/lv.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/nb.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/nb.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/nl.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/nl.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/no.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/no.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/pt-br.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/pt-br.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/sk.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/sk.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/tr.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/tr.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ug.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/ug.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/zh-cn.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/lang/zh-cn.js
diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js b/plugin/editor/ckeditor4/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to plugin/editor/ckeditor4/plugins/specialchar/dialogs/specialchar.js
diff --git a/plugin/ckeditor/plugins/table/dialogs/table.js b/plugin/editor/ckeditor4/plugins/table/dialogs/table.js
similarity index 100%
rename from plugin/ckeditor/plugins/table/dialogs/table.js
rename to plugin/editor/ckeditor4/plugins/table/dialogs/table.js
diff --git a/plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js b/plugin/editor/ckeditor4/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to plugin/editor/ckeditor4/plugins/tabletools/dialogs/tableCell.js
diff --git a/plugin/ckeditor/plugins/templates/dialogs/templates.css b/plugin/editor/ckeditor4/plugins/templates/dialogs/templates.css
similarity index 100%
rename from plugin/ckeditor/plugins/templates/dialogs/templates.css
rename to plugin/editor/ckeditor4/plugins/templates/dialogs/templates.css
diff --git a/plugin/ckeditor/plugins/templates/dialogs/templates.js b/plugin/editor/ckeditor4/plugins/templates/dialogs/templates.js
similarity index 100%
rename from plugin/ckeditor/plugins/templates/dialogs/templates.js
rename to plugin/editor/ckeditor4/plugins/templates/dialogs/templates.js
diff --git a/plugin/ckeditor/plugins/templates/templates/default.js b/plugin/editor/ckeditor4/plugins/templates/templates/default.js
similarity index 100%
rename from plugin/ckeditor/plugins/templates/templates/default.js
rename to plugin/editor/ckeditor4/plugins/templates/templates/default.js
diff --git a/plugin/ckeditor/plugins/templates/templates/images/template1.gif b/plugin/editor/ckeditor4/plugins/templates/templates/images/template1.gif
similarity index 100%
rename from plugin/ckeditor/plugins/templates/templates/images/template1.gif
rename to plugin/editor/ckeditor4/plugins/templates/templates/images/template1.gif
diff --git a/plugin/ckeditor/plugins/templates/templates/images/template2.gif b/plugin/editor/ckeditor4/plugins/templates/templates/images/template2.gif
similarity index 100%
rename from plugin/ckeditor/plugins/templates/templates/images/template2.gif
rename to plugin/editor/ckeditor4/plugins/templates/templates/images/template2.gif
diff --git a/plugin/ckeditor/plugins/templates/templates/images/template3.gif b/plugin/editor/ckeditor4/plugins/templates/templates/images/template3.gif
similarity index 100%
rename from plugin/ckeditor/plugins/templates/templates/images/template3.gif
rename to plugin/editor/ckeditor4/plugins/templates/templates/images/template3.gif
diff --git a/plugin/ckeditor/samples/ajax.html b/plugin/editor/ckeditor4/samples/ajax.html
similarity index 100%
rename from plugin/ckeditor/samples/ajax.html
rename to plugin/editor/ckeditor4/samples/ajax.html
diff --git a/plugin/ckeditor/samples/api.html b/plugin/editor/ckeditor4/samples/api.html
similarity index 100%
rename from plugin/ckeditor/samples/api.html
rename to plugin/editor/ckeditor4/samples/api.html
diff --git a/plugin/ckeditor/samples/appendto.html b/plugin/editor/ckeditor4/samples/appendto.html
similarity index 100%
rename from plugin/ckeditor/samples/appendto.html
rename to plugin/editor/ckeditor4/samples/appendto.html
diff --git a/plugin/ckeditor/samples/assets/inlineall/logo.png b/plugin/editor/ckeditor4/samples/assets/inlineall/logo.png
similarity index 100%
rename from plugin/ckeditor/samples/assets/inlineall/logo.png
rename to plugin/editor/ckeditor4/samples/assets/inlineall/logo.png
diff --git a/plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css b/plugin/editor/ckeditor4/samples/assets/outputxhtml/outputxhtml.css
similarity index 100%
rename from plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css
rename to plugin/editor/ckeditor4/samples/assets/outputxhtml/outputxhtml.css
diff --git a/plugin/ckeditor/samples/assets/posteddata.php b/plugin/editor/ckeditor4/samples/assets/posteddata.php
similarity index 100%
rename from plugin/ckeditor/samples/assets/posteddata.php
rename to plugin/editor/ckeditor4/samples/assets/posteddata.php
diff --git a/plugin/ckeditor/samples/assets/sample.css b/plugin/editor/ckeditor4/samples/assets/sample.css
similarity index 100%
rename from plugin/ckeditor/samples/assets/sample.css
rename to plugin/editor/ckeditor4/samples/assets/sample.css
diff --git a/plugin/ckeditor/samples/assets/sample.jpg b/plugin/editor/ckeditor4/samples/assets/sample.jpg
similarity index 100%
rename from plugin/ckeditor/samples/assets/sample.jpg
rename to plugin/editor/ckeditor4/samples/assets/sample.jpg
diff --git a/plugin/ckeditor/samples/assets/uilanguages/languages.js b/plugin/editor/ckeditor4/samples/assets/uilanguages/languages.js
similarity index 100%
rename from plugin/ckeditor/samples/assets/uilanguages/languages.js
rename to plugin/editor/ckeditor4/samples/assets/uilanguages/languages.js
diff --git a/plugin/ckeditor/samples/divreplace.html b/plugin/editor/ckeditor4/samples/divreplace.html
similarity index 100%
rename from plugin/ckeditor/samples/divreplace.html
rename to plugin/editor/ckeditor4/samples/divreplace.html
diff --git a/plugin/ckeditor/samples/index.html b/plugin/editor/ckeditor4/samples/index.html
similarity index 100%
rename from plugin/ckeditor/samples/index.html
rename to plugin/editor/ckeditor4/samples/index.html
diff --git a/plugin/ckeditor/samples/inlineall.html b/plugin/editor/ckeditor4/samples/inlineall.html
similarity index 100%
rename from plugin/ckeditor/samples/inlineall.html
rename to plugin/editor/ckeditor4/samples/inlineall.html
diff --git a/plugin/ckeditor/samples/inlinebycode.html b/plugin/editor/ckeditor4/samples/inlinebycode.html
similarity index 100%
rename from plugin/ckeditor/samples/inlinebycode.html
rename to plugin/editor/ckeditor4/samples/inlinebycode.html
diff --git a/plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js b/plugin/editor/ckeditor4/samples/plugins/dialog/assets/my_dialog.js
similarity index 100%
rename from plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js
rename to plugin/editor/ckeditor4/samples/plugins/dialog/assets/my_dialog.js
diff --git a/plugin/ckeditor/samples/plugins/dialog/dialog.html b/plugin/editor/ckeditor4/samples/plugins/dialog/dialog.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/dialog/dialog.html
rename to plugin/editor/ckeditor4/samples/plugins/dialog/dialog.html
diff --git a/plugin/ckeditor/samples/plugins/enterkey/enterkey.html b/plugin/editor/ckeditor4/samples/plugins/enterkey/enterkey.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/enterkey/enterkey.html
rename to plugin/editor/ckeditor4/samples/plugins/enterkey/enterkey.html
diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla b/plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
similarity index 100%
rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
rename to plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf b/plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
similarity index 100%
rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
rename to plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js b/plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
similarity index 100%
rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
rename to plugin/editor/ckeditor4/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html b/plugin/editor/ckeditor4/samples/plugins/htmlwriter/outputforflash.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html
rename to plugin/editor/ckeditor4/samples/plugins/htmlwriter/outputforflash.html
diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html b/plugin/editor/ckeditor4/samples/plugins/htmlwriter/outputhtml.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html
rename to plugin/editor/ckeditor4/samples/plugins/htmlwriter/outputhtml.html
diff --git a/plugin/ckeditor/samples/plugins/magicline/magicline.html b/plugin/editor/ckeditor4/samples/plugins/magicline/magicline.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/magicline/magicline.html
rename to plugin/editor/ckeditor4/samples/plugins/magicline/magicline.html
diff --git a/plugin/ckeditor/samples/plugins/toolbar/toolbar.html b/plugin/editor/ckeditor4/samples/plugins/toolbar/toolbar.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/toolbar/toolbar.html
rename to plugin/editor/ckeditor4/samples/plugins/toolbar/toolbar.html
diff --git a/plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html b/plugin/editor/ckeditor4/samples/plugins/wysiwygarea/fullpage.html
similarity index 100%
rename from plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html
rename to plugin/editor/ckeditor4/samples/plugins/wysiwygarea/fullpage.html
diff --git a/plugin/ckeditor/samples/readonly.html b/plugin/editor/ckeditor4/samples/readonly.html
similarity index 100%
rename from plugin/ckeditor/samples/readonly.html
rename to plugin/editor/ckeditor4/samples/readonly.html
diff --git a/plugin/ckeditor/samples/replacebyclass.html b/plugin/editor/ckeditor4/samples/replacebyclass.html
similarity index 100%
rename from plugin/ckeditor/samples/replacebyclass.html
rename to plugin/editor/ckeditor4/samples/replacebyclass.html
diff --git a/plugin/ckeditor/samples/replacebycode.html b/plugin/editor/ckeditor4/samples/replacebycode.html
similarity index 100%
rename from plugin/ckeditor/samples/replacebycode.html
rename to plugin/editor/ckeditor4/samples/replacebycode.html
diff --git a/plugin/ckeditor/samples/sample.css b/plugin/editor/ckeditor4/samples/sample.css
similarity index 100%
rename from plugin/ckeditor/samples/sample.css
rename to plugin/editor/ckeditor4/samples/sample.css
diff --git a/plugin/ckeditor/samples/sample.js b/plugin/editor/ckeditor4/samples/sample.js
similarity index 100%
rename from plugin/ckeditor/samples/sample.js
rename to plugin/editor/ckeditor4/samples/sample.js
diff --git a/plugin/ckeditor/samples/sample_posteddata.php b/plugin/editor/ckeditor4/samples/sample_posteddata.php
similarity index 100%
rename from plugin/ckeditor/samples/sample_posteddata.php
rename to plugin/editor/ckeditor4/samples/sample_posteddata.php
diff --git a/plugin/ckeditor/samples/tabindex.html b/plugin/editor/ckeditor4/samples/tabindex.html
similarity index 100%
rename from plugin/ckeditor/samples/tabindex.html
rename to plugin/editor/ckeditor4/samples/tabindex.html
diff --git a/plugin/ckeditor/samples/uicolor.html b/plugin/editor/ckeditor4/samples/uicolor.html
similarity index 100%
rename from plugin/ckeditor/samples/uicolor.html
rename to plugin/editor/ckeditor4/samples/uicolor.html
diff --git a/plugin/ckeditor/samples/uilanguages.html b/plugin/editor/ckeditor4/samples/uilanguages.html
similarity index 100%
rename from plugin/ckeditor/samples/uilanguages.html
rename to plugin/editor/ckeditor4/samples/uilanguages.html
diff --git a/plugin/ckeditor/samples/xhtmlstyle.html b/plugin/editor/ckeditor4/samples/xhtmlstyle.html
similarity index 100%
rename from plugin/ckeditor/samples/xhtmlstyle.html
rename to plugin/editor/ckeditor4/samples/xhtmlstyle.html
diff --git a/plugin/ckeditor/shortcut.html b/plugin/editor/ckeditor4/shortcut.html
similarity index 100%
rename from plugin/ckeditor/shortcut.html
rename to plugin/editor/ckeditor4/shortcut.html
diff --git a/plugin/ckeditor/skins/moono/dialog.css b/plugin/editor/ckeditor4/skins/moono/dialog.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/dialog.css
rename to plugin/editor/ckeditor4/skins/moono/dialog.css
diff --git a/plugin/ckeditor/skins/moono/dialog_ie.css b/plugin/editor/ckeditor4/skins/moono/dialog_ie.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/dialog_ie.css
rename to plugin/editor/ckeditor4/skins/moono/dialog_ie.css
diff --git a/plugin/ckeditor/skins/moono/dialog_ie7.css b/plugin/editor/ckeditor4/skins/moono/dialog_ie7.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/dialog_ie7.css
rename to plugin/editor/ckeditor4/skins/moono/dialog_ie7.css
diff --git a/plugin/ckeditor/skins/moono/dialog_ie8.css b/plugin/editor/ckeditor4/skins/moono/dialog_ie8.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/dialog_ie8.css
rename to plugin/editor/ckeditor4/skins/moono/dialog_ie8.css
diff --git a/plugin/ckeditor/skins/moono/dialog_opera.css b/plugin/editor/ckeditor4/skins/moono/dialog_opera.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/dialog_opera.css
rename to plugin/editor/ckeditor4/skins/moono/dialog_opera.css
diff --git a/plugin/ckeditor/skins/moono/editor.css b/plugin/editor/ckeditor4/skins/moono/editor.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/editor.css
rename to plugin/editor/ckeditor4/skins/moono/editor.css
diff --git a/plugin/ckeditor/skins/moono/editor_gecko.css b/plugin/editor/ckeditor4/skins/moono/editor_gecko.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/editor_gecko.css
rename to plugin/editor/ckeditor4/skins/moono/editor_gecko.css
diff --git a/plugin/ckeditor/skins/moono/editor_ie.css b/plugin/editor/ckeditor4/skins/moono/editor_ie.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/editor_ie.css
rename to plugin/editor/ckeditor4/skins/moono/editor_ie.css
diff --git a/plugin/ckeditor/skins/moono/editor_ie7.css b/plugin/editor/ckeditor4/skins/moono/editor_ie7.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/editor_ie7.css
rename to plugin/editor/ckeditor4/skins/moono/editor_ie7.css
diff --git a/plugin/ckeditor/skins/moono/editor_ie8.css b/plugin/editor/ckeditor4/skins/moono/editor_ie8.css
similarity index 100%
rename from plugin/ckeditor/skins/moono/editor_ie8.css
rename to plugin/editor/ckeditor4/skins/moono/editor_ie8.css
diff --git a/plugin/ckeditor/skins/moono/icons.png b/plugin/editor/ckeditor4/skins/moono/icons.png
similarity index 100%
rename from plugin/ckeditor/skins/moono/icons.png
rename to plugin/editor/ckeditor4/skins/moono/icons.png
diff --git a/plugin/ckeditor/skins/moono/images/arrow.png b/plugin/editor/ckeditor4/skins/moono/images/arrow.png
similarity index 100%
rename from plugin/ckeditor/skins/moono/images/arrow.png
rename to plugin/editor/ckeditor4/skins/moono/images/arrow.png
diff --git a/plugin/ckeditor/skins/moono/images/close.png b/plugin/editor/ckeditor4/skins/moono/images/close.png
similarity index 100%
rename from plugin/ckeditor/skins/moono/images/close.png
rename to plugin/editor/ckeditor4/skins/moono/images/close.png
diff --git a/plugin/ckeditor/skins/moono/images/mini.png b/plugin/editor/ckeditor4/skins/moono/images/mini.png
similarity index 100%
rename from plugin/ckeditor/skins/moono/images/mini.png
rename to plugin/editor/ckeditor4/skins/moono/images/mini.png
diff --git a/plugin/ckeditor/skins/moono/readme.md b/plugin/editor/ckeditor4/skins/moono/readme.md
similarity index 100%
rename from plugin/ckeditor/skins/moono/readme.md
rename to plugin/editor/ckeditor4/skins/moono/readme.md
diff --git a/plugin/ckeditor/styles.js b/plugin/editor/ckeditor4/styles.js
similarity index 100%
rename from plugin/ckeditor/styles.js
rename to plugin/editor/ckeditor4/styles.js
diff --git a/plugin/ckeditor/upload.php b/plugin/editor/ckeditor4/upload.php
similarity index 94%
rename from plugin/ckeditor/upload.php
rename to plugin/editor/ckeditor4/upload.php
index e9e14e86e..96f22a343 100644
--- a/plugin/ckeditor/upload.php
+++ b/plugin/editor/ckeditor4/upload.php
@@ -1,10 +1,11 @@
 <?php
-include_once("../../common.php");
+include_once("../../../common.php");
 
 $ym = date('ym', G4_SERVER_TIME);
 
 $data_dir = G4_DATA_PATH.'/editor/'.$ym;
 $data_url = G4_DATA_URL.'/editor/'.$ym;
+
 @mkdir($data_dir, G4_DIR_PERMISSION);
 @chmod($data_dir, G4_DIR_PERMISSION);