diff --git a/Source/Engine/Mandarin/Mandarin.cpp b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp
similarity index 99%
rename from Source/Engine/Mandarin/Mandarin.cpp
rename to Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp
index 3791268f..414dcce6 100644
--- a/Source/Engine/Mandarin/Mandarin.cpp
+++ b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp
@@ -1,8 +1,7 @@
 /* 
  *  Mandarin.cpp
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/Mandarin/Mandarin.h b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h
similarity index 99%
rename from Source/Engine/Mandarin/Mandarin.h
rename to Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h
index b60a4bb3..cbe4ebac 100644
--- a/Source/Engine/Mandarin/Mandarin.h
+++ b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h
@@ -1,8 +1,7 @@
 /* 
  *  Mandarin.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVAroundFilter.h b/Source/3rdParty/OpenVanilla/OVAroundFilter.h
similarity index 79%
rename from Source/Engine/OpenVanilla/OVAroundFilter.h
rename to Source/3rdParty/OpenVanilla/OVAroundFilter.h
index efd076cc..bb3516c5 100644
--- a/Source/Engine/OpenVanilla/OVAroundFilter.h
+++ b/Source/3rdParty/OpenVanilla/OVAroundFilter.h
@@ -1,8 +1,7 @@
 /* 
  *  OVAroundFilter.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVBase.h b/Source/3rdParty/OpenVanilla/OVBase.h
similarity index 71%
rename from Source/Engine/OpenVanilla/OVBase.h
rename to Source/3rdParty/OpenVanilla/OVBase.h
index dd3b3d39..857c739f 100644
--- a/Source/Engine/OpenVanilla/OVBase.h
+++ b/Source/3rdParty/OpenVanilla/OVBase.h
@@ -1,8 +1,7 @@
 /* 
  *  OVBase.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVBenchmark.h b/Source/3rdParty/OpenVanilla/OVBenchmark.h
similarity index 92%
rename from Source/Engine/OpenVanilla/OVBenchmark.h
rename to Source/3rdParty/OpenVanilla/OVBenchmark.h
index fff5363f..6af49f2e 100644
--- a/Source/Engine/OpenVanilla/OVBenchmark.h
+++ b/Source/3rdParty/OpenVanilla/OVBenchmark.h
@@ -1,8 +1,7 @@
 /* 
  *  OVBenchmark.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVCINDataTable.h b/Source/3rdParty/OpenVanilla/OVCINDataTable.h
similarity index 99%
rename from Source/Engine/OpenVanilla/OVCINDataTable.h
rename to Source/3rdParty/OpenVanilla/OVCINDataTable.h
index 99261f91..1eb7da83 100644
--- a/Source/Engine/OpenVanilla/OVCINDataTable.h
+++ b/Source/3rdParty/OpenVanilla/OVCINDataTable.h
@@ -1,8 +1,7 @@
 /* 
  *  OVCINDataTable.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVCINDatabaseService.h b/Source/3rdParty/OpenVanilla/OVCINDatabaseService.h
similarity index 97%
rename from Source/Engine/OpenVanilla/OVCINDatabaseService.h
rename to Source/3rdParty/OpenVanilla/OVCINDatabaseService.h
index 691d60aa..0112319e 100644
--- a/Source/Engine/OpenVanilla/OVCINDatabaseService.h
+++ b/Source/3rdParty/OpenVanilla/OVCINDatabaseService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVCINDatabaseService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVCINToSQLiteConvertor.h b/Source/3rdParty/OpenVanilla/OVCINToSQLiteConvertor.h
similarity index 96%
rename from Source/Engine/OpenVanilla/OVCINToSQLiteConvertor.h
rename to Source/3rdParty/OpenVanilla/OVCINToSQLiteConvertor.h
index 22e543a0..3a5112aa 100644
--- a/Source/Engine/OpenVanilla/OVCINToSQLiteConvertor.h
+++ b/Source/3rdParty/OpenVanilla/OVCINToSQLiteConvertor.h
@@ -1,8 +1,7 @@
 /* 
  *  OVCINToSQLiteConvertor.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVCandidateService.h b/Source/3rdParty/OpenVanilla/OVCandidateService.h
similarity index 97%
rename from Source/Engine/OpenVanilla/OVCandidateService.h
rename to Source/3rdParty/OpenVanilla/OVCandidateService.h
index e756b8c5..9a8d08e3 100644
--- a/Source/Engine/OpenVanilla/OVCandidateService.h
+++ b/Source/3rdParty/OpenVanilla/OVCandidateService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVCandidateService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVDatabaseService.h b/Source/3rdParty/OpenVanilla/OVDatabaseService.h
similarity index 95%
rename from Source/Engine/OpenVanilla/OVDatabaseService.h
rename to Source/3rdParty/OpenVanilla/OVDatabaseService.h
index bc4974c4..7455f541 100644
--- a/Source/Engine/OpenVanilla/OVDatabaseService.h
+++ b/Source/3rdParty/OpenVanilla/OVDatabaseService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVDatabaseService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVDateTimeHelper.h b/Source/3rdParty/OpenVanilla/OVDateTimeHelper.h
similarity index 95%
rename from Source/Engine/OpenVanilla/OVDateTimeHelper.h
rename to Source/3rdParty/OpenVanilla/OVDateTimeHelper.h
index 8a2845b9..ea140709 100644
--- a/Source/Engine/OpenVanilla/OVDateTimeHelper.h
+++ b/Source/3rdParty/OpenVanilla/OVDateTimeHelper.h
@@ -1,8 +1,7 @@
 /* 
  *  OVDateTimeHelper.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVEncodingService.h b/Source/3rdParty/OpenVanilla/OVEncodingService.h
similarity index 93%
rename from Source/Engine/OpenVanilla/OVEncodingService.h
rename to Source/3rdParty/OpenVanilla/OVEncodingService.h
index 2ccf67a6..518c9808 100644
--- a/Source/Engine/OpenVanilla/OVEncodingService.h
+++ b/Source/3rdParty/OpenVanilla/OVEncodingService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVEncodingService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVEventHandlingContext.h b/Source/3rdParty/OpenVanilla/OVEventHandlingContext.h
similarity index 95%
rename from Source/Engine/OpenVanilla/OVEventHandlingContext.h
rename to Source/3rdParty/OpenVanilla/OVEventHandlingContext.h
index 098e29ea..54c7c6fc 100644
--- a/Source/Engine/OpenVanilla/OVEventHandlingContext.h
+++ b/Source/3rdParty/OpenVanilla/OVEventHandlingContext.h
@@ -1,8 +1,7 @@
 /* 
  *  OVEventHandlingContext.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVException.h b/Source/3rdParty/OpenVanilla/OVException.h
similarity index 74%
rename from Source/Engine/OpenVanilla/OVException.h
rename to Source/3rdParty/OpenVanilla/OVException.h
index 5de3ac15..536b3363 100644
--- a/Source/Engine/OpenVanilla/OVException.h
+++ b/Source/3rdParty/OpenVanilla/OVException.h
@@ -1,8 +1,7 @@
 /* 
  *  OVException.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVFileHelper.h b/Source/3rdParty/OpenVanilla/OVFileHelper.h
similarity index 99%
rename from Source/Engine/OpenVanilla/OVFileHelper.h
rename to Source/3rdParty/OpenVanilla/OVFileHelper.h
index 715bf1c5..a630caf6 100644
--- a/Source/Engine/OpenVanilla/OVFileHelper.h
+++ b/Source/3rdParty/OpenVanilla/OVFileHelper.h
@@ -1,8 +1,7 @@
 /* 
  *  OVFileHelper.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVFrameworkInfo.h b/Source/3rdParty/OpenVanilla/OVFrameworkInfo.h
similarity index 93%
rename from Source/Engine/OpenVanilla/OVFrameworkInfo.h
rename to Source/3rdParty/OpenVanilla/OVFrameworkInfo.h
index e03455d5..b07bf703 100644
--- a/Source/Engine/OpenVanilla/OVFrameworkInfo.h
+++ b/Source/3rdParty/OpenVanilla/OVFrameworkInfo.h
@@ -1,8 +1,7 @@
 /* 
  *  OVFrameworkInfo.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVInputMethod.h b/Source/3rdParty/OpenVanilla/OVInputMethod.h
similarity index 78%
rename from Source/Engine/OpenVanilla/OVInputMethod.h
rename to Source/3rdParty/OpenVanilla/OVInputMethod.h
index 4bdaff26..600eaf41 100644
--- a/Source/Engine/OpenVanilla/OVInputMethod.h
+++ b/Source/3rdParty/OpenVanilla/OVInputMethod.h
@@ -1,8 +1,7 @@
 /* 
  *  OVInputMethod.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVKey.h b/Source/3rdParty/OpenVanilla/OVKey.h
similarity index 98%
rename from Source/Engine/OpenVanilla/OVKey.h
rename to Source/3rdParty/OpenVanilla/OVKey.h
index 083bbb97..3f3fcfb3 100644
--- a/Source/Engine/OpenVanilla/OVKey.h
+++ b/Source/3rdParty/OpenVanilla/OVKey.h
@@ -1,8 +1,7 @@
 /* 
  *  OVKey.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVKeyPreprocessor.h b/Source/3rdParty/OpenVanilla/OVKeyPreprocessor.h
similarity index 78%
rename from Source/Engine/OpenVanilla/OVKeyPreprocessor.h
rename to Source/3rdParty/OpenVanilla/OVKeyPreprocessor.h
index 2fee4042..d48990c1 100644
--- a/Source/Engine/OpenVanilla/OVKeyPreprocessor.h
+++ b/Source/3rdParty/OpenVanilla/OVKeyPreprocessor.h
@@ -1,8 +1,7 @@
 /* 
  *  OVKeyPreprocessor.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVKeyValueMap.h b/Source/3rdParty/OpenVanilla/OVKeyValueMap.h
similarity index 97%
rename from Source/Engine/OpenVanilla/OVKeyValueMap.h
rename to Source/3rdParty/OpenVanilla/OVKeyValueMap.h
index e520569a..241379b8 100644
--- a/Source/Engine/OpenVanilla/OVKeyValueMap.h
+++ b/Source/3rdParty/OpenVanilla/OVKeyValueMap.h
@@ -1,8 +1,7 @@
 /* 
  *  OVKeyValueMap.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVLoaderBase.h b/Source/3rdParty/OpenVanilla/OVLoaderBase.h
similarity index 83%
rename from Source/Engine/OpenVanilla/OVLoaderBase.h
rename to Source/3rdParty/OpenVanilla/OVLoaderBase.h
index a4cea581..cf2b0614 100644
--- a/Source/Engine/OpenVanilla/OVLoaderBase.h
+++ b/Source/3rdParty/OpenVanilla/OVLoaderBase.h
@@ -1,8 +1,7 @@
 /* 
  *  OVLoaderBase.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVLoaderService.h b/Source/3rdParty/OpenVanilla/OVLoaderService.h
similarity index 96%
rename from Source/Engine/OpenVanilla/OVLoaderService.h
rename to Source/3rdParty/OpenVanilla/OVLoaderService.h
index 37154776..e0e63b6b 100644
--- a/Source/Engine/OpenVanilla/OVLoaderService.h
+++ b/Source/3rdParty/OpenVanilla/OVLoaderService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVLoaderService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVLocalization.h b/Source/3rdParty/OpenVanilla/OVLocalization.h
similarity index 95%
rename from Source/Engine/OpenVanilla/OVLocalization.h
rename to Source/3rdParty/OpenVanilla/OVLocalization.h
index d220fa4e..329052e5 100644
--- a/Source/Engine/OpenVanilla/OVLocalization.h
+++ b/Source/3rdParty/OpenVanilla/OVLocalization.h
@@ -1,8 +1,7 @@
 /* 
  *  OVLocalization.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVModule.h b/Source/3rdParty/OpenVanilla/OVModule.h
similarity index 95%
rename from Source/Engine/OpenVanilla/OVModule.h
rename to Source/3rdParty/OpenVanilla/OVModule.h
index fc9ea31f..bd90536c 100644
--- a/Source/Engine/OpenVanilla/OVModule.h
+++ b/Source/3rdParty/OpenVanilla/OVModule.h
@@ -1,8 +1,7 @@
 /* 
  *  OVModule.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVModulePackage.h b/Source/3rdParty/OpenVanilla/OVModulePackage.h
similarity index 93%
rename from Source/Engine/OpenVanilla/OVModulePackage.h
rename to Source/3rdParty/OpenVanilla/OVModulePackage.h
index 5110306e..e94657f7 100644
--- a/Source/Engine/OpenVanilla/OVModulePackage.h
+++ b/Source/3rdParty/OpenVanilla/OVModulePackage.h
@@ -1,8 +1,7 @@
 /* 
  *  OVModulePackage.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVOutputFilter.h b/Source/3rdParty/OpenVanilla/OVOutputFilter.h
similarity index 78%
rename from Source/Engine/OpenVanilla/OVOutputFilter.h
rename to Source/3rdParty/OpenVanilla/OVOutputFilter.h
index 1ec4f820..f0c4583b 100644
--- a/Source/Engine/OpenVanilla/OVOutputFilter.h
+++ b/Source/3rdParty/OpenVanilla/OVOutputFilter.h
@@ -1,8 +1,7 @@
 /* 
  *  OVOutputFilter.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVPathInfo.h b/Source/3rdParty/OpenVanilla/OVPathInfo.h
similarity index 89%
rename from Source/Engine/OpenVanilla/OVPathInfo.h
rename to Source/3rdParty/OpenVanilla/OVPathInfo.h
index b49602c7..cce07863 100644
--- a/Source/Engine/OpenVanilla/OVPathInfo.h
+++ b/Source/3rdParty/OpenVanilla/OVPathInfo.h
@@ -1,8 +1,7 @@
 /* 
  *  OVPathInfo.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVSQLiteDatabaseService.h b/Source/3rdParty/OpenVanilla/OVSQLiteDatabaseService.h
similarity index 98%
rename from Source/Engine/OpenVanilla/OVSQLiteDatabaseService.h
rename to Source/3rdParty/OpenVanilla/OVSQLiteDatabaseService.h
index 8222a0ab..7a1beb0a 100644
--- a/Source/Engine/OpenVanilla/OVSQLiteDatabaseService.h
+++ b/Source/3rdParty/OpenVanilla/OVSQLiteDatabaseService.h
@@ -1,8 +1,7 @@
 /* 
  *  OVSQLiteDatabaseService.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVSQLiteWrapper.h b/Source/3rdParty/OpenVanilla/OVSQLiteWrapper.h
similarity index 98%
rename from Source/Engine/OpenVanilla/OVSQLiteWrapper.h
rename to Source/3rdParty/OpenVanilla/OVSQLiteWrapper.h
index 24322617..c00dba57 100644
--- a/Source/Engine/OpenVanilla/OVSQLiteWrapper.h
+++ b/Source/3rdParty/OpenVanilla/OVSQLiteWrapper.h
@@ -1,8 +1,7 @@
 /* 
  *  OVSQLiteWrapper.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVStringHelper.h b/Source/3rdParty/OpenVanilla/OVStringHelper.h
similarity index 97%
rename from Source/Engine/OpenVanilla/OVStringHelper.h
rename to Source/3rdParty/OpenVanilla/OVStringHelper.h
index ee130e22..3bf74046 100644
--- a/Source/Engine/OpenVanilla/OVStringHelper.h
+++ b/Source/3rdParty/OpenVanilla/OVStringHelper.h
@@ -1,8 +1,7 @@
 /* 
  *  OVStringHelper.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVTextBuffer.h b/Source/3rdParty/OpenVanilla/OVTextBuffer.h
similarity index 96%
rename from Source/Engine/OpenVanilla/OVTextBuffer.h
rename to Source/3rdParty/OpenVanilla/OVTextBuffer.h
index 8a796339..46fc4a5b 100644
--- a/Source/Engine/OpenVanilla/OVTextBuffer.h
+++ b/Source/3rdParty/OpenVanilla/OVTextBuffer.h
@@ -1,8 +1,7 @@
 /* 
  *  OVTextBuffer.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVUTF8Helper.h b/Source/3rdParty/OpenVanilla/OVUTF8Helper.h
similarity index 98%
rename from Source/Engine/OpenVanilla/OVUTF8Helper.h
rename to Source/3rdParty/OpenVanilla/OVUTF8Helper.h
index 51709e7d..53e70d1c 100644
--- a/Source/Engine/OpenVanilla/OVUTF8Helper.h
+++ b/Source/3rdParty/OpenVanilla/OVUTF8Helper.h
@@ -1,8 +1,7 @@
 /* 
  *  OVUTF8Helper.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OVWildcard.h b/Source/3rdParty/OpenVanilla/OVWildcard.h
similarity index 98%
rename from Source/Engine/OpenVanilla/OVWildcard.h
rename to Source/3rdParty/OpenVanilla/OVWildcard.h
index 1da05ea0..b8cf2abb 100644
--- a/Source/Engine/OpenVanilla/OVWildcard.h
+++ b/Source/3rdParty/OpenVanilla/OVWildcard.h
@@ -1,8 +1,7 @@
 /* 
  *  OVWildcard.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/Source/Engine/OpenVanilla/OpenVanilla.h b/Source/3rdParty/OpenVanilla/OpenVanilla.h
similarity index 94%
rename from Source/Engine/OpenVanilla/OpenVanilla.h
rename to Source/3rdParty/OpenVanilla/OpenVanilla.h
index d6ed383a..816fe3d5 100644
--- a/Source/Engine/OpenVanilla/OpenVanilla.h
+++ b/Source/3rdParty/OpenVanilla/OpenVanilla.h
@@ -1,8 +1,7 @@
 /* 
  *  OpenVanilla.h
  *  
- *  Copyright 2021-2022 vChewing Project (3-Clause BSD License).
- *  Derived from 2011-2022 OpenVanilla Project (MIT License).
+ *  Copyright 2011-2022 OpenVanilla Project (MIT License).
  *  Some rights reserved. See "LICENSE.TXT" for details.
  */
 
diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj
index 4b401bef..f5ed9060 100644
--- a/vChewing.xcodeproj/project.pbxproj
+++ b/vChewing.xcodeproj/project.pbxproj
@@ -324,6 +324,7 @@
 		5BDD25E0279D64FB00AA18F8 /* 3rdParty */ = {
 			isa = PBXGroup;
 			children = (
+				6A0D4F2215FC0EB100ABF4B3 /* OpenVanilla */,
 				5BDD25E1279D64FB00AA18F8 /* AWFileHash */,
 				5BDD25E4279D64FB00AA18F8 /* SSZipArchive */,
 			);
@@ -480,8 +481,6 @@
 				5BC2D2832793B434002C0BEC /* vChewing */,
 				5BA8DAFE27928120009C9FFF /* LanguageModel */,
 				6A0D4F1315FC0EB100ABF4B3 /* Gramambular */,
-				6A0D4F1F15FC0EB100ABF4B3 /* Mandarin */,
-				6A0D4F2215FC0EB100ABF4B3 /* OpenVanilla */,
 			);
 			path = Engine;
 			sourceTree = "<group>";
@@ -516,6 +515,7 @@
 		6A0D4F2215FC0EB100ABF4B3 /* OpenVanilla */ = {
 			isa = PBXGroup;
 			children = (
+				6A0D4F1F15FC0EB100ABF4B3 /* Mandarin */,
 				6A0D4F2315FC0EB100ABF4B3 /* OpenVanilla.h */,
 				6A0D4F2415FC0EB100ABF4B3 /* OVAroundFilter.h */,
 				6A0D4F2515FC0EB100ABF4B3 /* OVBase.h */,