Move some dictionary related implementations to the dictionary directory

Change-Id: I6fe71a540ad91ca46755be234abc8894242e2413
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index ea35dab..34b3524 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -49,9 +49,7 @@
     bigram_dictionary.cpp \
     char_utils.cpp \
     correction.cpp \
-    dictionary.cpp \
     dic_traverse_wrapper.cpp \
-    digraph_utils.cpp \
     unigram_dictionary.cpp \
     words_priority_queue.cpp \
     suggest/core/suggest.cpp \
@@ -59,6 +57,9 @@
         dic_node.cpp \
         dic_node_utils.cpp \
         dic_nodes_cache.cpp) \
+    $(addprefix suggest/core/dictionary/, \
+        dictionary.cpp \
+        digraph_utils.cpp) \
     $(addprefix suggest/core/layout/, \
         additional_proximity_chars.cpp \
         proximity_info.cpp \