Rename third_party/hunspell_new back to third_party/hunspell.

This completes the check-in of hunspell code into the Chromium tree.

BUG=472897
R=brettw@chromium.org
TBR=phajdan.jr@chromium.org # for checklicenses

Review URL: https://codereview.chromium.org/1135173004

Cr-Commit-Position: refs/heads/master@{#330328}

diff --git a/BUILD.gn b/BUILD.gn
index 65f40e0..9dbfaae 100644
--- a/BUILD.gn
+++ b/BUILD.gn

@@ -514,7 +514,7 @@
       "//storage/browser",
       "//third_party/brotli",
       "//third_party/flac",
-      "//third_party/hunspell_new",
+      "//third_party/hunspell",
       "//third_party/iccjpeg",
       "//third_party/libphonenumber",
       "//third_party/ots",

diff --git a/chrome/DEPS b/chrome/DEPS
index c82a8622..e014b07f 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS

@@ -36,7 +36,7 @@
   "+third_party/WebKit/public/web",
 
   # Allow inclusion of third-party code:
-  "+third_party/hunspell_new",
+  "+third_party/hunspell",
   "+third_party/libxml",
   "+third_party/mojo/src/mojo/public",
   "+third_party/skia",

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 96b968b..1ad17a3 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn

@@ -367,7 +367,7 @@
     sources += rebase_path(gypi_values.chrome_browser_spellchecker_sources,
                            ".",
                            "//chrome")
-    deps += [ "//third_party/hunspell_new" ]
+    deps += [ "//third_party/hunspell" ]
   }
   if (enable_nacl) {
     sources +=

diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index 805c2a49..b2e73c4 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc

@@ -19,7 +19,7 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "third_party/hunspell_new/google/bdict.h"
+#include "third_party/hunspell/google/bdict.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index acc96c7..7cacb3a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi

@@ -3328,7 +3328,7 @@
         ['enable_spellcheck==1', {
           'sources': [ '<@(chrome_browser_spellchecker_sources)' ],
           'dependencies': [
-            '../third_party/hunspell_new/hunspell.gyp:hunspell',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
         }],
         ['disable_nacl==0', {

diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 9f618ca..aa1600c0 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi

@@ -344,7 +344,7 @@
             '<@(chrome_renderer_spellchecker_sources)',
           ],
           'dependencies': [
-            '../third_party/hunspell_new/hunspell.gyp:hunspell',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
         }],
         ['OS=="mac"', {

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0291a8f..73e039d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi

@@ -1507,7 +1507,7 @@
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/hunspell_new/hunspell.gyp:hunspell',
+        '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2e5c92a2..e59e942 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi

@@ -2207,7 +2207,7 @@
           'sources': [ '<@(chrome_unit_tests_spellchecker_sources)' ],
           'conditions': [
             ['OS!="mac" and OS!="ios"', {
-              'dependencies': [ '../third_party/hunspell_new/hunspell.gyp:hunspell' ],
+              'dependencies': [ '../third_party/hunspell/hunspell.gyp:hunspell' ],
             }],
           ],
         }],
@@ -2476,7 +2476,7 @@
         }],
         ['OS!="mac" and OS!="ios"', {
           'dependencies': [
-            '../third_party/hunspell_new/hunspell.gyp:hunspell',
+            '../third_party/hunspell/hunspell.gyp:hunspell',
             'chrome_resources.gyp:packed_extra_resources',
             'chrome_resources.gyp:packed_resources',
             'tools/convert_dict/convert_dict.gyp:convert_dict_lib',

diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index e5857448..67561eb 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn

@@ -139,7 +139,7 @@
   if (enable_spellcheck) {
     sources +=
         rebase_path(gypi_values.chrome_renderer_spellchecker_sources, ".", "..")
-    deps += [ "//third_party/hunspell_new" ]
+    deps += [ "//third_party/hunspell" ]
   }
 
   if (enable_basic_printing || enable_print_preview) {

diff --git a/chrome/renderer/spellchecker/hunspell_engine.cc b/chrome/renderer/spellchecker/hunspell_engine.cc
index 37d47b84..b37f227 100644
--- a/chrome/renderer/spellchecker/hunspell_engine.cc
+++ b/chrome/renderer/spellchecker/hunspell_engine.cc

@@ -12,7 +12,7 @@
 #include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "content/public/renderer/render_thread.h"
-#include "third_party/hunspell_new/src/hunspell/hunspell.hxx"
+#include "third_party/hunspell/src/hunspell/hunspell.hxx"
 
 using content::RenderThread;
 

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 83e07bb9..30b05fb4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn

@@ -257,7 +257,7 @@
       "//sync",
       "//testing/gmock",
       "//testing/gtest",
-      "//third_party/hunspell_new",
+      "//third_party/hunspell",
       "//third_party/icu",
       "//third_party/libpng",
       "//third_party/npapi",
@@ -1300,7 +1300,7 @@
                       ".",
                       "//chrome")
       if (is_mac && !is_ios) {
-        deps += [ "//third_party/hunspell_new" ]
+        deps += [ "//third_party/hunspell" ]
       }
     }
 
@@ -1582,10 +1582,10 @@
     }
     if (!is_mac && !is_ios) {
       deps += [
-        "//third_party/hunspell_new",
+        "//chrome/tools/convert_dict:lib",
         "//chrome:packed_extra_resources",
         "//chrome:packed_resources",
-        "//chrome/tools/convert_dict:lib",
+        "//third_party/hunspell",
       ]
     }
     if (is_win || is_mac) {

diff --git a/chrome/tools/convert_dict/BUILD.gn b/chrome/tools/convert_dict/BUILD.gn
index 1c1c256..108eb19 100644
--- a/chrome/tools/convert_dict/BUILD.gn
+++ b/chrome/tools/convert_dict/BUILD.gn

@@ -32,6 +32,6 @@
     ":lib",
     "//base",
     "//base:i18n",
-    "//third_party/hunspell_new",
+    "//third_party/hunspell",
   ]
 }

diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 29e4a1e2..6566d910 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc

@@ -22,8 +22,8 @@
 #include "base/strings/string_util.h"
 #include "chrome/tools/convert_dict/aff_reader.h"
 #include "chrome/tools/convert_dict/dic_reader.h"
