diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 44474df46..b0ddfda41 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -46,10 +46,10 @@ LATIN_IME_JNI_SRC_FILES := \
     jni_common.cpp
 
 LATIN_IME_CORE_SRC_FILES := \
-    correction.cpp \
-    unigram_dictionary.cpp \
     suggest/core/suggest.cpp \
     $(addprefix obsolete/, \
+        correction.cpp \
+        unigram_dictionary.cpp \
         words_priority_queue.cpp) \
     $(addprefix suggest/core/dicnode/, \
         dic_node.cpp \
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 935cb0daa..34764c337 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -31,9 +31,9 @@
 
 #include "com_android_inputmethod_latin_BinaryDictionary.h"
 
-#include "correction.h"
 #include "jni.h"
 #include "jni_common.h"
+#include "obsolete/correction.h"
 #include "suggest/core/dictionary/binary_dictionary_format.h"
 #include "suggest/core/dictionary/binary_dictionary_info.h"
 #include "suggest/core/dictionary/dictionary.h"
diff --git a/native/jni/src/correction.cpp b/native/jni/src/obsolete/correction.cpp
similarity index 99%
rename from native/jni/src/correction.cpp
rename to native/jni/src/obsolete/correction.cpp
index feed5622b..e6c577f85 100644
--- a/native/jni/src/correction.cpp
+++ b/native/jni/src/obsolete/correction.cpp
@@ -18,8 +18,8 @@
 
 #include <cmath>
 
-#include "correction.h"
 #include "defines.h"
+#include "obsolete/correction.h"
 #include "suggest/core/layout/proximity_info_state.h"
 #include "suggest/core/layout/touch_position_correction_utils.h"
 #include "suggest/policyimpl/utils/edit_distance.h"
diff --git a/native/jni/src/correction.h b/native/jni/src/obsolete/correction.h
similarity index 99%
rename from native/jni/src/correction.h
rename to native/jni/src/obsolete/correction.h
index 84d6429ba..710220d66 100644
--- a/native/jni/src/correction.h
+++ b/native/jni/src/obsolete/correction.h
@@ -19,8 +19,8 @@
 
 #include <cstring> // for memset()
 
-#include "correction_state.h"
 #include "defines.h"
+#include "obsolete/correction_state.h"
 #include "suggest/core/layout/proximity_info_state.h"
 #include "utils/char_utils.h"
 
diff --git a/native/jni/src/correction_state.h b/native/jni/src/obsolete/correction_state.h
similarity index 100%
rename from native/jni/src/correction_state.h
rename to native/jni/src/obsolete/correction_state.h
diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/obsolete/unigram_dictionary.cpp
similarity index 99%
rename from native/jni/src/unigram_dictionary.cpp
rename to native/jni/src/obsolete/unigram_dictionary.cpp
index 39b3d4918..df6d425d3 100644
--- a/native/jni/src/unigram_dictionary.cpp
+++ b/native/jni/src/obsolete/unigram_dictionary.cpp
@@ -19,6 +19,7 @@
 #define LOG_TAG "LatinIME: unigram_dictionary.cpp"
 
 #include "defines.h"
+#include "obsolete/unigram_dictionary.h"
 #include "obsolete/words_priority_queue.h"
 #include "obsolete/words_priority_queue_pool.h"
 #include "suggest/core/dictionary/binary_dictionary_info.h"
@@ -29,7 +30,6 @@
 #include "suggest/core/dictionary/terminal_attributes.h"
 #include "suggest/core/layout/proximity_info.h"
 #include "utils/char_utils.h"
-#include "unigram_dictionary.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/unigram_dictionary.h b/native/jni/src/obsolete/unigram_dictionary.h
similarity index 100%
rename from native/jni/src/unigram_dictionary.h
rename to native/jni/src/obsolete/unigram_dictionary.h
diff --git a/native/jni/src/obsolete/words_priority_queue.h b/native/jni/src/obsolete/words_priority_queue.h
index 54e8007a2..337e3e32b 100644
--- a/native/jni/src/obsolete/words_priority_queue.h
+++ b/native/jni/src/obsolete/words_priority_queue.h
@@ -20,8 +20,8 @@
 #include <cstring> // for memcpy()
 #include <queue>
 
-#include "correction.h"
 #include "defines.h"
+#include "obsolete/correction.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index aa8356add..e5956c754 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include "defines.h"
+#include "obsolete/unigram_dictionary.h"
 #include "suggest/core/dictionary/bigram_dictionary.h"
 #include "suggest/core/dictionary/binary_format.h"
 #include "suggest/core/session/dic_traverse_session.h"
@@ -29,7 +30,6 @@
 #include "suggest/core/suggest_options.h"
 #include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h"
 #include "suggest/policyimpl/typing/typing_suggest_policy_factory.h"
-#include "unigram_dictionary.h"
 
 namespace latinime {