diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 9261a9d08..a0c1c68ff 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -54,8 +54,6 @@ LATIN_IME_CORE_SRC_FILES := \
     $(addprefix suggest/core/dictionary/, \
         bigram_dictionary.cpp \
         binary_dictionary_format_utils.cpp \
-        binary_dictionary_header.cpp \
-        binary_dictionary_header_reading_utils.cpp \
         bloom_filter.cpp \
         byte_array_utils.cpp \
         dictionary.cpp \
@@ -71,6 +69,8 @@ LATIN_IME_CORE_SRC_FILES := \
     suggest/core/session/dic_traverse_session.cpp \
     $(addprefix suggest/policyimpl/dictionary/, \
         bigram/bigram_list_reading_utils.cpp \
+        header/header_policy.cpp \
+        header/header_reading_utils.cpp \
         shortcut/shortcut_list_reading_utils.cpp \
         dictionary_structure_with_buffer_policy_factory.cpp \
         dynamic_patricia_trie_node_reader.cpp \
diff --git a/native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h b/native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h
index 80ccbdc0f..56475b137 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h
@@ -20,9 +20,9 @@
 #include <stdint.h>
 
 #include "defines.h"
-#include "suggest/core/dictionary/binary_dictionary_header.h"
 #include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
 #include "suggest/policyimpl/dictionary/bigram/bigram_list_policy.h"
+#include "suggest/policyimpl/dictionary/header/header_policy.h"
 #include "suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h"
 
 namespace latinime {
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
similarity index 95%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp
rename to native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
index a39ffedd5..eb828b58c 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "suggest/core/dictionary/binary_dictionary_header.h"
+#include "suggest/policyimpl/dictionary/header/header_policy.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_header.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
similarity index 96%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_header.h
rename to native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
index 0e1337291..e3e6fc077 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_header.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
@@ -21,11 +21,10 @@
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_header_structure_policy.h"
-#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"
+#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"
 
 namespace latinime {
 
-// TODO: Move to policyimpl.
 class HeaderPolicy : public DictionaryHeaderStructurePolicy {
  public:
     explicit HeaderPolicy(const uint8_t *const dictBuf)
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp
similarity index 98%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp
rename to native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp
index 2ea35bd55..70f45dfa8 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"
+#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"
 
 #include <cctype>
 #include <cstdlib>
diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h
similarity index 98%
rename from native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.h
rename to native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h
index eed8a041e..c94919640 100644
--- a/native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h
@@ -23,7 +23,6 @@
 
 namespace latinime {
 
-// TODO: Move to policyimpl.
 class HeaderReadingUtils {
  public:
     typedef uint16_t DictionaryFlags;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.h b/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.h
index 20c08b139..bebe1bfff 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.h
@@ -20,9 +20,9 @@
 #include <stdint.h>
 
 #include "defines.h"
-#include "suggest/core/dictionary/binary_dictionary_header.h"
 #include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
 #include "suggest/policyimpl/dictionary/bigram/bigram_list_policy.h"
+#include "suggest/policyimpl/dictionary/header/header_policy.h"
 #include "suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h"
 
 namespace latinime {