-#include "third_party/hunspell_new/google/bdict_reader.h"
-#include "third_party/hunspell_new/google/bdict_writer.h"
+#include "third_party/hunspell/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_writer.h"
 
 namespace {
 

diff --git a/chrome/tools/convert_dict/convert_dict.gyp b/chrome/tools/convert_dict/convert_dict.gyp
index dc1ef8e..dc6b5b1 100644
--- a/chrome/tools/convert_dict/convert_dict.gyp
+++ b/chrome/tools/convert_dict/convert_dict.gyp

@@ -35,7 +35,7 @@
       'dependencies': [
         '../../../base/base.gyp:base',
         '../../../base/base.gyp:base_i18n',
-        '../../../third_party/hunspell_new/hunspell.gyp:hunspell',
+        '../../../third_party/hunspell/hunspell.gyp:hunspell',
         'convert_dict_lib',
       ],
       'sources': [

diff --git a/chrome/tools/convert_dict/convert_dict_unittest.cc b/chrome/tools/convert_dict/convert_dict_unittest.cc
index 84b40a4..aa1cbd2 100644
--- a/chrome/tools/convert_dict/convert_dict_unittest.cc
+++ b/chrome/tools/convert_dict/convert_dict_unittest.cc

@@ -13,8 +13,8 @@
 #include "chrome/tools/convert_dict/aff_reader.h"
 #include "chrome/tools/convert_dict/dic_reader.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/hunspell_new/google/bdict_reader.h"
-#include "third_party/hunspell_new/google/bdict_writer.h"
+#include "third_party/hunspell/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_writer.h"
 
 namespace {
 

diff --git a/third_party/hunspell_new/BUILD.gn b/third_party/hunspell/BUILD.gn
similarity index 98%
rename from third_party/hunspell_new/BUILD.gn
rename to third_party/hunspell/BUILD.gn
index 4d5a955..80a27c80d 100644
--- a/third_party/hunspell_new/BUILD.gn
+++ b/third_party/hunspell/BUILD.gn

@@ -10,7 +10,7 @@
   ]
 }
 
-source_set("hunspell_new") {
+source_set("hunspell") {
   sources = [
     "google/bdict.cc",
     "google/bdict.h",

diff --git a/third_party/hunspell_new/COPYING b/third_party/hunspell/COPYING
similarity index 100%
rename from third_party/hunspell_new/COPYING
rename to third_party/hunspell/COPYING

diff --git a/third_party/hunspell_new/COPYING.LGPL b/third_party/hunspell/COPYING.LGPL
similarity index 100%
rename from third_party/hunspell_new/COPYING.LGPL
rename to third_party/hunspell/COPYING.LGPL

diff --git a/third_party/hunspell_new/COPYING.MPL b/third_party/hunspell/COPYING.MPL
similarity index 100%
rename from third_party/hunspell_new/COPYING.MPL
rename to third_party/hunspell/COPYING.MPL

diff --git a/third_party/hunspell_new/DEPS b/third_party/hunspell/DEPS
similarity index 100%
rename from third_party/hunspell_new/DEPS
rename to third_party/hunspell/DEPS

diff --git a/third_party/hunspell_new/README b/third_party/hunspell/README
similarity index 100%
rename from third_party/hunspell_new/README
rename to third_party/hunspell/README

diff --git a/third_party/hunspell_new/README.chromium b/third_party/hunspell/README.chromium
similarity index 100%
rename from third_party/hunspell_new/README.chromium
rename to third_party/hunspell/README.chromium

diff --git a/third_party/hunspell_new/README.myspell b/third_party/hunspell/README.myspell
similarity index 100%
rename from third_party/hunspell_new/README.myspell
rename to third_party/hunspell/README.myspell

diff --git a/third_party/hunspell_new/google.patch b/third_party/hunspell/google.patch
similarity index 100%
rename from third_party/hunspell_new/google.patch
rename to third_party/hunspell/google.patch

diff --git a/third_party/hunspell_new/google/DEPS b/third_party/hunspell/google/DEPS
similarity index 100%
rename from third_party/hunspell_new/google/DEPS
rename to third_party/hunspell/google/DEPS

diff --git a/third_party/hunspell_new/google/bdict.cc b/third_party/hunspell/google/bdict.cc
similarity index 96%
rename from third_party/hunspell_new/google/bdict.cc
rename to third_party/hunspell/google/bdict.cc
index 638bf06..3756f35 100644
--- a/third_party/hunspell_new/google/bdict.cc
+++ b/third_party/hunspell/google/bdict.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/hunspell_new/google/bdict.h"
+#include "third_party/hunspell/google/bdict.h"
 
 // static
 bool hunspell::BDict::Verify(const char* bdict_data, size_t bdict_length) {

diff --git a/third_party/hunspell_new/google/bdict.h b/third_party/hunspell/google/bdict.h
similarity index 100%
rename from third_party/hunspell_new/google/bdict.h
rename to third_party/hunspell/google/bdict.h

diff --git a/third_party/hunspell_new/google/bdict_reader.cc b/third_party/hunspell/google/bdict_reader.cc
similarity index 99%
rename from third_party/hunspell_new/google/bdict_reader.cc
rename to third_party/hunspell/google/bdict_reader.cc
index 2f15f08..ddd3c88 100644
--- a/third_party/hunspell_new/google/bdict_reader.cc
+++ b/third_party/hunspell/google/bdict_reader.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_reader.h"
 
 #include "base/logging.h"
 

diff --git a/third_party/hunspell_new/google/bdict_reader.h b/third_party/hunspell/google/bdict_reader.h
similarity index 98%
rename from third_party/hunspell_new/google/bdict_reader.h
rename to third_party/hunspell/google/bdict_reader.h
index d4cbbd0..997e6006 100644
--- a/third_party/hunspell_new/google/bdict_reader.h
+++ b/third_party/hunspell/google/bdict_reader.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "third_party/hunspell_new/google/bdict.h"
+#include "third_party/hunspell/google/bdict.h"
 
 namespace hunspell {
 

diff --git a/third_party/hunspell_new/google/bdict_writer.cc b/third_party/hunspell/google/bdict_writer.cc
similarity index 99%
rename from third_party/hunspell_new/google/bdict_writer.cc
rename to third_party/hunspell/google/bdict_writer.cc
index 838a71d..cd39f10 100644
--- a/third_party/hunspell_new/google/bdict_writer.cc
+++ b/third_party/hunspell/google/bdict_writer.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/hunspell_new/google/bdict_writer.h"
+#include "third_party/hunspell/google/bdict_writer.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "third_party/hunspell_new/google/bdict.h"
+#include "third_party/hunspell/google/bdict.h"
 
 namespace hunspell {
 

diff --git a/third_party/hunspell_new/google/bdict_writer.h b/third_party/hunspell/google/bdict_writer.h
similarity index 100%
rename from third_party/hunspell_new/google/bdict_writer.h
rename to third_party/hunspell/google/bdict_writer.h

diff --git a/third_party/hunspell_new/hunspell.gyp b/third_party/hunspell/hunspell.gyp
similarity index 100%
rename from third_party/hunspell_new/hunspell.gyp
rename to third_party/hunspell/hunspell.gyp

diff --git a/third_party/hunspell_new/hunspell.vsprops b/third_party/hunspell/hunspell.vsprops
similarity index 100%
rename from third_party/hunspell_new/hunspell.vsprops
rename to third_party/hunspell/hunspell.vsprops

diff --git a/third_party/hunspell_new/src/hunspell/Makefile.am b/third_party/hunspell/src/hunspell/Makefile.am
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/Makefile.am
rename to third_party/hunspell/src/hunspell/Makefile.am

diff --git a/third_party/hunspell_new/src/hunspell/Makefile.in b/third_party/hunspell/src/hunspell/Makefile.in
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/Makefile.in
rename to third_party/hunspell/src/hunspell/Makefile.in

diff --git a/third_party/hunspell_new/src/hunspell/README b/third_party/hunspell/src/hunspell/README
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/README
rename to third_party/hunspell/src/hunspell/README

diff --git a/third_party/hunspell_new/src/hunspell/affentry.cxx b/third_party/hunspell/src/hunspell/affentry.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/affentry.cxx
rename to third_party/hunspell/src/hunspell/affentry.cxx

diff --git a/third_party/hunspell_new/src/hunspell/affentry.hxx b/third_party/hunspell/src/hunspell/affentry.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/affentry.hxx
rename to third_party/hunspell/src/hunspell/affentry.hxx

diff --git a/third_party/hunspell_new/src/hunspell/affixmgr.cxx b/third_party/hunspell/src/hunspell/affixmgr.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/affixmgr.cxx
rename to third_party/hunspell/src/hunspell/affixmgr.cxx

diff --git a/third_party/hunspell_new/src/hunspell/affixmgr.hxx b/third_party/hunspell/src/hunspell/affixmgr.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/affixmgr.hxx
rename to third_party/hunspell/src/hunspell/affixmgr.hxx

diff --git a/third_party/hunspell_new/src/hunspell/atypes.hxx b/third_party/hunspell/src/hunspell/atypes.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/atypes.hxx
rename to third_party/hunspell/src/hunspell/atypes.hxx

diff --git a/third_party/hunspell_new/src/hunspell/baseaffix.hxx b/third_party/hunspell/src/hunspell/baseaffix.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/baseaffix.hxx
rename to third_party/hunspell/src/hunspell/baseaffix.hxx

diff --git a/third_party/hunspell_new/src/hunspell/csutil.cxx b/third_party/hunspell/src/hunspell/csutil.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/csutil.cxx
rename to third_party/hunspell/src/hunspell/csutil.cxx

diff --git a/third_party/hunspell_new/src/hunspell/csutil.hxx b/third_party/hunspell/src/hunspell/csutil.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/csutil.hxx
rename to third_party/hunspell/src/hunspell/csutil.hxx

diff --git a/third_party/hunspell_new/src/hunspell/dictmgr.cxx b/third_party/hunspell/src/hunspell/dictmgr.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/dictmgr.cxx
rename to third_party/hunspell/src/hunspell/dictmgr.cxx

diff --git a/third_party/hunspell_new/src/hunspell/dictmgr.hxx b/third_party/hunspell/src/hunspell/dictmgr.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/dictmgr.hxx
rename to third_party/hunspell/src/hunspell/dictmgr.hxx

diff --git a/third_party/hunspell_new/src/hunspell/filemgr.cxx b/third_party/hunspell/src/hunspell/filemgr.cxx
similarity index 96%
rename from third_party/hunspell_new/src/hunspell/filemgr.cxx
rename to third_party/hunspell/src/hunspell/filemgr.cxx
index 16217c5..05fc307 100644
--- a/third_party/hunspell_new/src/hunspell/filemgr.cxx
+++ b/third_party/hunspell/src/hunspell/filemgr.cxx

@@ -8,7 +8,7 @@
 #include "filemgr.hxx"
 
 #ifdef HUNSPELL_CHROME_CLIENT
-#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_reader.h"
 
 FileMgr::FileMgr(hunspell::LineIterator* iterator) : iterator_(iterator) {
 }

diff --git a/third_party/hunspell_new/src/hunspell/filemgr.hxx b/third_party/hunspell/src/hunspell/filemgr.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/filemgr.hxx
rename to third_party/hunspell/src/hunspell/filemgr.hxx

diff --git a/third_party/hunspell_new/src/hunspell/hashmgr.cxx b/third_party/hunspell/src/hunspell/hashmgr.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hashmgr.cxx
rename to third_party/hunspell/src/hunspell/hashmgr.cxx

diff --git a/third_party/hunspell_new/src/hunspell/hashmgr.hxx b/third_party/hunspell/src/hunspell/hashmgr.hxx
similarity index 98%
rename from third_party/hunspell_new/src/hunspell/hashmgr.hxx
rename to third_party/hunspell/src/hunspell/hashmgr.hxx
index 8ac226a..ea581ae4 100644
--- a/third_party/hunspell_new/src/hunspell/hashmgr.hxx
+++ b/third_party/hunspell/src/hunspell/hashmgr.hxx

@@ -14,7 +14,7 @@
 
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
-#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_reader.h"
 #endif
 
 enum flag { FLAG_CHAR, FLAG_LONG, FLAG_NUM, FLAG_UNI };

diff --git a/third_party/hunspell_new/src/hunspell/htypes.hxx b/third_party/hunspell/src/hunspell/htypes.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/htypes.hxx
rename to third_party/hunspell/src/hunspell/htypes.hxx

diff --git a/third_party/hunspell_new/src/hunspell/hunspell.cxx b/third_party/hunspell/src/hunspell/hunspell.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunspell.cxx
rename to third_party/hunspell/src/hunspell/hunspell.cxx

diff --git a/third_party/hunspell_new/src/hunspell/hunspell.dsp b/third_party/hunspell/src/hunspell/hunspell.dsp
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunspell.dsp
rename to third_party/hunspell/src/hunspell/hunspell.dsp

diff --git a/third_party/hunspell_new/src/hunspell/hunspell.h b/third_party/hunspell/src/hunspell/hunspell.h
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunspell.h
rename to third_party/hunspell/src/hunspell/hunspell.h

diff --git a/third_party/hunspell_new/src/hunspell/hunspell.hxx b/third_party/hunspell/src/hunspell/hunspell.hxx
similarity index 98%
rename from third_party/hunspell_new/src/hunspell/hunspell.hxx
rename to third_party/hunspell/src/hunspell/hunspell.hxx
index e0393c0..a6c367bb 100644
--- a/third_party/hunspell_new/src/hunspell/hunspell.hxx
+++ b/third_party/hunspell/src/hunspell/hunspell.hxx

@@ -6,7 +6,7 @@
 #include "langnum.hxx"
 
 #ifdef HUNSPELL_CHROME_CLIENT
-#include "third_party/hunspell_new/google/bdict_reader.h"
+#include "third_party/hunspell/google/bdict_reader.h"
 #endif
 
 #define  SPELL_XML "<?xml?>"

diff --git a/third_party/hunspell_new/src/hunspell/hunvisapi.h b/third_party/hunspell/src/hunspell/hunvisapi.h
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunvisapi.h
rename to third_party/hunspell/src/hunspell/hunvisapi.h

diff --git a/third_party/hunspell_new/src/hunspell/hunvisapi.h.in b/third_party/hunspell/src/hunspell/hunvisapi.h.in
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunvisapi.h.in
rename to third_party/hunspell/src/hunspell/hunvisapi.h.in

diff --git a/third_party/hunspell_new/src/hunspell/hunzip.cxx b/third_party/hunspell/src/hunspell/hunzip.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunzip.cxx
rename to third_party/hunspell/src/hunspell/hunzip.cxx

diff --git a/third_party/hunspell_new/src/hunspell/hunzip.hxx b/third_party/hunspell/src/hunspell/hunzip.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/hunzip.hxx
rename to third_party/hunspell/src/hunspell/hunzip.hxx

diff --git a/third_party/hunspell_new/src/hunspell/langnum.hxx b/third_party/hunspell/src/hunspell/langnum.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/langnum.hxx
rename to third_party/hunspell/src/hunspell/langnum.hxx

diff --git a/third_party/hunspell_new/src/hunspell/license.hunspell b/third_party/hunspell/src/hunspell/license.hunspell
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/license.hunspell
rename to third_party/hunspell/src/hunspell/license.hunspell

diff --git a/third_party/hunspell_new/src/hunspell/license.myspell b/third_party/hunspell/src/hunspell/license.myspell
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/license.myspell
rename to third_party/hunspell/src/hunspell/license.myspell

diff --git a/third_party/hunspell_new/src/hunspell/phonet.cxx b/third_party/hunspell/src/hunspell/phonet.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/phonet.cxx
rename to third_party/hunspell/src/hunspell/phonet.cxx

diff --git a/third_party/hunspell_new/src/hunspell/phonet.hxx b/third_party/hunspell/src/hunspell/phonet.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/phonet.hxx
rename to third_party/hunspell/src/hunspell/phonet.hxx

diff --git a/third_party/hunspell_new/src/hunspell/replist.cxx b/third_party/hunspell/src/hunspell/replist.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/replist.cxx
rename to third_party/hunspell/src/hunspell/replist.cxx

diff --git a/third_party/hunspell_new/src/hunspell/replist.hxx b/third_party/hunspell/src/hunspell/replist.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/replist.hxx
rename to third_party/hunspell/src/hunspell/replist.hxx

diff --git a/third_party/hunspell_new/src/hunspell/suggestmgr.cxx b/third_party/hunspell/src/hunspell/suggestmgr.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/suggestmgr.cxx
rename to third_party/hunspell/src/hunspell/suggestmgr.cxx

diff --git a/third_party/hunspell_new/src/hunspell/suggestmgr.hxx b/third_party/hunspell/src/hunspell/suggestmgr.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/suggestmgr.hxx
rename to third_party/hunspell/src/hunspell/suggestmgr.hxx

diff --git a/third_party/hunspell_new/src/hunspell/utf_info.cxx b/third_party/hunspell/src/hunspell/utf_info.cxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/utf_info.cxx
rename to third_party/hunspell/src/hunspell/utf_info.cxx

diff --git a/third_party/hunspell_new/src/hunspell/utf_info.hxx b/third_party/hunspell/src/hunspell/utf_info.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/utf_info.hxx
rename to third_party/hunspell/src/hunspell/utf_info.hxx

diff --git a/third_party/hunspell_new/src/hunspell/w_char.hxx b/third_party/hunspell/src/hunspell/w_char.hxx
similarity index 100%
rename from third_party/hunspell_new/src/hunspell/w_char.hxx
rename to third_party/hunspell/src/hunspell/w_char.hxx

diff --git a/third_party/hunspell_new/src/parsers/Makefile.am b/third_party/hunspell/src/parsers/Makefile.am
similarity index 100%
rename from third_party/hunspell_new/src/parsers/Makefile.am
rename to third_party/hunspell/src/parsers/Makefile.am

diff --git a/third_party/hunspell_new/src/parsers/Makefile.in b/third_party/hunspell/src/parsers/Makefile.in
similarity index 100%
rename from third_party/hunspell_new/src/parsers/Makefile.in
rename to third_party/hunspell/src/parsers/Makefile.in

diff --git a/third_party/hunspell_new/src/parsers/firstparser.cxx b/third_party/hunspell/src/parsers/firstparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/firstparser.cxx
rename to third_party/hunspell/src/parsers/firstparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/firstparser.hxx b/third_party/hunspell/src/parsers/firstparser.hxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/firstparser.hxx
rename to third_party/hunspell/src/parsers/firstparser.hxx

diff --git a/third_party/hunspell_new/src/parsers/htmlparser.cxx b/third_party/hunspell/src/parsers/htmlparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/htmlparser.cxx
rename to third_party/hunspell/src/parsers/htmlparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/htmlparser.hxx b/third_party/hunspell/src/parsers/htmlparser.hxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/htmlparser.hxx
rename to third_party/hunspell/src/parsers/htmlparser.hxx

diff --git a/third_party/hunspell_new/src/parsers/latexparser.cxx b/third_party/hunspell/src/parsers/latexparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/latexparser.cxx
rename to third_party/hunspell/src/parsers/latexparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/latexparser.hxx b/third_party/hunspell/src/parsers/latexparser.hxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/latexparser.hxx
rename to third_party/hunspell/src/parsers/latexparser.hxx

diff --git a/third_party/hunspell_new/src/parsers/manparser.cxx b/third_party/hunspell/src/parsers/manparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/manparser.cxx
rename to third_party/hunspell/src/parsers/manparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/manparser.hxx b/third_party/hunspell/src/parsers/manparser.hxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/manparser.hxx
rename to third_party/hunspell/src/parsers/manparser.hxx

diff --git a/third_party/hunspell_new/src/parsers/testparser.cxx b/third_party/hunspell/src/parsers/testparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/testparser.cxx
rename to third_party/hunspell/src/parsers/testparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/textparser.cxx b/third_party/hunspell/src/parsers/textparser.cxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/textparser.cxx
rename to third_party/hunspell/src/parsers/textparser.cxx

diff --git a/third_party/hunspell_new/src/parsers/textparser.hxx b/third_party/hunspell/src/parsers/textparser.hxx
similarity index 100%
rename from third_party/hunspell_new/src/parsers/textparser.hxx
rename to third_party/hunspell/src/parsers/textparser.hxx

diff --git a/third_party/hunspell_new/tests/1463589.aff b/third_party/hunspell/tests/1463589.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1463589.aff
rename to third_party/hunspell/tests/1463589.aff

diff --git a/third_party/hunspell_new/tests/1463589.dic b/third_party/hunspell/tests/1463589.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1463589.dic
rename to third_party/hunspell/tests/1463589.dic

diff --git a/third_party/hunspell_new/tests/1463589.sug b/third_party/hunspell/tests/1463589.sug
similarity index 100%
rename from third_party/hunspell_new/tests/1463589.sug
rename to third_party/hunspell/tests/1463589.sug

diff --git a/third_party/hunspell_new/tests/1463589.test b/third_party/hunspell/tests/1463589.test
similarity index 100%
rename from third_party/hunspell_new/tests/1463589.test
rename to third_party/hunspell/tests/1463589.test

diff --git a/third_party/hunspell_new/tests/1463589.wrong b/third_party/hunspell/tests/1463589.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/1463589.wrong
rename to third_party/hunspell/tests/1463589.wrong

diff --git a/third_party/hunspell_new/tests/1463589_utf.aff b/third_party/hunspell/tests/1463589_utf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1463589_utf.aff
rename to third_party/hunspell/tests/1463589_utf.aff

diff --git a/third_party/hunspell_new/tests/1463589_utf.dic b/third_party/hunspell/tests/1463589_utf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1463589_utf.dic
rename to third_party/hunspell/tests/1463589_utf.dic

diff --git a/third_party/hunspell_new/tests/1463589_utf.sug b/third_party/hunspell/tests/1463589_utf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/1463589_utf.sug
rename to third_party/hunspell/tests/1463589_utf.sug

diff --git a/third_party/hunspell_new/tests/1463589_utf.test b/third_party/hunspell/tests/1463589_utf.test
similarity index 100%
rename from third_party/hunspell_new/tests/1463589_utf.test
rename to third_party/hunspell/tests/1463589_utf.test

diff --git a/third_party/hunspell_new/tests/1463589_utf.wrong b/third_party/hunspell/tests/1463589_utf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/1463589_utf.wrong
rename to third_party/hunspell/tests/1463589_utf.wrong

diff --git a/third_party/hunspell_new/tests/1592880.aff b/third_party/hunspell/tests/1592880.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1592880.aff
rename to third_party/hunspell/tests/1592880.aff

diff --git a/third_party/hunspell_new/tests/1592880.dic b/third_party/hunspell/tests/1592880.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1592880.dic
rename to third_party/hunspell/tests/1592880.dic

diff --git a/third_party/hunspell_new/tests/1592880.good b/third_party/hunspell/tests/1592880.good
similarity index 100%
rename from third_party/hunspell_new/tests/1592880.good
rename to third_party/hunspell/tests/1592880.good

diff --git a/third_party/hunspell_new/tests/1592880.test b/third_party/hunspell/tests/1592880.test
similarity index 100%
rename from third_party/hunspell_new/tests/1592880.test
rename to third_party/hunspell/tests/1592880.test

diff --git a/third_party/hunspell_new/tests/1695964.aff b/third_party/hunspell/tests/1695964.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1695964.aff
rename to third_party/hunspell/tests/1695964.aff

diff --git a/third_party/hunspell_new/tests/1695964.dic b/third_party/hunspell/tests/1695964.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1695964.dic
rename to third_party/hunspell/tests/1695964.dic

diff --git a/third_party/hunspell_new/tests/1695964.sug b/third_party/hunspell/tests/1695964.sug
similarity index 100%
rename from third_party/hunspell_new/tests/1695964.sug
rename to third_party/hunspell/tests/1695964.sug

diff --git a/third_party/hunspell_new/tests/1695964.test b/third_party/hunspell/tests/1695964.test
similarity index 100%
rename from third_party/hunspell_new/tests/1695964.test
rename to third_party/hunspell/tests/1695964.test

diff --git a/third_party/hunspell_new/tests/1695964.wrong b/third_party/hunspell/tests/1695964.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/1695964.wrong
rename to third_party/hunspell/tests/1695964.wrong

diff --git a/third_party/hunspell_new/tests/1706659.aff b/third_party/hunspell/tests/1706659.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1706659.aff
rename to third_party/hunspell/tests/1706659.aff

diff --git a/third_party/hunspell_new/tests/1706659.dic b/third_party/hunspell/tests/1706659.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1706659.dic
rename to third_party/hunspell/tests/1706659.dic

diff --git a/third_party/hunspell_new/tests/1706659.test b/third_party/hunspell/tests/1706659.test
similarity index 100%
rename from third_party/hunspell_new/tests/1706659.test
rename to third_party/hunspell/tests/1706659.test

diff --git a/third_party/hunspell_new/tests/1706659.wrong b/third_party/hunspell/tests/1706659.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/1706659.wrong
rename to third_party/hunspell/tests/1706659.wrong

diff --git a/third_party/hunspell_new/tests/1975530.aff b/third_party/hunspell/tests/1975530.aff
similarity index 100%
rename from third_party/hunspell_new/tests/1975530.aff
rename to third_party/hunspell/tests/1975530.aff

diff --git a/third_party/hunspell_new/tests/1975530.dic b/third_party/hunspell/tests/1975530.dic
similarity index 100%
rename from third_party/hunspell_new/tests/1975530.dic
rename to third_party/hunspell/tests/1975530.dic

diff --git a/third_party/hunspell_new/tests/1975530.good b/third_party/hunspell/tests/1975530.good
similarity index 100%
rename from third_party/hunspell_new/tests/1975530.good
rename to third_party/hunspell/tests/1975530.good

diff --git a/third_party/hunspell_new/tests/1975530.test b/third_party/hunspell/tests/1975530.test
similarity index 100%
rename from third_party/hunspell_new/tests/1975530.test
rename to third_party/hunspell/tests/1975530.test

diff --git a/third_party/hunspell_new/tests/1975530.wrong b/third_party/hunspell/tests/1975530.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/1975530.wrong
rename to third_party/hunspell/tests/1975530.wrong

diff --git a/third_party/hunspell_new/tests/IJ.aff b/third_party/hunspell/tests/IJ.aff
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.aff
rename to third_party/hunspell/tests/IJ.aff

diff --git a/third_party/hunspell_new/tests/IJ.dic b/third_party/hunspell/tests/IJ.dic
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.dic
rename to third_party/hunspell/tests/IJ.dic

diff --git a/third_party/hunspell_new/tests/IJ.good b/third_party/hunspell/tests/IJ.good
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.good
rename to third_party/hunspell/tests/IJ.good

diff --git a/third_party/hunspell_new/tests/IJ.sug b/third_party/hunspell/tests/IJ.sug
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.sug
rename to third_party/hunspell/tests/IJ.sug

diff --git a/third_party/hunspell_new/tests/IJ.test b/third_party/hunspell/tests/IJ.test
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.test
rename to third_party/hunspell/tests/IJ.test

diff --git a/third_party/hunspell_new/tests/IJ.wrong b/third_party/hunspell/tests/IJ.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/IJ.wrong
rename to third_party/hunspell/tests/IJ.wrong

diff --git a/third_party/hunspell_new/tests/Makefile.am b/third_party/hunspell/tests/Makefile.am
similarity index 100%
rename from third_party/hunspell_new/tests/Makefile.am
rename to third_party/hunspell/tests/Makefile.am

diff --git a/third_party/hunspell_new/tests/Makefile.in b/third_party/hunspell/tests/Makefile.in
similarity index 100%
rename from third_party/hunspell_new/tests/Makefile.in
rename to third_party/hunspell/tests/Makefile.in

diff --git a/third_party/hunspell_new/tests/affixes.aff b/third_party/hunspell/tests/affixes.aff
similarity index 100%
rename from third_party/hunspell_new/tests/affixes.aff
rename to third_party/hunspell/tests/affixes.aff

diff --git a/third_party/hunspell_new/tests/affixes.dic b/third_party/hunspell/tests/affixes.dic
similarity index 100%
rename from third_party/hunspell_new/tests/affixes.dic
rename to third_party/hunspell/tests/affixes.dic

diff --git a/third_party/hunspell_new/tests/affixes.good b/third_party/hunspell/tests/affixes.good
similarity index 100%
rename from third_party/hunspell_new/tests/affixes.good
rename to third_party/hunspell/tests/affixes.good

diff --git a/third_party/hunspell_new/tests/affixes.test b/third_party/hunspell/tests/affixes.test
similarity index 100%
rename from third_party/hunspell_new/tests/affixes.test
rename to third_party/hunspell/tests/affixes.test

diff --git a/third_party/hunspell_new/tests/alias.aff b/third_party/hunspell/tests/alias.aff
similarity index 100%
rename from third_party/hunspell_new/tests/alias.aff
rename to third_party/hunspell/tests/alias.aff

diff --git a/third_party/hunspell_new/tests/alias.dic b/third_party/hunspell/tests/alias.dic
similarity index 100%
rename from third_party/hunspell_new/tests/alias.dic
rename to third_party/hunspell/tests/alias.dic

diff --git a/third_party/hunspell_new/tests/alias.good b/third_party/hunspell/tests/alias.good
similarity index 100%
rename from third_party/hunspell_new/tests/alias.good
rename to third_party/hunspell/tests/alias.good

diff --git a/third_party/hunspell_new/tests/alias.test b/third_party/hunspell/tests/alias.test
similarity index 100%
rename from third_party/hunspell_new/tests/alias.test
rename to third_party/hunspell/tests/alias.test

diff --git a/third_party/hunspell_new/tests/alias2.aff b/third_party/hunspell/tests/alias2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/alias2.aff
rename to third_party/hunspell/tests/alias2.aff

diff --git a/third_party/hunspell_new/tests/alias2.dic b/third_party/hunspell/tests/alias2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/alias2.dic
rename to third_party/hunspell/tests/alias2.dic

diff --git a/third_party/hunspell_new/tests/alias2.good b/third_party/hunspell/tests/alias2.good
similarity index 100%
rename from third_party/hunspell_new/tests/alias2.good
rename to third_party/hunspell/tests/alias2.good

diff --git a/third_party/hunspell_new/tests/alias2.morph b/third_party/hunspell/tests/alias2.morph
similarity index 100%
rename from third_party/hunspell_new/tests/alias2.morph
rename to third_party/hunspell/tests/alias2.morph

diff --git a/third_party/hunspell_new/tests/alias2.test b/third_party/hunspell/tests/alias2.test
similarity index 100%
rename from third_party/hunspell_new/tests/alias2.test
rename to third_party/hunspell/tests/alias2.test

diff --git a/third_party/hunspell_new/tests/alias3.aff b/third_party/hunspell/tests/alias3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/alias3.aff
rename to third_party/hunspell/tests/alias3.aff

diff --git a/third_party/hunspell_new/tests/alias3.dic b/third_party/hunspell/tests/alias3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/alias3.dic
rename to third_party/hunspell/tests/alias3.dic

diff --git a/third_party/hunspell_new/tests/alias3.good b/third_party/hunspell/tests/alias3.good
similarity index 100%
rename from third_party/hunspell_new/tests/alias3.good
rename to third_party/hunspell/tests/alias3.good

diff --git a/third_party/hunspell_new/tests/alias3.morph b/third_party/hunspell/tests/alias3.morph
similarity index 100%
rename from third_party/hunspell_new/tests/alias3.morph
rename to third_party/hunspell/tests/alias3.morph

diff --git a/third_party/hunspell_new/tests/alias3.test b/third_party/hunspell/tests/alias3.test
similarity index 100%
rename from third_party/hunspell_new/tests/alias3.test
rename to third_party/hunspell/tests/alias3.test

diff --git a/third_party/hunspell_new/tests/allcaps.aff b/third_party/hunspell/tests/allcaps.aff
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.aff
rename to third_party/hunspell/tests/allcaps.aff

diff --git a/third_party/hunspell_new/tests/allcaps.dic b/third_party/hunspell/tests/allcaps.dic
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.dic
rename to third_party/hunspell/tests/allcaps.dic

diff --git a/third_party/hunspell_new/tests/allcaps.good b/third_party/hunspell/tests/allcaps.good
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.good
rename to third_party/hunspell/tests/allcaps.good

diff --git a/third_party/hunspell_new/tests/allcaps.sug b/third_party/hunspell/tests/allcaps.sug
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.sug
rename to third_party/hunspell/tests/allcaps.sug

diff --git a/third_party/hunspell_new/tests/allcaps.test b/third_party/hunspell/tests/allcaps.test
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.test
rename to third_party/hunspell/tests/allcaps.test

diff --git a/third_party/hunspell_new/tests/allcaps.wrong b/third_party/hunspell/tests/allcaps.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps.wrong
rename to third_party/hunspell/tests/allcaps.wrong

diff --git a/third_party/hunspell_new/tests/allcaps2.aff b/third_party/hunspell/tests/allcaps2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.aff
rename to third_party/hunspell/tests/allcaps2.aff

diff --git a/third_party/hunspell_new/tests/allcaps2.dic b/third_party/hunspell/tests/allcaps2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.dic
rename to third_party/hunspell/tests/allcaps2.dic

diff --git a/third_party/hunspell_new/tests/allcaps2.good b/third_party/hunspell/tests/allcaps2.good
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.good
rename to third_party/hunspell/tests/allcaps2.good

diff --git a/third_party/hunspell_new/tests/allcaps2.sug b/third_party/hunspell/tests/allcaps2.sug
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.sug
rename to third_party/hunspell/tests/allcaps2.sug

diff --git a/third_party/hunspell_new/tests/allcaps2.test b/third_party/hunspell/tests/allcaps2.test
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.test
rename to third_party/hunspell/tests/allcaps2.test

diff --git a/third_party/hunspell_new/tests/allcaps2.wrong b/third_party/hunspell/tests/allcaps2.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps2.wrong
rename to third_party/hunspell/tests/allcaps2.wrong

diff --git a/third_party/hunspell_new/tests/allcaps3.aff b/third_party/hunspell/tests/allcaps3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps3.aff
rename to third_party/hunspell/tests/allcaps3.aff

diff --git a/third_party/hunspell_new/tests/allcaps3.dic b/third_party/hunspell/tests/allcaps3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps3.dic
rename to third_party/hunspell/tests/allcaps3.dic

diff --git a/third_party/hunspell_new/tests/allcaps3.good b/third_party/hunspell/tests/allcaps3.good
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps3.good
rename to third_party/hunspell/tests/allcaps3.good

diff --git a/third_party/hunspell_new/tests/allcaps3.test b/third_party/hunspell/tests/allcaps3.test
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps3.test
rename to third_party/hunspell/tests/allcaps3.test

diff --git a/third_party/hunspell_new/tests/allcaps3.wrong b/third_party/hunspell/tests/allcaps3.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps3.wrong
rename to third_party/hunspell/tests/allcaps3.wrong

diff --git a/third_party/hunspell_new/tests/allcaps_utf.aff b/third_party/hunspell/tests/allcaps_utf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.aff
rename to third_party/hunspell/tests/allcaps_utf.aff

diff --git a/third_party/hunspell_new/tests/allcaps_utf.dic b/third_party/hunspell/tests/allcaps_utf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.dic
rename to third_party/hunspell/tests/allcaps_utf.dic

diff --git a/third_party/hunspell_new/tests/allcaps_utf.good b/third_party/hunspell/tests/allcaps_utf.good
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.good
rename to third_party/hunspell/tests/allcaps_utf.good

diff --git a/third_party/hunspell_new/tests/allcaps_utf.sug b/third_party/hunspell/tests/allcaps_utf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.sug
rename to third_party/hunspell/tests/allcaps_utf.sug

diff --git a/third_party/hunspell_new/tests/allcaps_utf.test b/third_party/hunspell/tests/allcaps_utf.test
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.test
rename to third_party/hunspell/tests/allcaps_utf.test

diff --git a/third_party/hunspell_new/tests/allcaps_utf.wrong b/third_party/hunspell/tests/allcaps_utf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/allcaps_utf.wrong
rename to third_party/hunspell/tests/allcaps_utf.wrong

diff --git a/third_party/hunspell_new/tests/base.aff b/third_party/hunspell/tests/base.aff
similarity index 100%
rename from third_party/hunspell_new/tests/base.aff
rename to third_party/hunspell/tests/base.aff

diff --git a/third_party/hunspell_new/tests/base.dic b/third_party/hunspell/tests/base.dic
similarity index 100%
rename from third_party/hunspell_new/tests/base.dic
rename to third_party/hunspell/tests/base.dic

diff --git a/third_party/hunspell_new/tests/base.good b/third_party/hunspell/tests/base.good
similarity index 100%
rename from third_party/hunspell_new/tests/base.good
rename to third_party/hunspell/tests/base.good

diff --git a/third_party/hunspell_new/tests/base.sug b/third_party/hunspell/tests/base.sug
similarity index 100%
rename from third_party/hunspell_new/tests/base.sug
rename to third_party/hunspell/tests/base.sug

diff --git a/third_party/hunspell_new/tests/base.test b/third_party/hunspell/tests/base.test
similarity index 100%
rename from third_party/hunspell_new/tests/base.test
rename to third_party/hunspell/tests/base.test

diff --git a/third_party/hunspell_new/tests/base.wrong b/third_party/hunspell/tests/base.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/base.wrong
rename to third_party/hunspell/tests/base.wrong

diff --git a/third_party/hunspell_new/tests/base_utf.aff b/third_party/hunspell/tests/base_utf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.aff
rename to third_party/hunspell/tests/base_utf.aff

diff --git a/third_party/hunspell_new/tests/base_utf.dic b/third_party/hunspell/tests/base_utf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.dic
rename to third_party/hunspell/tests/base_utf.dic

diff --git a/third_party/hunspell_new/tests/base_utf.good b/third_party/hunspell/tests/base_utf.good
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.good
rename to third_party/hunspell/tests/base_utf.good

diff --git a/third_party/hunspell_new/tests/base_utf.sug b/third_party/hunspell/tests/base_utf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.sug
rename to third_party/hunspell/tests/base_utf.sug

diff --git a/third_party/hunspell_new/tests/base_utf.test b/third_party/hunspell/tests/base_utf.test
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.test
rename to third_party/hunspell/tests/base_utf.test

diff --git a/third_party/hunspell_new/tests/base_utf.wrong b/third_party/hunspell/tests/base_utf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/base_utf.wrong
rename to third_party/hunspell/tests/base_utf.wrong

diff --git a/third_party/hunspell_new/tests/break.aff b/third_party/hunspell/tests/break.aff
similarity index 100%
rename from third_party/hunspell_new/tests/break.aff
rename to third_party/hunspell/tests/break.aff

diff --git a/third_party/hunspell_new/tests/break.dic b/third_party/hunspell/tests/break.dic
similarity index 100%
rename from third_party/hunspell_new/tests/break.dic
rename to third_party/hunspell/tests/break.dic

diff --git a/third_party/hunspell_new/tests/break.good b/third_party/hunspell/tests/break.good
similarity index 100%
rename from third_party/hunspell_new/tests/break.good
rename to third_party/hunspell/tests/break.good

diff --git a/third_party/hunspell_new/tests/break.test b/third_party/hunspell/tests/break.test
similarity index 100%
rename from third_party/hunspell_new/tests/break.test
rename to third_party/hunspell/tests/break.test

diff --git a/third_party/hunspell_new/tests/break.wrong b/third_party/hunspell/tests/break.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/break.wrong
rename to third_party/hunspell/tests/break.wrong

diff --git a/third_party/hunspell_new/tests/breakdefault.aff b/third_party/hunspell/tests/breakdefault.aff
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.aff
rename to third_party/hunspell/tests/breakdefault.aff

diff --git a/third_party/hunspell_new/tests/breakdefault.dic b/third_party/hunspell/tests/breakdefault.dic
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.dic
rename to third_party/hunspell/tests/breakdefault.dic

diff --git a/third_party/hunspell_new/tests/breakdefault.good b/third_party/hunspell/tests/breakdefault.good
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.good
rename to third_party/hunspell/tests/breakdefault.good

diff --git a/third_party/hunspell_new/tests/breakdefault.sug b/third_party/hunspell/tests/breakdefault.sug
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.sug
rename to third_party/hunspell/tests/breakdefault.sug

diff --git a/third_party/hunspell_new/tests/breakdefault.test b/third_party/hunspell/tests/breakdefault.test
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.test
rename to third_party/hunspell/tests/breakdefault.test

diff --git a/third_party/hunspell_new/tests/breakdefault.wrong b/third_party/hunspell/tests/breakdefault.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/breakdefault.wrong
rename to third_party/hunspell/tests/breakdefault.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundcase.aff b/third_party/hunspell/tests/checkcompoundcase.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase.aff
rename to third_party/hunspell/tests/checkcompoundcase.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundcase.dic b/third_party/hunspell/tests/checkcompoundcase.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase.dic
rename to third_party/hunspell/tests/checkcompoundcase.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundcase.good b/third_party/hunspell/tests/checkcompoundcase.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase.good
rename to third_party/hunspell/tests/checkcompoundcase.good

diff --git a/third_party/hunspell_new/tests/checkcompoundcase.test b/third_party/hunspell/tests/checkcompoundcase.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase.test
rename to third_party/hunspell/tests/checkcompoundcase.test

diff --git a/third_party/hunspell_new/tests/checkcompoundcase.wrong b/third_party/hunspell/tests/checkcompoundcase.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase.wrong
rename to third_party/hunspell/tests/checkcompoundcase.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundcase2.aff b/third_party/hunspell/tests/checkcompoundcase2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase2.aff
rename to third_party/hunspell/tests/checkcompoundcase2.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundcase2.dic b/third_party/hunspell/tests/checkcompoundcase2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase2.dic
rename to third_party/hunspell/tests/checkcompoundcase2.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundcase2.good b/third_party/hunspell/tests/checkcompoundcase2.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase2.good
rename to third_party/hunspell/tests/checkcompoundcase2.good

diff --git a/third_party/hunspell_new/tests/checkcompoundcase2.test b/third_party/hunspell/tests/checkcompoundcase2.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase2.test
rename to third_party/hunspell/tests/checkcompoundcase2.test

diff --git a/third_party/hunspell_new/tests/checkcompoundcase2.wrong b/third_party/hunspell/tests/checkcompoundcase2.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcase2.wrong
rename to third_party/hunspell/tests/checkcompoundcase2.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundcaseutf.aff b/third_party/hunspell/tests/checkcompoundcaseutf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcaseutf.aff
rename to third_party/hunspell/tests/checkcompoundcaseutf.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundcaseutf.dic b/third_party/hunspell/tests/checkcompoundcaseutf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcaseutf.dic
rename to third_party/hunspell/tests/checkcompoundcaseutf.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundcaseutf.good b/third_party/hunspell/tests/checkcompoundcaseutf.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcaseutf.good
rename to third_party/hunspell/tests/checkcompoundcaseutf.good

diff --git a/third_party/hunspell_new/tests/checkcompoundcaseutf.test b/third_party/hunspell/tests/checkcompoundcaseutf.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcaseutf.test
rename to third_party/hunspell/tests/checkcompoundcaseutf.test

diff --git a/third_party/hunspell_new/tests/checkcompoundcaseutf.wrong b/third_party/hunspell/tests/checkcompoundcaseutf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundcaseutf.wrong
rename to third_party/hunspell/tests/checkcompoundcaseutf.wrong

diff --git a/third_party/hunspell_new/tests/checkcompounddup.aff b/third_party/hunspell/tests/checkcompounddup.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompounddup.aff
rename to third_party/hunspell/tests/checkcompounddup.aff

diff --git a/third_party/hunspell_new/tests/checkcompounddup.dic b/third_party/hunspell/tests/checkcompounddup.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompounddup.dic
rename to third_party/hunspell/tests/checkcompounddup.dic

diff --git a/third_party/hunspell_new/tests/checkcompounddup.good b/third_party/hunspell/tests/checkcompounddup.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompounddup.good
rename to third_party/hunspell/tests/checkcompounddup.good

diff --git a/third_party/hunspell_new/tests/checkcompounddup.test b/third_party/hunspell/tests/checkcompounddup.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompounddup.test
rename to third_party/hunspell/tests/checkcompounddup.test

diff --git a/third_party/hunspell_new/tests/checkcompounddup.wrong b/third_party/hunspell/tests/checkcompounddup.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompounddup.wrong
rename to third_party/hunspell/tests/checkcompounddup.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern.aff b/third_party/hunspell/tests/checkcompoundpattern.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern.aff
rename to third_party/hunspell/tests/checkcompoundpattern.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern.dic b/third_party/hunspell/tests/checkcompoundpattern.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern.dic
rename to third_party/hunspell/tests/checkcompoundpattern.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern.good b/third_party/hunspell/tests/checkcompoundpattern.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern.good
rename to third_party/hunspell/tests/checkcompoundpattern.good

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern.test b/third_party/hunspell/tests/checkcompoundpattern.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern.test
rename to third_party/hunspell/tests/checkcompoundpattern.test

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern.wrong b/third_party/hunspell/tests/checkcompoundpattern.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern.wrong
rename to third_party/hunspell/tests/checkcompoundpattern.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern2.aff b/third_party/hunspell/tests/checkcompoundpattern2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern2.aff
rename to third_party/hunspell/tests/checkcompoundpattern2.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern2.dic b/third_party/hunspell/tests/checkcompoundpattern2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern2.dic
rename to third_party/hunspell/tests/checkcompoundpattern2.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern2.good b/third_party/hunspell/tests/checkcompoundpattern2.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern2.good
rename to third_party/hunspell/tests/checkcompoundpattern2.good

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern2.test b/third_party/hunspell/tests/checkcompoundpattern2.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern2.test
rename to third_party/hunspell/tests/checkcompoundpattern2.test

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern2.wrong b/third_party/hunspell/tests/checkcompoundpattern2.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern2.wrong
rename to third_party/hunspell/tests/checkcompoundpattern2.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern3.aff b/third_party/hunspell/tests/checkcompoundpattern3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern3.aff
rename to third_party/hunspell/tests/checkcompoundpattern3.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern3.dic b/third_party/hunspell/tests/checkcompoundpattern3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern3.dic
rename to third_party/hunspell/tests/checkcompoundpattern3.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern3.good b/third_party/hunspell/tests/checkcompoundpattern3.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern3.good
rename to third_party/hunspell/tests/checkcompoundpattern3.good

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern3.test b/third_party/hunspell/tests/checkcompoundpattern3.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern3.test
rename to third_party/hunspell/tests/checkcompoundpattern3.test

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern3.wrong b/third_party/hunspell/tests/checkcompoundpattern3.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern3.wrong
rename to third_party/hunspell/tests/checkcompoundpattern3.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern4.aff b/third_party/hunspell/tests/checkcompoundpattern4.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern4.aff
rename to third_party/hunspell/tests/checkcompoundpattern4.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern4.dic b/third_party/hunspell/tests/checkcompoundpattern4.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern4.dic
rename to third_party/hunspell/tests/checkcompoundpattern4.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern4.good b/third_party/hunspell/tests/checkcompoundpattern4.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern4.good
rename to third_party/hunspell/tests/checkcompoundpattern4.good

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern4.test b/third_party/hunspell/tests/checkcompoundpattern4.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern4.test
rename to third_party/hunspell/tests/checkcompoundpattern4.test

diff --git a/third_party/hunspell_new/tests/checkcompoundpattern4.wrong b/third_party/hunspell/tests/checkcompoundpattern4.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundpattern4.wrong
rename to third_party/hunspell/tests/checkcompoundpattern4.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundrep.aff b/third_party/hunspell/tests/checkcompoundrep.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundrep.aff
rename to third_party/hunspell/tests/checkcompoundrep.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundrep.dic b/third_party/hunspell/tests/checkcompoundrep.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundrep.dic
rename to third_party/hunspell/tests/checkcompoundrep.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundrep.good b/third_party/hunspell/tests/checkcompoundrep.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundrep.good
rename to third_party/hunspell/tests/checkcompoundrep.good

diff --git a/third_party/hunspell_new/tests/checkcompoundrep.test b/third_party/hunspell/tests/checkcompoundrep.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundrep.test
rename to third_party/hunspell/tests/checkcompoundrep.test

diff --git a/third_party/hunspell_new/tests/checkcompoundrep.wrong b/third_party/hunspell/tests/checkcompoundrep.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundrep.wrong
rename to third_party/hunspell/tests/checkcompoundrep.wrong

diff --git a/third_party/hunspell_new/tests/checkcompoundtriple.aff b/third_party/hunspell/tests/checkcompoundtriple.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundtriple.aff
rename to third_party/hunspell/tests/checkcompoundtriple.aff

diff --git a/third_party/hunspell_new/tests/checkcompoundtriple.dic b/third_party/hunspell/tests/checkcompoundtriple.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundtriple.dic
rename to third_party/hunspell/tests/checkcompoundtriple.dic

diff --git a/third_party/hunspell_new/tests/checkcompoundtriple.good b/third_party/hunspell/tests/checkcompoundtriple.good
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundtriple.good
rename to third_party/hunspell/tests/checkcompoundtriple.good

diff --git a/third_party/hunspell_new/tests/checkcompoundtriple.test b/third_party/hunspell/tests/checkcompoundtriple.test
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundtriple.test
rename to third_party/hunspell/tests/checkcompoundtriple.test

diff --git a/third_party/hunspell_new/tests/checkcompoundtriple.wrong b/third_party/hunspell/tests/checkcompoundtriple.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checkcompoundtriple.wrong
rename to third_party/hunspell/tests/checkcompoundtriple.wrong

diff --git a/third_party/hunspell_new/tests/checksharps.aff b/third_party/hunspell/tests/checksharps.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.aff
rename to third_party/hunspell/tests/checksharps.aff

diff --git a/third_party/hunspell_new/tests/checksharps.dic b/third_party/hunspell/tests/checksharps.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.dic
rename to third_party/hunspell/tests/checksharps.dic

diff --git a/third_party/hunspell_new/tests/checksharps.good b/third_party/hunspell/tests/checksharps.good
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.good
rename to third_party/hunspell/tests/checksharps.good

diff --git a/third_party/hunspell_new/tests/checksharps.sug b/third_party/hunspell/tests/checksharps.sug
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.sug
rename to third_party/hunspell/tests/checksharps.sug

diff --git a/third_party/hunspell_new/tests/checksharps.test b/third_party/hunspell/tests/checksharps.test
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.test
rename to third_party/hunspell/tests/checksharps.test

diff --git a/third_party/hunspell_new/tests/checksharps.wrong b/third_party/hunspell/tests/checksharps.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checksharps.wrong
rename to third_party/hunspell/tests/checksharps.wrong

diff --git a/third_party/hunspell_new/tests/checksharpsutf.aff b/third_party/hunspell/tests/checksharpsutf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.aff
rename to third_party/hunspell/tests/checksharpsutf.aff

diff --git a/third_party/hunspell_new/tests/checksharpsutf.dic b/third_party/hunspell/tests/checksharpsutf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.dic
rename to third_party/hunspell/tests/checksharpsutf.dic

diff --git a/third_party/hunspell_new/tests/checksharpsutf.good b/third_party/hunspell/tests/checksharpsutf.good
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.good
rename to third_party/hunspell/tests/checksharpsutf.good

diff --git a/third_party/hunspell_new/tests/checksharpsutf.sug b/third_party/hunspell/tests/checksharpsutf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.sug
rename to third_party/hunspell/tests/checksharpsutf.sug

diff --git a/third_party/hunspell_new/tests/checksharpsutf.test b/third_party/hunspell/tests/checksharpsutf.test
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.test
rename to third_party/hunspell/tests/checksharpsutf.test

diff --git a/third_party/hunspell_new/tests/checksharpsutf.wrong b/third_party/hunspell/tests/checksharpsutf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/checksharpsutf.wrong
rename to third_party/hunspell/tests/checksharpsutf.wrong

diff --git a/third_party/hunspell_new/tests/circumfix.aff b/third_party/hunspell/tests/circumfix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.aff
rename to third_party/hunspell/tests/circumfix.aff

diff --git a/third_party/hunspell_new/tests/circumfix.dic b/third_party/hunspell/tests/circumfix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.dic
rename to third_party/hunspell/tests/circumfix.dic

diff --git a/third_party/hunspell_new/tests/circumfix.good b/third_party/hunspell/tests/circumfix.good
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.good
rename to third_party/hunspell/tests/circumfix.good

diff --git a/third_party/hunspell_new/tests/circumfix.morph b/third_party/hunspell/tests/circumfix.morph
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.morph
rename to third_party/hunspell/tests/circumfix.morph

diff --git a/third_party/hunspell_new/tests/circumfix.test b/third_party/hunspell/tests/circumfix.test
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.test
rename to third_party/hunspell/tests/circumfix.test

diff --git a/third_party/hunspell_new/tests/circumfix.wrong b/third_party/hunspell/tests/circumfix.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/circumfix.wrong
rename to third_party/hunspell/tests/circumfix.wrong

diff --git a/third_party/hunspell_new/tests/colons_in_words.aff b/third_party/hunspell/tests/colons_in_words.aff
similarity index 100%
rename from third_party/hunspell_new/tests/colons_in_words.aff
rename to third_party/hunspell/tests/colons_in_words.aff

diff --git a/third_party/hunspell_new/tests/colons_in_words.dic b/third_party/hunspell/tests/colons_in_words.dic
similarity index 100%
rename from third_party/hunspell_new/tests/colons_in_words.dic
rename to third_party/hunspell/tests/colons_in_words.dic

diff --git a/third_party/hunspell_new/tests/colons_in_words.test b/third_party/hunspell/tests/colons_in_words.test
similarity index 100%
rename from third_party/hunspell_new/tests/colons_in_words.test
rename to third_party/hunspell/tests/colons_in_words.test

diff --git a/third_party/hunspell_new/tests/complexprefixes.aff b/third_party/hunspell/tests/complexprefixes.aff
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes.aff
rename to third_party/hunspell/tests/complexprefixes.aff

diff --git a/third_party/hunspell_new/tests/complexprefixes.dic b/third_party/hunspell/tests/complexprefixes.dic
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes.dic
rename to third_party/hunspell/tests/complexprefixes.dic

diff --git a/third_party/hunspell_new/tests/complexprefixes.good b/third_party/hunspell/tests/complexprefixes.good
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes.good
rename to third_party/hunspell/tests/complexprefixes.good

diff --git a/third_party/hunspell_new/tests/complexprefixes.test b/third_party/hunspell/tests/complexprefixes.test
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes.test
rename to third_party/hunspell/tests/complexprefixes.test

diff --git a/third_party/hunspell_new/tests/complexprefixes.wrong b/third_party/hunspell/tests/complexprefixes.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes.wrong
rename to third_party/hunspell/tests/complexprefixes.wrong

diff --git a/third_party/hunspell_new/tests/complexprefixes2.aff b/third_party/hunspell/tests/complexprefixes2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes2.aff
rename to third_party/hunspell/tests/complexprefixes2.aff

diff --git a/third_party/hunspell_new/tests/complexprefixes2.dic b/third_party/hunspell/tests/complexprefixes2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes2.dic
rename to third_party/hunspell/tests/complexprefixes2.dic

diff --git a/third_party/hunspell_new/tests/complexprefixes2.good b/third_party/hunspell/tests/complexprefixes2.good
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes2.good
rename to third_party/hunspell/tests/complexprefixes2.good

diff --git a/third_party/hunspell_new/tests/complexprefixes2.test b/third_party/hunspell/tests/complexprefixes2.test
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixes2.test
rename to third_party/hunspell/tests/complexprefixes2.test

diff --git a/third_party/hunspell_new/tests/complexprefixesutf.aff b/third_party/hunspell/tests/complexprefixesutf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixesutf.aff
rename to third_party/hunspell/tests/complexprefixesutf.aff

diff --git a/third_party/hunspell_new/tests/complexprefixesutf.dic b/third_party/hunspell/tests/complexprefixesutf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixesutf.dic
rename to third_party/hunspell/tests/complexprefixesutf.dic

diff --git a/third_party/hunspell_new/tests/complexprefixesutf.good b/third_party/hunspell/tests/complexprefixesutf.good
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixesutf.good
rename to third_party/hunspell/tests/complexprefixesutf.good

diff --git a/third_party/hunspell_new/tests/complexprefixesutf.test b/third_party/hunspell/tests/complexprefixesutf.test
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixesutf.test
rename to third_party/hunspell/tests/complexprefixesutf.test

diff --git a/third_party/hunspell_new/tests/complexprefixesutf.wrong b/third_party/hunspell/tests/complexprefixesutf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/complexprefixesutf.wrong
rename to third_party/hunspell/tests/complexprefixesutf.wrong

diff --git a/third_party/hunspell_new/tests/compoundaffix.aff b/third_party/hunspell/tests/compoundaffix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix.aff
rename to third_party/hunspell/tests/compoundaffix.aff

diff --git a/third_party/hunspell_new/tests/compoundaffix.dic b/third_party/hunspell/tests/compoundaffix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix.dic
rename to third_party/hunspell/tests/compoundaffix.dic

diff --git a/third_party/hunspell_new/tests/compoundaffix.good b/third_party/hunspell/tests/compoundaffix.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix.good
rename to third_party/hunspell/tests/compoundaffix.good

diff --git a/third_party/hunspell_new/tests/compoundaffix.test b/third_party/hunspell/tests/compoundaffix.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix.test
rename to third_party/hunspell/tests/compoundaffix.test

diff --git a/third_party/hunspell_new/tests/compoundaffix.wrong b/third_party/hunspell/tests/compoundaffix.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix.wrong
rename to third_party/hunspell/tests/compoundaffix.wrong

diff --git a/third_party/hunspell_new/tests/compoundaffix2.aff b/third_party/hunspell/tests/compoundaffix2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix2.aff
rename to third_party/hunspell/tests/compoundaffix2.aff

diff --git a/third_party/hunspell_new/tests/compoundaffix2.dic b/third_party/hunspell/tests/compoundaffix2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix2.dic
rename to third_party/hunspell/tests/compoundaffix2.dic

diff --git a/third_party/hunspell_new/tests/compoundaffix2.good b/third_party/hunspell/tests/compoundaffix2.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix2.good
rename to third_party/hunspell/tests/compoundaffix2.good

diff --git a/third_party/hunspell_new/tests/compoundaffix2.test b/third_party/hunspell/tests/compoundaffix2.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix2.test
rename to third_party/hunspell/tests/compoundaffix2.test

diff --git a/third_party/hunspell_new/tests/compoundaffix3.aff b/third_party/hunspell/tests/compoundaffix3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix3.aff
rename to third_party/hunspell/tests/compoundaffix3.aff

diff --git a/third_party/hunspell_new/tests/compoundaffix3.dic b/third_party/hunspell/tests/compoundaffix3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix3.dic
rename to third_party/hunspell/tests/compoundaffix3.dic

diff --git a/third_party/hunspell_new/tests/compoundaffix3.good b/third_party/hunspell/tests/compoundaffix3.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix3.good
rename to third_party/hunspell/tests/compoundaffix3.good

diff --git a/third_party/hunspell_new/tests/compoundaffix3.test b/third_party/hunspell/tests/compoundaffix3.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix3.test
rename to third_party/hunspell/tests/compoundaffix3.test

diff --git a/third_party/hunspell_new/tests/compoundaffix3.wrong b/third_party/hunspell/tests/compoundaffix3.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundaffix3.wrong
rename to third_party/hunspell/tests/compoundaffix3.wrong

diff --git a/third_party/hunspell_new/tests/compoundflag.aff b/third_party/hunspell/tests/compoundflag.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundflag.aff
rename to third_party/hunspell/tests/compoundflag.aff

diff --git a/third_party/hunspell_new/tests/compoundflag.dic b/third_party/hunspell/tests/compoundflag.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundflag.dic
rename to third_party/hunspell/tests/compoundflag.dic

diff --git a/third_party/hunspell_new/tests/compoundflag.good b/third_party/hunspell/tests/compoundflag.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundflag.good
rename to third_party/hunspell/tests/compoundflag.good

diff --git a/third_party/hunspell_new/tests/compoundflag.test b/third_party/hunspell/tests/compoundflag.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundflag.test
rename to third_party/hunspell/tests/compoundflag.test

diff --git a/third_party/hunspell_new/tests/compoundflag.wrong b/third_party/hunspell/tests/compoundflag.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundflag.wrong
rename to third_party/hunspell/tests/compoundflag.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule.aff b/third_party/hunspell/tests/compoundrule.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule.aff
rename to third_party/hunspell/tests/compoundrule.aff

diff --git a/third_party/hunspell_new/tests/compoundrule.dic b/third_party/hunspell/tests/compoundrule.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule.dic
rename to third_party/hunspell/tests/compoundrule.dic

diff --git a/third_party/hunspell_new/tests/compoundrule.good b/third_party/hunspell/tests/compoundrule.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule.good
rename to third_party/hunspell/tests/compoundrule.good

diff --git a/third_party/hunspell_new/tests/compoundrule.test b/third_party/hunspell/tests/compoundrule.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule.test
rename to third_party/hunspell/tests/compoundrule.test

diff --git a/third_party/hunspell_new/tests/compoundrule.wrong b/third_party/hunspell/tests/compoundrule.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule.wrong
rename to third_party/hunspell/tests/compoundrule.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule2.aff b/third_party/hunspell/tests/compoundrule2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule2.aff
rename to third_party/hunspell/tests/compoundrule2.aff

diff --git a/third_party/hunspell_new/tests/compoundrule2.dic b/third_party/hunspell/tests/compoundrule2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule2.dic
rename to third_party/hunspell/tests/compoundrule2.dic

diff --git a/third_party/hunspell_new/tests/compoundrule2.good b/third_party/hunspell/tests/compoundrule2.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule2.good
rename to third_party/hunspell/tests/compoundrule2.good

diff --git a/third_party/hunspell_new/tests/compoundrule2.test b/third_party/hunspell/tests/compoundrule2.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule2.test
rename to third_party/hunspell/tests/compoundrule2.test

diff --git a/third_party/hunspell_new/tests/compoundrule2.wrong b/third_party/hunspell/tests/compoundrule2.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule2.wrong
rename to third_party/hunspell/tests/compoundrule2.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule3.aff b/third_party/hunspell/tests/compoundrule3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule3.aff
rename to third_party/hunspell/tests/compoundrule3.aff

diff --git a/third_party/hunspell_new/tests/compoundrule3.dic b/third_party/hunspell/tests/compoundrule3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule3.dic
rename to third_party/hunspell/tests/compoundrule3.dic

diff --git a/third_party/hunspell_new/tests/compoundrule3.good b/third_party/hunspell/tests/compoundrule3.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule3.good
rename to third_party/hunspell/tests/compoundrule3.good

diff --git a/third_party/hunspell_new/tests/compoundrule3.test b/third_party/hunspell/tests/compoundrule3.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule3.test
rename to third_party/hunspell/tests/compoundrule3.test

diff --git a/third_party/hunspell_new/tests/compoundrule3.wrong b/third_party/hunspell/tests/compoundrule3.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule3.wrong
rename to third_party/hunspell/tests/compoundrule3.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule4.aff b/third_party/hunspell/tests/compoundrule4.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule4.aff
rename to third_party/hunspell/tests/compoundrule4.aff

diff --git a/third_party/hunspell_new/tests/compoundrule4.dic b/third_party/hunspell/tests/compoundrule4.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule4.dic
rename to third_party/hunspell/tests/compoundrule4.dic

diff --git a/third_party/hunspell_new/tests/compoundrule4.good b/third_party/hunspell/tests/compoundrule4.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule4.good
rename to third_party/hunspell/tests/compoundrule4.good

diff --git a/third_party/hunspell_new/tests/compoundrule4.test b/third_party/hunspell/tests/compoundrule4.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule4.test
rename to third_party/hunspell/tests/compoundrule4.test

diff --git a/third_party/hunspell_new/tests/compoundrule4.wrong b/third_party/hunspell/tests/compoundrule4.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule4.wrong
rename to third_party/hunspell/tests/compoundrule4.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule5.aff b/third_party/hunspell/tests/compoundrule5.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.aff
rename to third_party/hunspell/tests/compoundrule5.aff

diff --git a/third_party/hunspell_new/tests/compoundrule5.dic b/third_party/hunspell/tests/compoundrule5.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.dic
rename to third_party/hunspell/tests/compoundrule5.dic

diff --git a/third_party/hunspell_new/tests/compoundrule5.good b/third_party/hunspell/tests/compoundrule5.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.good
rename to third_party/hunspell/tests/compoundrule5.good

diff --git a/third_party/hunspell_new/tests/compoundrule5.morph b/third_party/hunspell/tests/compoundrule5.morph
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.morph
rename to third_party/hunspell/tests/compoundrule5.morph

diff --git a/third_party/hunspell_new/tests/compoundrule5.test b/third_party/hunspell/tests/compoundrule5.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.test
rename to third_party/hunspell/tests/compoundrule5.test

diff --git a/third_party/hunspell_new/tests/compoundrule5.wrong b/third_party/hunspell/tests/compoundrule5.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule5.wrong
rename to third_party/hunspell/tests/compoundrule5.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule6.aff b/third_party/hunspell/tests/compoundrule6.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule6.aff
rename to third_party/hunspell/tests/compoundrule6.aff

diff --git a/third_party/hunspell_new/tests/compoundrule6.dic b/third_party/hunspell/tests/compoundrule6.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule6.dic
rename to third_party/hunspell/tests/compoundrule6.dic

diff --git a/third_party/hunspell_new/tests/compoundrule6.good b/third_party/hunspell/tests/compoundrule6.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule6.good
rename to third_party/hunspell/tests/compoundrule6.good

diff --git a/third_party/hunspell_new/tests/compoundrule6.test b/third_party/hunspell/tests/compoundrule6.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule6.test
rename to third_party/hunspell/tests/compoundrule6.test

diff --git a/third_party/hunspell_new/tests/compoundrule6.wrong b/third_party/hunspell/tests/compoundrule6.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule6.wrong
rename to third_party/hunspell/tests/compoundrule6.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule7.aff b/third_party/hunspell/tests/compoundrule7.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule7.aff
rename to third_party/hunspell/tests/compoundrule7.aff

diff --git a/third_party/hunspell_new/tests/compoundrule7.dic b/third_party/hunspell/tests/compoundrule7.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule7.dic
rename to third_party/hunspell/tests/compoundrule7.dic

diff --git a/third_party/hunspell_new/tests/compoundrule7.good b/third_party/hunspell/tests/compoundrule7.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule7.good
rename to third_party/hunspell/tests/compoundrule7.good

diff --git a/third_party/hunspell_new/tests/compoundrule7.test b/third_party/hunspell/tests/compoundrule7.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule7.test
rename to third_party/hunspell/tests/compoundrule7.test

diff --git a/third_party/hunspell_new/tests/compoundrule7.wrong b/third_party/hunspell/tests/compoundrule7.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule7.wrong
rename to third_party/hunspell/tests/compoundrule7.wrong

diff --git a/third_party/hunspell_new/tests/compoundrule8.aff b/third_party/hunspell/tests/compoundrule8.aff
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule8.aff
rename to third_party/hunspell/tests/compoundrule8.aff

diff --git a/third_party/hunspell_new/tests/compoundrule8.dic b/third_party/hunspell/tests/compoundrule8.dic
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule8.dic
rename to third_party/hunspell/tests/compoundrule8.dic

diff --git a/third_party/hunspell_new/tests/compoundrule8.good b/third_party/hunspell/tests/compoundrule8.good
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule8.good
rename to third_party/hunspell/tests/compoundrule8.good

diff --git a/third_party/hunspell_new/tests/compoundrule8.test b/third_party/hunspell/tests/compoundrule8.test
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule8.test
rename to third_party/hunspell/tests/compoundrule8.test

diff --git a/third_party/hunspell_new/tests/compoundrule8.wrong b/third_party/hunspell/tests/compoundrule8.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/compoundrule8.wrong
rename to third_party/hunspell/tests/compoundrule8.wrong

diff --git a/third_party/hunspell_new/tests/condition.aff b/third_party/hunspell/tests/condition.aff
similarity index 100%
rename from third_party/hunspell_new/tests/condition.aff
rename to third_party/hunspell/tests/condition.aff

diff --git a/third_party/hunspell_new/tests/condition.dic b/third_party/hunspell/tests/condition.dic
similarity index 100%
rename from third_party/hunspell_new/tests/condition.dic
rename to third_party/hunspell/tests/condition.dic

diff --git a/third_party/hunspell_new/tests/condition.good b/third_party/hunspell/tests/condition.good
similarity index 100%
rename from third_party/hunspell_new/tests/condition.good
rename to third_party/hunspell/tests/condition.good

diff --git a/third_party/hunspell_new/tests/condition.test b/third_party/hunspell/tests/condition.test
similarity index 100%
rename from third_party/hunspell_new/tests/condition.test
rename to third_party/hunspell/tests/condition.test

diff --git a/third_party/hunspell_new/tests/condition.wrong b/third_party/hunspell/tests/condition.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/condition.wrong
rename to third_party/hunspell/tests/condition.wrong

diff --git a/third_party/hunspell_new/tests/condition_utf.aff b/third_party/hunspell/tests/condition_utf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/condition_utf.aff
rename to third_party/hunspell/tests/condition_utf.aff

diff --git a/third_party/hunspell_new/tests/condition_utf.dic b/third_party/hunspell/tests/condition_utf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/condition_utf.dic
rename to third_party/hunspell/tests/condition_utf.dic

diff --git a/third_party/hunspell_new/tests/condition_utf.good b/third_party/hunspell/tests/condition_utf.good
similarity index 100%
rename from third_party/hunspell_new/tests/condition_utf.good
rename to third_party/hunspell/tests/condition_utf.good

diff --git a/third_party/hunspell_new/tests/condition_utf.test b/third_party/hunspell/tests/condition_utf.test
similarity index 100%
rename from third_party/hunspell_new/tests/condition_utf.test
rename to third_party/hunspell/tests/condition_utf.test

diff --git a/third_party/hunspell_new/tests/condition_utf.wrong b/third_party/hunspell/tests/condition_utf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/condition_utf.wrong
rename to third_party/hunspell/tests/condition_utf.wrong

diff --git a/third_party/hunspell_new/tests/conditionalprefix.aff b/third_party/hunspell/tests/conditionalprefix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.aff
rename to third_party/hunspell/tests/conditionalprefix.aff

diff --git a/third_party/hunspell_new/tests/conditionalprefix.dic b/third_party/hunspell/tests/conditionalprefix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.dic
rename to third_party/hunspell/tests/conditionalprefix.dic

diff --git a/third_party/hunspell_new/tests/conditionalprefix.good b/third_party/hunspell/tests/conditionalprefix.good
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.good
rename to third_party/hunspell/tests/conditionalprefix.good

diff --git a/third_party/hunspell_new/tests/conditionalprefix.morph b/third_party/hunspell/tests/conditionalprefix.morph
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.morph
rename to third_party/hunspell/tests/conditionalprefix.morph

diff --git a/third_party/hunspell_new/tests/conditionalprefix.test b/third_party/hunspell/tests/conditionalprefix.test
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.test
rename to third_party/hunspell/tests/conditionalprefix.test

diff --git a/third_party/hunspell_new/tests/conditionalprefix.wrong b/third_party/hunspell/tests/conditionalprefix.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/conditionalprefix.wrong
rename to third_party/hunspell/tests/conditionalprefix.wrong

diff --git a/third_party/hunspell_new/tests/digits_in_words.aff b/third_party/hunspell/tests/digits_in_words.aff
similarity index 100%
rename from third_party/hunspell_new/tests/digits_in_words.aff
rename to third_party/hunspell/tests/digits_in_words.aff

diff --git a/third_party/hunspell_new/tests/digits_in_words.dic b/third_party/hunspell/tests/digits_in_words.dic
similarity index 100%
rename from third_party/hunspell_new/tests/digits_in_words.dic
rename to third_party/hunspell/tests/digits_in_words.dic

diff --git a/third_party/hunspell_new/tests/digits_in_words.test b/third_party/hunspell/tests/digits_in_words.test
similarity index 100%
rename from third_party/hunspell_new/tests/digits_in_words.test
rename to third_party/hunspell/tests/digits_in_words.test

diff --git a/third_party/hunspell_new/tests/digits_in_words.wrong b/third_party/hunspell/tests/digits_in_words.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/digits_in_words.wrong
rename to third_party/hunspell/tests/digits_in_words.wrong

diff --git a/third_party/hunspell_new/tests/flag.aff b/third_party/hunspell/tests/flag.aff
similarity index 100%
rename from third_party/hunspell_new/tests/flag.aff
rename to third_party/hunspell/tests/flag.aff

diff --git a/third_party/hunspell_new/tests/flag.dic b/third_party/hunspell/tests/flag.dic
similarity index 100%
rename from third_party/hunspell_new/tests/flag.dic
rename to third_party/hunspell/tests/flag.dic

diff --git a/third_party/hunspell_new/tests/flag.good b/third_party/hunspell/tests/flag.good
similarity index 100%
rename from third_party/hunspell_new/tests/flag.good
rename to third_party/hunspell/tests/flag.good

diff --git a/third_party/hunspell_new/tests/flag.test b/third_party/hunspell/tests/flag.test
similarity index 100%
rename from third_party/hunspell_new/tests/flag.test
rename to third_party/hunspell/tests/flag.test

diff --git a/third_party/hunspell_new/tests/flaglong.aff b/third_party/hunspell/tests/flaglong.aff
similarity index 100%
rename from third_party/hunspell_new/tests/flaglong.aff
rename to third_party/hunspell/tests/flaglong.aff

diff --git a/third_party/hunspell_new/tests/flaglong.dic b/third_party/hunspell/tests/flaglong.dic
similarity index 100%
rename from third_party/hunspell_new/tests/flaglong.dic
rename to third_party/hunspell/tests/flaglong.dic

diff --git a/third_party/hunspell_new/tests/flaglong.good b/third_party/hunspell/tests/flaglong.good
similarity index 100%
rename from third_party/hunspell_new/tests/flaglong.good
rename to third_party/hunspell/tests/flaglong.good

diff --git a/third_party/hunspell_new/tests/flaglong.test b/third_party/hunspell/tests/flaglong.test
similarity index 100%
rename from third_party/hunspell_new/tests/flaglong.test
rename to third_party/hunspell/tests/flaglong.test

diff --git a/third_party/hunspell_new/tests/flagnum.aff b/third_party/hunspell/tests/flagnum.aff
similarity index 100%
rename from third_party/hunspell_new/tests/flagnum.aff
rename to third_party/hunspell/tests/flagnum.aff

diff --git a/third_party/hunspell_new/tests/flagnum.dic b/third_party/hunspell/tests/flagnum.dic
similarity index 100%
rename from third_party/hunspell_new/tests/flagnum.dic
rename to third_party/hunspell/tests/flagnum.dic

diff --git a/third_party/hunspell_new/tests/flagnum.good b/third_party/hunspell/tests/flagnum.good
similarity index 100%
rename from third_party/hunspell_new/tests/flagnum.good
rename to third_party/hunspell/tests/flagnum.good

diff --git a/third_party/hunspell_new/tests/flagnum.test b/third_party/hunspell/tests/flagnum.test
similarity index 100%
rename from third_party/hunspell_new/tests/flagnum.test
rename to third_party/hunspell/tests/flagnum.test

diff --git a/third_party/hunspell_new/tests/flagutf8.aff b/third_party/hunspell/tests/flagutf8.aff
similarity index 100%
rename from third_party/hunspell_new/tests/flagutf8.aff
rename to third_party/hunspell/tests/flagutf8.aff

diff --git a/third_party/hunspell_new/tests/flagutf8.dic b/third_party/hunspell/tests/flagutf8.dic
similarity index 100%
rename from third_party/hunspell_new/tests/flagutf8.dic
rename to third_party/hunspell/tests/flagutf8.dic

diff --git a/third_party/hunspell_new/tests/flagutf8.good b/third_party/hunspell/tests/flagutf8.good
similarity index 100%
rename from third_party/hunspell_new/tests/flagutf8.good
rename to third_party/hunspell/tests/flagutf8.good

diff --git a/third_party/hunspell_new/tests/flagutf8.test b/third_party/hunspell/tests/flagutf8.test
similarity index 100%
rename from third_party/hunspell_new/tests/flagutf8.test
rename to third_party/hunspell/tests/flagutf8.test

diff --git a/third_party/hunspell_new/tests/fogemorpheme.aff b/third_party/hunspell/tests/fogemorpheme.aff
similarity index 100%
rename from third_party/hunspell_new/tests/fogemorpheme.aff
rename to third_party/hunspell/tests/fogemorpheme.aff

diff --git a/third_party/hunspell_new/tests/fogemorpheme.dic b/third_party/hunspell/tests/fogemorpheme.dic
similarity index 100%
rename from third_party/hunspell_new/tests/fogemorpheme.dic
rename to third_party/hunspell/tests/fogemorpheme.dic

diff --git a/third_party/hunspell_new/tests/fogemorpheme.good b/third_party/hunspell/tests/fogemorpheme.good
similarity index 100%
rename from third_party/hunspell_new/tests/fogemorpheme.good
rename to third_party/hunspell/tests/fogemorpheme.good

diff --git a/third_party/hunspell_new/tests/fogemorpheme.test b/third_party/hunspell/tests/fogemorpheme.test
similarity index 100%
rename from third_party/hunspell_new/tests/fogemorpheme.test
rename to third_party/hunspell/tests/fogemorpheme.test

diff --git a/third_party/hunspell_new/tests/fogemorpheme.wrong b/third_party/hunspell/tests/fogemorpheme.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/fogemorpheme.wrong
rename to third_party/hunspell/tests/fogemorpheme.wrong

diff --git a/third_party/hunspell_new/tests/forbiddenword.aff b/third_party/hunspell/tests/forbiddenword.aff
similarity index 100%
rename from third_party/hunspell_new/tests/forbiddenword.aff
rename to third_party/hunspell/tests/forbiddenword.aff

diff --git a/third_party/hunspell_new/tests/forbiddenword.dic b/third_party/hunspell/tests/forbiddenword.dic
similarity index 100%
rename from third_party/hunspell_new/tests/forbiddenword.dic
rename to third_party/hunspell/tests/forbiddenword.dic

diff --git a/third_party/hunspell_new/tests/forbiddenword.good b/third_party/hunspell/tests/forbiddenword.good
similarity index 100%
rename from third_party/hunspell_new/tests/forbiddenword.good
rename to third_party/hunspell/tests/forbiddenword.good

diff --git a/third_party/hunspell_new/tests/forbiddenword.test b/third_party/hunspell/tests/forbiddenword.test
similarity index 100%
rename from third_party/hunspell_new/tests/forbiddenword.test
rename to third_party/hunspell/tests/forbiddenword.test

diff --git a/third_party/hunspell_new/tests/forbiddenword.wrong b/third_party/hunspell/tests/forbiddenword.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/forbiddenword.wrong
rename to third_party/hunspell/tests/forbiddenword.wrong

diff --git a/third_party/hunspell_new/tests/fullstrip.aff b/third_party/hunspell/tests/fullstrip.aff
similarity index 100%
rename from third_party/hunspell_new/tests/fullstrip.aff
rename to third_party/hunspell/tests/fullstrip.aff

diff --git a/third_party/hunspell_new/tests/fullstrip.dic b/third_party/hunspell/tests/fullstrip.dic
similarity index 100%
rename from third_party/hunspell_new/tests/fullstrip.dic
rename to third_party/hunspell/tests/fullstrip.dic

diff --git a/third_party/hunspell_new/tests/fullstrip.good b/third_party/hunspell/tests/fullstrip.good
similarity index 100%
rename from third_party/hunspell_new/tests/fullstrip.good
rename to third_party/hunspell/tests/fullstrip.good

diff --git a/third_party/hunspell_new/tests/fullstrip.test b/third_party/hunspell/tests/fullstrip.test
similarity index 100%
rename from third_party/hunspell_new/tests/fullstrip.test
rename to third_party/hunspell/tests/fullstrip.test

diff --git a/third_party/hunspell_new/tests/germancompounding.aff b/third_party/hunspell/tests/germancompounding.aff
similarity index 100%
rename from third_party/hunspell_new/tests/germancompounding.aff
rename to third_party/hunspell/tests/germancompounding.aff

diff --git a/third_party/hunspell_new/tests/germancompounding.dic b/third_party/hunspell/tests/germancompounding.dic
similarity index 100%
rename from third_party/hunspell_new/tests/germancompounding.dic
rename to third_party/hunspell/tests/germancompounding.dic

diff --git a/third_party/hunspell_new/tests/germancompounding.good b/third_party/hunspell/tests/germancompounding.good
similarity index 100%
rename from third_party/hunspell_new/tests/germancompounding.good
rename to third_party/hunspell/tests/germancompounding.good

diff --git a/third_party/hunspell_new/tests/germancompounding.test b/third_party/hunspell/tests/germancompounding.test
similarity index 100%
rename from third_party/hunspell_new/tests/germancompounding.test
rename to third_party/hunspell/tests/germancompounding.test

diff --git a/third_party/hunspell_new/tests/germancompounding.wrong b/third_party/hunspell/tests/germancompounding.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/germancompounding.wrong
rename to third_party/hunspell/tests/germancompounding.wrong

diff --git a/third_party/hunspell_new/tests/germancompoundingold.aff b/third_party/hunspell/tests/germancompoundingold.aff
similarity index 100%
rename from third_party/hunspell_new/tests/germancompoundingold.aff
rename to third_party/hunspell/tests/germancompoundingold.aff

diff --git a/third_party/hunspell_new/tests/germancompoundingold.dic b/third_party/hunspell/tests/germancompoundingold.dic
similarity index 100%
rename from third_party/hunspell_new/tests/germancompoundingold.dic
rename to third_party/hunspell/tests/germancompoundingold.dic

diff --git a/third_party/hunspell_new/tests/germancompoundingold.good b/third_party/hunspell/tests/germancompoundingold.good
similarity index 100%
rename from third_party/hunspell_new/tests/germancompoundingold.good
rename to third_party/hunspell/tests/germancompoundingold.good

diff --git a/third_party/hunspell_new/tests/germancompoundingold.test b/third_party/hunspell/tests/germancompoundingold.test
similarity index 100%
rename from third_party/hunspell_new/tests/germancompoundingold.test
rename to third_party/hunspell/tests/germancompoundingold.test

diff --git a/third_party/hunspell_new/tests/germancompoundingold.wrong b/third_party/hunspell/tests/germancompoundingold.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/germancompoundingold.wrong
rename to third_party/hunspell/tests/germancompoundingold.wrong

diff --git a/third_party/hunspell_new/tests/i35725.aff b/third_party/hunspell/tests/i35725.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.aff
rename to third_party/hunspell/tests/i35725.aff

diff --git a/third_party/hunspell_new/tests/i35725.dic b/third_party/hunspell/tests/i35725.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.dic
rename to third_party/hunspell/tests/i35725.dic

diff --git a/third_party/hunspell_new/tests/i35725.good b/third_party/hunspell/tests/i35725.good
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.good
rename to third_party/hunspell/tests/i35725.good

diff --git a/third_party/hunspell_new/tests/i35725.sug b/third_party/hunspell/tests/i35725.sug
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.sug
rename to third_party/hunspell/tests/i35725.sug

diff --git a/third_party/hunspell_new/tests/i35725.test b/third_party/hunspell/tests/i35725.test
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.test
rename to third_party/hunspell/tests/i35725.test

diff --git a/third_party/hunspell_new/tests/i35725.wrong b/third_party/hunspell/tests/i35725.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i35725.wrong
rename to third_party/hunspell/tests/i35725.wrong

diff --git a/third_party/hunspell_new/tests/i53643.aff b/third_party/hunspell/tests/i53643.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i53643.aff
rename to third_party/hunspell/tests/i53643.aff

diff --git a/third_party/hunspell_new/tests/i53643.dic b/third_party/hunspell/tests/i53643.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i53643.dic
rename to third_party/hunspell/tests/i53643.dic

diff --git a/third_party/hunspell_new/tests/i53643.good b/third_party/hunspell/tests/i53643.good
similarity index 100%
rename from third_party/hunspell_new/tests/i53643.good
rename to third_party/hunspell/tests/i53643.good

diff --git a/third_party/hunspell_new/tests/i53643.test b/third_party/hunspell/tests/i53643.test
similarity index 100%
rename from third_party/hunspell_new/tests/i53643.test
rename to third_party/hunspell/tests/i53643.test

diff --git a/third_party/hunspell_new/tests/i53643.wrong b/third_party/hunspell/tests/i53643.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i53643.wrong
rename to third_party/hunspell/tests/i53643.wrong

diff --git a/third_party/hunspell_new/tests/i54633.aff b/third_party/hunspell/tests/i54633.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.aff
rename to third_party/hunspell/tests/i54633.aff

diff --git a/third_party/hunspell_new/tests/i54633.dic b/third_party/hunspell/tests/i54633.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.dic
rename to third_party/hunspell/tests/i54633.dic

diff --git a/third_party/hunspell_new/tests/i54633.good b/third_party/hunspell/tests/i54633.good
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.good
rename to third_party/hunspell/tests/i54633.good

diff --git a/third_party/hunspell_new/tests/i54633.sug b/third_party/hunspell/tests/i54633.sug
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.sug
rename to third_party/hunspell/tests/i54633.sug

diff --git a/third_party/hunspell_new/tests/i54633.test b/third_party/hunspell/tests/i54633.test
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.test
rename to third_party/hunspell/tests/i54633.test

diff --git a/third_party/hunspell_new/tests/i54633.wrong b/third_party/hunspell/tests/i54633.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i54633.wrong
rename to third_party/hunspell/tests/i54633.wrong

diff --git a/third_party/hunspell_new/tests/i54980.aff b/third_party/hunspell/tests/i54980.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i54980.aff
rename to third_party/hunspell/tests/i54980.aff

diff --git a/third_party/hunspell_new/tests/i54980.dic b/third_party/hunspell/tests/i54980.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i54980.dic
rename to third_party/hunspell/tests/i54980.dic

diff --git a/third_party/hunspell_new/tests/i54980.good b/third_party/hunspell/tests/i54980.good
similarity index 100%
rename from third_party/hunspell_new/tests/i54980.good
rename to third_party/hunspell/tests/i54980.good

diff --git a/third_party/hunspell_new/tests/i54980.test b/third_party/hunspell/tests/i54980.test
similarity index 100%
rename from third_party/hunspell_new/tests/i54980.test
rename to third_party/hunspell/tests/i54980.test

diff --git a/third_party/hunspell_new/tests/i58202.aff b/third_party/hunspell/tests/i58202.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.aff
rename to third_party/hunspell/tests/i58202.aff

diff --git a/third_party/hunspell_new/tests/i58202.dic b/third_party/hunspell/tests/i58202.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.dic
rename to third_party/hunspell/tests/i58202.dic

diff --git a/third_party/hunspell_new/tests/i58202.good b/third_party/hunspell/tests/i58202.good
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.good
rename to third_party/hunspell/tests/i58202.good

diff --git a/third_party/hunspell_new/tests/i58202.sug b/third_party/hunspell/tests/i58202.sug
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.sug
rename to third_party/hunspell/tests/i58202.sug

diff --git a/third_party/hunspell_new/tests/i58202.test b/third_party/hunspell/tests/i58202.test
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.test
rename to third_party/hunspell/tests/i58202.test

diff --git a/third_party/hunspell_new/tests/i58202.wrong b/third_party/hunspell/tests/i58202.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i58202.wrong
rename to third_party/hunspell/tests/i58202.wrong

diff --git a/third_party/hunspell_new/tests/i68568.aff b/third_party/hunspell/tests/i68568.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i68568.aff
rename to third_party/hunspell/tests/i68568.aff

diff --git a/third_party/hunspell_new/tests/i68568.dic b/third_party/hunspell/tests/i68568.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i68568.dic
rename to third_party/hunspell/tests/i68568.dic

diff --git a/third_party/hunspell_new/tests/i68568.test b/third_party/hunspell/tests/i68568.test
similarity index 100%
rename from third_party/hunspell_new/tests/i68568.test
rename to third_party/hunspell/tests/i68568.test

diff --git a/third_party/hunspell_new/tests/i68568.wrong b/third_party/hunspell/tests/i68568.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i68568.wrong
rename to third_party/hunspell/tests/i68568.wrong

diff --git a/third_party/hunspell_new/tests/i68568utf.aff b/third_party/hunspell/tests/i68568utf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/i68568utf.aff
rename to third_party/hunspell/tests/i68568utf.aff

diff --git a/third_party/hunspell_new/tests/i68568utf.dic b/third_party/hunspell/tests/i68568utf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/i68568utf.dic
rename to third_party/hunspell/tests/i68568utf.dic

diff --git a/third_party/hunspell_new/tests/i68568utf.test b/third_party/hunspell/tests/i68568utf.test
similarity index 100%
rename from third_party/hunspell_new/tests/i68568utf.test
rename to third_party/hunspell/tests/i68568utf.test

diff --git a/third_party/hunspell_new/tests/i68568utf.wrong b/third_party/hunspell/tests/i68568utf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/i68568utf.wrong
rename to third_party/hunspell/tests/i68568utf.wrong

diff --git a/third_party/hunspell_new/tests/iconv.aff b/third_party/hunspell/tests/iconv.aff
similarity index 100%
rename from third_party/hunspell_new/tests/iconv.aff
rename to third_party/hunspell/tests/iconv.aff

diff --git a/third_party/hunspell_new/tests/iconv.dic b/third_party/hunspell/tests/iconv.dic
similarity index 100%
rename from third_party/hunspell_new/tests/iconv.dic
rename to third_party/hunspell/tests/iconv.dic

diff --git a/third_party/hunspell_new/tests/iconv.good b/third_party/hunspell/tests/iconv.good
similarity index 100%
rename from third_party/hunspell_new/tests/iconv.good
rename to third_party/hunspell/tests/iconv.good

diff --git a/third_party/hunspell_new/tests/iconv.test b/third_party/hunspell/tests/iconv.test
similarity index 100%
rename from third_party/hunspell_new/tests/iconv.test
rename to third_party/hunspell/tests/iconv.test

diff --git a/third_party/hunspell_new/tests/ignore.aff b/third_party/hunspell/tests/ignore.aff
similarity index 100%
rename from third_party/hunspell_new/tests/ignore.aff
rename to third_party/hunspell/tests/ignore.aff

diff --git a/third_party/hunspell_new/tests/ignore.dic b/third_party/hunspell/tests/ignore.dic
similarity index 100%
rename from third_party/hunspell_new/tests/ignore.dic
rename to third_party/hunspell/tests/ignore.dic

diff --git a/third_party/hunspell_new/tests/ignore.good b/third_party/hunspell/tests/ignore.good
similarity index 100%
rename from third_party/hunspell_new/tests/ignore.good
rename to third_party/hunspell/tests/ignore.good

diff --git a/third_party/hunspell_new/tests/ignore.test b/third_party/hunspell/tests/ignore.test
similarity index 100%
rename from third_party/hunspell_new/tests/ignore.test
rename to third_party/hunspell/tests/ignore.test

diff --git a/third_party/hunspell_new/tests/ignoreutf.aff b/third_party/hunspell/tests/ignoreutf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/ignoreutf.aff
rename to third_party/hunspell/tests/ignoreutf.aff

diff --git a/third_party/hunspell_new/tests/ignoreutf.dic b/third_party/hunspell/tests/ignoreutf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/ignoreutf.dic
rename to third_party/hunspell/tests/ignoreutf.dic

diff --git a/third_party/hunspell_new/tests/ignoreutf.good b/third_party/hunspell/tests/ignoreutf.good
similarity index 100%
rename from third_party/hunspell_new/tests/ignoreutf.good
rename to third_party/hunspell/tests/ignoreutf.good

diff --git a/third_party/hunspell_new/tests/ignoreutf.test b/third_party/hunspell/tests/ignoreutf.test
similarity index 100%
rename from third_party/hunspell_new/tests/ignoreutf.test
rename to third_party/hunspell/tests/ignoreutf.test

diff --git a/third_party/hunspell_new/tests/keepcase.aff b/third_party/hunspell/tests/keepcase.aff
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.aff
rename to third_party/hunspell/tests/keepcase.aff

diff --git a/third_party/hunspell_new/tests/keepcase.dic b/third_party/hunspell/tests/keepcase.dic
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.dic
rename to third_party/hunspell/tests/keepcase.dic

diff --git a/third_party/hunspell_new/tests/keepcase.good b/third_party/hunspell/tests/keepcase.good
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.good
rename to third_party/hunspell/tests/keepcase.good

diff --git a/third_party/hunspell_new/tests/keepcase.sug b/third_party/hunspell/tests/keepcase.sug
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.sug
rename to third_party/hunspell/tests/keepcase.sug

diff --git a/third_party/hunspell_new/tests/keepcase.test b/third_party/hunspell/tests/keepcase.test
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.test
rename to third_party/hunspell/tests/keepcase.test

diff --git a/third_party/hunspell_new/tests/keepcase.wrong b/third_party/hunspell/tests/keepcase.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/keepcase.wrong
rename to third_party/hunspell/tests/keepcase.wrong

diff --git a/third_party/hunspell_new/tests/map.aff b/third_party/hunspell/tests/map.aff
similarity index 100%
rename from third_party/hunspell_new/tests/map.aff
rename to third_party/hunspell/tests/map.aff

diff --git a/third_party/hunspell_new/tests/map.dic b/third_party/hunspell/tests/map.dic
similarity index 100%
rename from third_party/hunspell_new/tests/map.dic
rename to third_party/hunspell/tests/map.dic

diff --git a/third_party/hunspell_new/tests/map.sug b/third_party/hunspell/tests/map.sug
similarity index 100%
rename from third_party/hunspell_new/tests/map.sug
rename to third_party/hunspell/tests/map.sug

diff --git a/third_party/hunspell_new/tests/map.test b/third_party/hunspell/tests/map.test
similarity index 100%
rename from third_party/hunspell_new/tests/map.test
rename to third_party/hunspell/tests/map.test

diff --git a/third_party/hunspell_new/tests/map.wrong b/third_party/hunspell/tests/map.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/map.wrong
rename to third_party/hunspell/tests/map.wrong

diff --git a/third_party/hunspell_new/tests/maputf.aff b/third_party/hunspell/tests/maputf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/maputf.aff
rename to third_party/hunspell/tests/maputf.aff

diff --git a/third_party/hunspell_new/tests/maputf.dic b/third_party/hunspell/tests/maputf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/maputf.dic
rename to third_party/hunspell/tests/maputf.dic

diff --git a/third_party/hunspell_new/tests/maputf.sug b/third_party/hunspell/tests/maputf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/maputf.sug
rename to third_party/hunspell/tests/maputf.sug

diff --git a/third_party/hunspell_new/tests/maputf.test b/third_party/hunspell/tests/maputf.test
similarity index 100%
rename from third_party/hunspell_new/tests/maputf.test
rename to third_party/hunspell/tests/maputf.test

diff --git a/third_party/hunspell_new/tests/maputf.wrong b/third_party/hunspell/tests/maputf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/maputf.wrong
rename to third_party/hunspell/tests/maputf.wrong

diff --git a/third_party/hunspell_new/tests/morph.aff b/third_party/hunspell/tests/morph.aff
similarity index 100%
rename from third_party/hunspell_new/tests/morph.aff
rename to third_party/hunspell/tests/morph.aff

diff --git a/third_party/hunspell_new/tests/morph.dic b/third_party/hunspell/tests/morph.dic
similarity index 100%
rename from third_party/hunspell_new/tests/morph.dic
rename to third_party/hunspell/tests/morph.dic

diff --git a/third_party/hunspell_new/tests/morph.good b/third_party/hunspell/tests/morph.good
similarity index 100%
rename from third_party/hunspell_new/tests/morph.good
rename to third_party/hunspell/tests/morph.good

diff --git a/third_party/hunspell_new/tests/morph.morph b/third_party/hunspell/tests/morph.morph
similarity index 100%
rename from third_party/hunspell_new/tests/morph.morph
rename to third_party/hunspell/tests/morph.morph

diff --git a/third_party/hunspell_new/tests/morph.test b/third_party/hunspell/tests/morph.test
similarity index 100%
rename from third_party/hunspell_new/tests/morph.test
rename to third_party/hunspell/tests/morph.test

diff --git a/third_party/hunspell_new/tests/needaffix.aff b/third_party/hunspell/tests/needaffix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix.aff
rename to third_party/hunspell/tests/needaffix.aff

diff --git a/third_party/hunspell_new/tests/needaffix.dic b/third_party/hunspell/tests/needaffix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix.dic
rename to third_party/hunspell/tests/needaffix.dic

diff --git a/third_party/hunspell_new/tests/needaffix.good b/third_party/hunspell/tests/needaffix.good
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix.good
rename to third_party/hunspell/tests/needaffix.good

diff --git a/third_party/hunspell_new/tests/needaffix.test b/third_party/hunspell/tests/needaffix.test
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix.test
rename to third_party/hunspell/tests/needaffix.test

diff --git a/third_party/hunspell_new/tests/needaffix.wrong b/third_party/hunspell/tests/needaffix.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix.wrong
rename to third_party/hunspell/tests/needaffix.wrong

diff --git a/third_party/hunspell_new/tests/needaffix2.aff b/third_party/hunspell/tests/needaffix2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix2.aff
rename to third_party/hunspell/tests/needaffix2.aff

diff --git a/third_party/hunspell_new/tests/needaffix2.dic b/third_party/hunspell/tests/needaffix2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix2.dic
rename to third_party/hunspell/tests/needaffix2.dic

diff --git a/third_party/hunspell_new/tests/needaffix2.good b/third_party/hunspell/tests/needaffix2.good
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix2.good
rename to third_party/hunspell/tests/needaffix2.good

diff --git a/third_party/hunspell_new/tests/needaffix2.morph b/third_party/hunspell/tests/needaffix2.morph
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix2.morph
rename to third_party/hunspell/tests/needaffix2.morph

diff --git a/third_party/hunspell_new/tests/needaffix2.test b/third_party/hunspell/tests/needaffix2.test
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix2.test
rename to third_party/hunspell/tests/needaffix2.test

diff --git a/third_party/hunspell_new/tests/needaffix3.aff b/third_party/hunspell/tests/needaffix3.aff
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix3.aff
rename to third_party/hunspell/tests/needaffix3.aff

diff --git a/third_party/hunspell_new/tests/needaffix3.dic b/third_party/hunspell/tests/needaffix3.dic
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix3.dic
rename to third_party/hunspell/tests/needaffix3.dic

diff --git a/third_party/hunspell_new/tests/needaffix3.good b/third_party/hunspell/tests/needaffix3.good
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix3.good
rename to third_party/hunspell/tests/needaffix3.good

diff --git a/third_party/hunspell_new/tests/needaffix3.test b/third_party/hunspell/tests/needaffix3.test
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix3.test
rename to third_party/hunspell/tests/needaffix3.test

diff --git a/third_party/hunspell_new/tests/needaffix3.wrong b/third_party/hunspell/tests/needaffix3.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix3.wrong
rename to third_party/hunspell/tests/needaffix3.wrong

diff --git a/third_party/hunspell_new/tests/needaffix4.aff b/third_party/hunspell/tests/needaffix4.aff
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix4.aff
rename to third_party/hunspell/tests/needaffix4.aff

diff --git a/third_party/hunspell_new/tests/needaffix4.dic b/third_party/hunspell/tests/needaffix4.dic
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix4.dic
rename to third_party/hunspell/tests/needaffix4.dic

diff --git a/third_party/hunspell_new/tests/needaffix4.good b/third_party/hunspell/tests/needaffix4.good
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix4.good
rename to third_party/hunspell/tests/needaffix4.good

diff --git a/third_party/hunspell_new/tests/needaffix4.test b/third_party/hunspell/tests/needaffix4.test
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix4.test
rename to third_party/hunspell/tests/needaffix4.test

diff --git a/third_party/hunspell_new/tests/needaffix5.aff b/third_party/hunspell/tests/needaffix5.aff
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix5.aff
rename to third_party/hunspell/tests/needaffix5.aff

diff --git a/third_party/hunspell_new/tests/needaffix5.dic b/third_party/hunspell/tests/needaffix5.dic
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix5.dic
rename to third_party/hunspell/tests/needaffix5.dic

diff --git a/third_party/hunspell_new/tests/needaffix5.good b/third_party/hunspell/tests/needaffix5.good
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix5.good
rename to third_party/hunspell/tests/needaffix5.good

diff --git a/third_party/hunspell_new/tests/needaffix5.test b/third_party/hunspell/tests/needaffix5.test
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix5.test
rename to third_party/hunspell/tests/needaffix5.test

diff --git a/third_party/hunspell_new/tests/needaffix5.wrong b/third_party/hunspell/tests/needaffix5.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/needaffix5.wrong
rename to third_party/hunspell/tests/needaffix5.wrong

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.aff b/third_party/hunspell/tests/ngram_utf_fix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.aff
rename to third_party/hunspell/tests/ngram_utf_fix.aff

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.dic b/third_party/hunspell/tests/ngram_utf_fix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.dic
rename to third_party/hunspell/tests/ngram_utf_fix.dic

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.good b/third_party/hunspell/tests/ngram_utf_fix.good
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.good
rename to third_party/hunspell/tests/ngram_utf_fix.good

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.sug b/third_party/hunspell/tests/ngram_utf_fix.sug
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.sug
rename to third_party/hunspell/tests/ngram_utf_fix.sug

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.test b/third_party/hunspell/tests/ngram_utf_fix.test
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.test
rename to third_party/hunspell/tests/ngram_utf_fix.test

diff --git a/third_party/hunspell_new/tests/ngram_utf_fix.wrong b/third_party/hunspell/tests/ngram_utf_fix.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/ngram_utf_fix.wrong
rename to third_party/hunspell/tests/ngram_utf_fix.wrong

diff --git a/third_party/hunspell_new/tests/nosuggest.aff b/third_party/hunspell/tests/nosuggest.aff
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.aff
rename to third_party/hunspell/tests/nosuggest.aff

diff --git a/third_party/hunspell_new/tests/nosuggest.dic b/third_party/hunspell/tests/nosuggest.dic
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.dic
rename to third_party/hunspell/tests/nosuggest.dic

diff --git a/third_party/hunspell_new/tests/nosuggest.good b/third_party/hunspell/tests/nosuggest.good
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.good
rename to third_party/hunspell/tests/nosuggest.good

diff --git a/third_party/hunspell_new/tests/nosuggest.sug b/third_party/hunspell/tests/nosuggest.sug
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.sug
rename to third_party/hunspell/tests/nosuggest.sug

diff --git a/third_party/hunspell_new/tests/nosuggest.test b/third_party/hunspell/tests/nosuggest.test
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.test
rename to third_party/hunspell/tests/nosuggest.test

diff --git a/third_party/hunspell_new/tests/nosuggest.wrong b/third_party/hunspell/tests/nosuggest.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/nosuggest.wrong
rename to third_party/hunspell/tests/nosuggest.wrong

diff --git a/third_party/hunspell_new/tests/oconv.aff b/third_party/hunspell/tests/oconv.aff
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.aff
rename to third_party/hunspell/tests/oconv.aff

diff --git a/third_party/hunspell_new/tests/oconv.dic b/third_party/hunspell/tests/oconv.dic
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.dic
rename to third_party/hunspell/tests/oconv.dic

diff --git a/third_party/hunspell_new/tests/oconv.good b/third_party/hunspell/tests/oconv.good
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.good
rename to third_party/hunspell/tests/oconv.good

diff --git a/third_party/hunspell_new/tests/oconv.sug b/third_party/hunspell/tests/oconv.sug
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.sug
rename to third_party/hunspell/tests/oconv.sug

diff --git a/third_party/hunspell_new/tests/oconv.test b/third_party/hunspell/tests/oconv.test
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.test
rename to third_party/hunspell/tests/oconv.test

diff --git a/third_party/hunspell_new/tests/oconv.wrong b/third_party/hunspell/tests/oconv.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/oconv.wrong
rename to third_party/hunspell/tests/oconv.wrong

diff --git a/third_party/hunspell_new/tests/onlyincompound.aff b/third_party/hunspell/tests/onlyincompound.aff
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.aff
rename to third_party/hunspell/tests/onlyincompound.aff

diff --git a/third_party/hunspell_new/tests/onlyincompound.dic b/third_party/hunspell/tests/onlyincompound.dic
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.dic
rename to third_party/hunspell/tests/onlyincompound.dic

diff --git a/third_party/hunspell_new/tests/onlyincompound.good b/third_party/hunspell/tests/onlyincompound.good
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.good
rename to third_party/hunspell/tests/onlyincompound.good

diff --git a/third_party/hunspell_new/tests/onlyincompound.sug b/third_party/hunspell/tests/onlyincompound.sug
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.sug
rename to third_party/hunspell/tests/onlyincompound.sug

diff --git a/third_party/hunspell_new/tests/onlyincompound.test b/third_party/hunspell/tests/onlyincompound.test
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.test
rename to third_party/hunspell/tests/onlyincompound.test

diff --git a/third_party/hunspell_new/tests/onlyincompound.wrong b/third_party/hunspell/tests/onlyincompound.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/onlyincompound.wrong
rename to third_party/hunspell/tests/onlyincompound.wrong

diff --git a/third_party/hunspell_new/tests/phone.aff b/third_party/hunspell/tests/phone.aff
similarity index 100%
rename from third_party/hunspell_new/tests/phone.aff
rename to third_party/hunspell/tests/phone.aff

diff --git a/third_party/hunspell_new/tests/phone.dic b/third_party/hunspell/tests/phone.dic
similarity index 100%
rename from third_party/hunspell_new/tests/phone.dic
rename to third_party/hunspell/tests/phone.dic

diff --git a/third_party/hunspell_new/tests/phone.sug b/third_party/hunspell/tests/phone.sug
similarity index 100%
rename from third_party/hunspell_new/tests/phone.sug
rename to third_party/hunspell/tests/phone.sug

diff --git a/third_party/hunspell_new/tests/phone.test b/third_party/hunspell/tests/phone.test
similarity index 100%
rename from third_party/hunspell_new/tests/phone.test
rename to third_party/hunspell/tests/phone.test

diff --git a/third_party/hunspell_new/tests/phone.wrong b/third_party/hunspell/tests/phone.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/phone.wrong
rename to third_party/hunspell/tests/phone.wrong

diff --git a/third_party/hunspell_new/tests/rep.aff b/third_party/hunspell/tests/rep.aff
similarity index 100%
rename from third_party/hunspell_new/tests/rep.aff
rename to third_party/hunspell/tests/rep.aff

diff --git a/third_party/hunspell_new/tests/rep.dic b/third_party/hunspell/tests/rep.dic
similarity index 100%
rename from third_party/hunspell_new/tests/rep.dic
rename to third_party/hunspell/tests/rep.dic

diff --git a/third_party/hunspell_new/tests/rep.sug b/third_party/hunspell/tests/rep.sug
similarity index 100%
rename from third_party/hunspell_new/tests/rep.sug
rename to third_party/hunspell/tests/rep.sug

diff --git a/third_party/hunspell_new/tests/rep.test b/third_party/hunspell/tests/rep.test
similarity index 100%
rename from third_party/hunspell_new/tests/rep.test
rename to third_party/hunspell/tests/rep.test

diff --git a/third_party/hunspell_new/tests/rep.wrong b/third_party/hunspell/tests/rep.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/rep.wrong
rename to third_party/hunspell/tests/rep.wrong

diff --git a/third_party/hunspell_new/tests/reputf.aff b/third_party/hunspell/tests/reputf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/reputf.aff
rename to third_party/hunspell/tests/reputf.aff

diff --git a/third_party/hunspell_new/tests/reputf.dic b/third_party/hunspell/tests/reputf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/reputf.dic
rename to third_party/hunspell/tests/reputf.dic

diff --git a/third_party/hunspell_new/tests/reputf.sug b/third_party/hunspell/tests/reputf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/reputf.sug
rename to third_party/hunspell/tests/reputf.sug

diff --git a/third_party/hunspell_new/tests/reputf.test b/third_party/hunspell/tests/reputf.test
similarity index 100%
rename from third_party/hunspell_new/tests/reputf.test
rename to third_party/hunspell/tests/reputf.test

diff --git a/third_party/hunspell_new/tests/reputf.wrong b/third_party/hunspell/tests/reputf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/reputf.wrong
rename to third_party/hunspell/tests/reputf.wrong

diff --git a/third_party/hunspell_new/tests/simplifiedtriple.aff b/third_party/hunspell/tests/simplifiedtriple.aff
similarity index 100%
rename from third_party/hunspell_new/tests/simplifiedtriple.aff
rename to third_party/hunspell/tests/simplifiedtriple.aff

diff --git a/third_party/hunspell_new/tests/simplifiedtriple.dic b/third_party/hunspell/tests/simplifiedtriple.dic
similarity index 100%
rename from third_party/hunspell_new/tests/simplifiedtriple.dic
rename to third_party/hunspell/tests/simplifiedtriple.dic

diff --git a/third_party/hunspell_new/tests/simplifiedtriple.good b/third_party/hunspell/tests/simplifiedtriple.good
similarity index 100%
rename from third_party/hunspell_new/tests/simplifiedtriple.good
rename to third_party/hunspell/tests/simplifiedtriple.good

diff --git a/third_party/hunspell_new/tests/simplifiedtriple.test b/third_party/hunspell/tests/simplifiedtriple.test
similarity index 100%
rename from third_party/hunspell_new/tests/simplifiedtriple.test
rename to third_party/hunspell/tests/simplifiedtriple.test

diff --git a/third_party/hunspell_new/tests/simplifiedtriple.wrong b/third_party/hunspell/tests/simplifiedtriple.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/simplifiedtriple.wrong
rename to third_party/hunspell/tests/simplifiedtriple.wrong

diff --git a/third_party/hunspell_new/tests/slash.aff b/third_party/hunspell/tests/slash.aff
similarity index 100%
rename from third_party/hunspell_new/tests/slash.aff
rename to third_party/hunspell/tests/slash.aff

diff --git a/third_party/hunspell_new/tests/slash.dic b/third_party/hunspell/tests/slash.dic
similarity index 100%
rename from third_party/hunspell_new/tests/slash.dic
rename to third_party/hunspell/tests/slash.dic

diff --git a/third_party/hunspell_new/tests/slash.good b/third_party/hunspell/tests/slash.good
similarity index 100%
rename from third_party/hunspell_new/tests/slash.good
rename to third_party/hunspell/tests/slash.good

diff --git a/third_party/hunspell_new/tests/slash.test b/third_party/hunspell/tests/slash.test
similarity index 100%
rename from third_party/hunspell_new/tests/slash.test
rename to third_party/hunspell/tests/slash.test

diff --git a/third_party/hunspell_new/tests/sug.aff b/third_party/hunspell/tests/sug.aff
similarity index 100%
rename from third_party/hunspell_new/tests/sug.aff
rename to third_party/hunspell/tests/sug.aff

diff --git a/third_party/hunspell_new/tests/sug.dic b/third_party/hunspell/tests/sug.dic
similarity index 100%
rename from third_party/hunspell_new/tests/sug.dic
rename to third_party/hunspell/tests/sug.dic

diff --git a/third_party/hunspell_new/tests/sug.sug b/third_party/hunspell/tests/sug.sug
similarity index 100%
rename from third_party/hunspell_new/tests/sug.sug
rename to third_party/hunspell/tests/sug.sug

diff --git a/third_party/hunspell_new/tests/sug.test b/third_party/hunspell/tests/sug.test
similarity index 100%
rename from third_party/hunspell_new/tests/sug.test
rename to third_party/hunspell/tests/sug.test

diff --git a/third_party/hunspell_new/tests/sug.wrong b/third_party/hunspell/tests/sug.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/sug.wrong
rename to third_party/hunspell/tests/sug.wrong

diff --git a/third_party/hunspell_new/tests/suggestiontest/List_of_common_misspellings.txt b/third_party/hunspell/tests/suggestiontest/List_of_common_misspellings.txt
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/List_of_common_misspellings.txt
rename to third_party/hunspell/tests/suggestiontest/List_of_common_misspellings.txt

diff --git a/third_party/hunspell_new/tests/suggestiontest/Makefile.am b/third_party/hunspell/tests/suggestiontest/Makefile.am
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/Makefile.am
rename to third_party/hunspell/tests/suggestiontest/Makefile.am

diff --git a/third_party/hunspell_new/tests/suggestiontest/Makefile.in b/third_party/hunspell/tests/suggestiontest/Makefile.in
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/Makefile.in
rename to third_party/hunspell/tests/suggestiontest/Makefile.in

diff --git a/third_party/hunspell_new/tests/suggestiontest/README b/third_party/hunspell/tests/suggestiontest/README
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/README
rename to third_party/hunspell/tests/suggestiontest/README

diff --git a/third_party/hunspell_new/tests/suggestiontest/prepare b/third_party/hunspell/tests/suggestiontest/prepare
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/prepare
rename to third_party/hunspell/tests/suggestiontest/prepare

diff --git a/third_party/hunspell_new/tests/suggestiontest/test b/third_party/hunspell/tests/suggestiontest/test
similarity index 100%
rename from third_party/hunspell_new/tests/suggestiontest/test
rename to third_party/hunspell/tests/suggestiontest/test

diff --git a/third_party/hunspell_new/tests/sugutf.aff b/third_party/hunspell/tests/sugutf.aff
similarity index 100%
rename from third_party/hunspell_new/tests/sugutf.aff
rename to third_party/hunspell/tests/sugutf.aff

diff --git a/third_party/hunspell_new/tests/sugutf.dic b/third_party/hunspell/tests/sugutf.dic
similarity index 100%
rename from third_party/hunspell_new/tests/sugutf.dic
rename to third_party/hunspell/tests/sugutf.dic

diff --git a/third_party/hunspell_new/tests/sugutf.sug b/third_party/hunspell/tests/sugutf.sug
similarity index 100%
rename from third_party/hunspell_new/tests/sugutf.sug
rename to third_party/hunspell/tests/sugutf.sug

diff --git a/third_party/hunspell_new/tests/sugutf.test b/third_party/hunspell/tests/sugutf.test
similarity index 100%
rename from third_party/hunspell_new/tests/sugutf.test
rename to third_party/hunspell/tests/sugutf.test

diff --git a/third_party/hunspell_new/tests/sugutf.wrong b/third_party/hunspell/tests/sugutf.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/sugutf.wrong
rename to third_party/hunspell/tests/sugutf.wrong

diff --git a/third_party/hunspell_new/tests/test.sh b/third_party/hunspell/tests/test.sh
similarity index 100%
rename from third_party/hunspell_new/tests/test.sh
rename to third_party/hunspell/tests/test.sh

diff --git a/third_party/hunspell_new/tests/utf8.aff b/third_party/hunspell/tests/utf8.aff
similarity index 100%
rename from third_party/hunspell_new/tests/utf8.aff
rename to third_party/hunspell/tests/utf8.aff

diff --git a/third_party/hunspell_new/tests/utf8.dic b/third_party/hunspell/tests/utf8.dic
similarity index 100%
rename from third_party/hunspell_new/tests/utf8.dic
rename to third_party/hunspell/tests/utf8.dic

diff --git a/third_party/hunspell_new/tests/utf8.good b/third_party/hunspell/tests/utf8.good
similarity index 100%
rename from third_party/hunspell_new/tests/utf8.good
rename to third_party/hunspell/tests/utf8.good

diff --git a/third_party/hunspell_new/tests/utf8.test b/third_party/hunspell/tests/utf8.test
similarity index 100%
rename from third_party/hunspell_new/tests/utf8.test
rename to third_party/hunspell/tests/utf8.test

diff --git a/third_party/hunspell_new/tests/utf8_bom.aff b/third_party/hunspell/tests/utf8_bom.aff
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom.aff
rename to third_party/hunspell/tests/utf8_bom.aff

diff --git a/third_party/hunspell_new/tests/utf8_bom.dic b/third_party/hunspell/tests/utf8_bom.dic
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom.dic
rename to third_party/hunspell/tests/utf8_bom.dic

diff --git a/third_party/hunspell_new/tests/utf8_bom.good b/third_party/hunspell/tests/utf8_bom.good
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom.good
rename to third_party/hunspell/tests/utf8_bom.good

diff --git a/third_party/hunspell_new/tests/utf8_bom.test b/third_party/hunspell/tests/utf8_bom.test
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom.test
rename to third_party/hunspell/tests/utf8_bom.test

diff --git a/third_party/hunspell_new/tests/utf8_bom2.aff b/third_party/hunspell/tests/utf8_bom2.aff
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom2.aff
rename to third_party/hunspell/tests/utf8_bom2.aff

diff --git a/third_party/hunspell_new/tests/utf8_bom2.dic b/third_party/hunspell/tests/utf8_bom2.dic
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom2.dic
rename to third_party/hunspell/tests/utf8_bom2.dic

diff --git a/third_party/hunspell_new/tests/utf8_bom2.good b/third_party/hunspell/tests/utf8_bom2.good
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom2.good
rename to third_party/hunspell/tests/utf8_bom2.good

diff --git a/third_party/hunspell_new/tests/utf8_bom2.test b/third_party/hunspell/tests/utf8_bom2.test
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_bom2.test
rename to third_party/hunspell/tests/utf8_bom2.test

diff --git a/third_party/hunspell_new/tests/utf8_nonbmp.aff b/third_party/hunspell/tests/utf8_nonbmp.aff
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_nonbmp.aff
rename to third_party/hunspell/tests/utf8_nonbmp.aff

diff --git a/third_party/hunspell_new/tests/utf8_nonbmp.dic b/third_party/hunspell/tests/utf8_nonbmp.dic
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_nonbmp.dic
rename to third_party/hunspell/tests/utf8_nonbmp.dic

diff --git a/third_party/hunspell_new/tests/utf8_nonbmp.good b/third_party/hunspell/tests/utf8_nonbmp.good
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_nonbmp.good
rename to third_party/hunspell/tests/utf8_nonbmp.good

diff --git a/third_party/hunspell_new/tests/utf8_nonbmp.test b/third_party/hunspell/tests/utf8_nonbmp.test
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_nonbmp.test
rename to third_party/hunspell/tests/utf8_nonbmp.test

diff --git a/third_party/hunspell_new/tests/utf8_nonbmp.wrong b/third_party/hunspell/tests/utf8_nonbmp.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/utf8_nonbmp.wrong
rename to third_party/hunspell/tests/utf8_nonbmp.wrong

diff --git a/third_party/hunspell_new/tests/utfcompound.aff b/third_party/hunspell/tests/utfcompound.aff
similarity index 100%
rename from third_party/hunspell_new/tests/utfcompound.aff
rename to third_party/hunspell/tests/utfcompound.aff

diff --git a/third_party/hunspell_new/tests/utfcompound.dic b/third_party/hunspell/tests/utfcompound.dic
similarity index 100%
rename from third_party/hunspell_new/tests/utfcompound.dic
rename to third_party/hunspell/tests/utfcompound.dic

diff --git a/third_party/hunspell_new/tests/utfcompound.good b/third_party/hunspell/tests/utfcompound.good
similarity index 100%
rename from third_party/hunspell_new/tests/utfcompound.good
rename to third_party/hunspell/tests/utfcompound.good

diff --git a/third_party/hunspell_new/tests/utfcompound.test b/third_party/hunspell/tests/utfcompound.test
similarity index 100%
rename from third_party/hunspell_new/tests/utfcompound.test
rename to third_party/hunspell/tests/utfcompound.test

diff --git a/third_party/hunspell_new/tests/utfcompound.wrong b/third_party/hunspell/tests/utfcompound.wrong
similarity index 100%
rename from third_party/hunspell_new/tests/utfcompound.wrong
rename to third_party/hunspell/tests/utfcompound.wrong

diff --git a/third_party/hunspell_new/tests/zeroaffix.aff b/third_party/hunspell/tests/zeroaffix.aff
similarity index 100%
rename from third_party/hunspell_new/tests/zeroaffix.aff
rename to third_party/hunspell/tests/zeroaffix.aff

diff --git a/third_party/hunspell_new/tests/zeroaffix.dic b/third_party/hunspell/tests/zeroaffix.dic
similarity index 100%
rename from third_party/hunspell_new/tests/zeroaffix.dic
rename to third_party/hunspell/tests/zeroaffix.dic

diff --git a/third_party/hunspell_new/tests/zeroaffix.good b/third_party/hunspell/tests/zeroaffix.good
similarity index 100%
rename from third_party/hunspell_new/tests/zeroaffix.good
rename to third_party/hunspell/tests/zeroaffix.good

diff --git a/third_party/hunspell_new/tests/zeroaffix.morph b/third_party/hunspell/tests/zeroaffix.morph
similarity index 100%
rename from third_party/hunspell_new/tests/zeroaffix.morph
rename to third_party/hunspell/tests/zeroaffix.morph

diff --git a/third_party/hunspell_new/tests/zeroaffix.test b/third_party/hunspell/tests/zeroaffix.test
similarity index 100%
rename from third_party/hunspell_new/tests/zeroaffix.test
rename to third_party/hunspell/tests/zeroaffix.test

diff --git a/third_party/hunspell_new/update_google_patch.sh b/third_party/hunspell/update_google_patch.sh
similarity index 100%
rename from third_party/hunspell_new/update_google_patch.sh
rename to third_party/hunspell/update_google_patch.sh

diff --git a/third_party/hunspell_new/using_hunspell.vsprops b/third_party/hunspell/using_hunspell.vsprops
similarity index 100%
rename from third_party/hunspell_new/using_hunspell.vsprops
rename to third_party/hunspell/using_hunspell.vsprops

diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index c9700ad..8a5b25b 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py

@@ -204,7 +204,7 @@
     'third_party/freetype2': [ # http://crbug.com/177319
         'UNKNOWN',
     ],
-    'third_party/hunspell_new': [  # http://crbug.com/98134
+    'third_party/hunspell': [  # http://crbug.com/98134
         'UNKNOWN',
     ],
     'third_party/iccjpeg': [  # http://crbug.com/98137