diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 1ba3e5ce7e..898633724d 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,22 +1,20 @@
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
 
-add_definitions(-DHAVE_MEMRCHR)
+add_library(compact_enc_det SHARED
+	src/main/jni/charset.cc
+	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
+	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
+	src/main/jni/compact_enc_det/util/encodings/encodings.cc
+	src/main/jni/compact_enc_det/util/languages/languages.cc
+)
 
-add_library( compact_enc_det
-             SHARED
-             src/main/jni/charset.cc
-             src/main/jni/compact_enc_det/compact_enc_det.cc
-             src/main/jni/compact_enc_det/compact_enc_det_hint_code.cc
-             src/main/jni/util/encodings/encodings.cc
-             src/main/jni/util/languages/languages.cc )
+include_directories(src/main/jni/compact_enc_det)
 
-include_directories( src/main/jni/ )
+find_library(log-lib log)
 
-find_library( log-lib
-              log )
+add_definitions(-DHAVE_MEMRCHR)
 
 target_compile_options(compact_enc_det PRIVATE -Wno-c++11-narrowing)
 
-target_link_libraries( compact_enc_det
-                       ${log-lib} )
+target_link_libraries(compact_enc_det ${log-lib})
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det.cc b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det.cc
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det.h b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.h
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det.h
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.h
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_fuzz_test.cc b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_fuzz_test.cc
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_fuzz_test.cc
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_fuzz_test.cc
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_generated_tables.h b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables.h
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_generated_tables.h
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables.h
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_generated_tables2.h b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables2.h
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_generated_tables2.h
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables2.h
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_hint_code.cc b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_hint_code.cc
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_hint_code.h b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.h
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_hint_code.h
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.h
diff --git a/app/src/main/jni/compact_enc_det/compact_enc_det_unittest.cc b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_unittest.cc
similarity index 100%
rename from app/src/main/jni/compact_enc_det/compact_enc_det_unittest.cc
rename to app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_unittest.cc
diff --git a/app/src/main/jni/compact_enc_det/detail_head_string.inc b/app/src/main/jni/compact_enc_det/compact_enc_det/detail_head_string.inc
similarity index 100%
rename from app/src/main/jni/compact_enc_det/detail_head_string.inc
rename to app/src/main/jni/compact_enc_det/compact_enc_det/detail_head_string.inc
diff --git a/app/src/main/jni/util/basictypes.h b/app/src/main/jni/compact_enc_det/util/basictypes.h
similarity index 100%
rename from app/src/main/jni/util/basictypes.h
rename to app/src/main/jni/compact_enc_det/util/basictypes.h
diff --git a/app/src/main/jni/util/case_insensitive_hash.h b/app/src/main/jni/compact_enc_det/util/case_insensitive_hash.h
similarity index 100%
rename from app/src/main/jni/util/case_insensitive_hash.h
rename to app/src/main/jni/compact_enc_det/util/case_insensitive_hash.h
diff --git a/app/src/main/jni/util/commandlineflags.h b/app/src/main/jni/compact_enc_det/util/commandlineflags.h
similarity index 100%
rename from app/src/main/jni/util/commandlineflags.h
rename to app/src/main/jni/compact_enc_det/util/commandlineflags.h
diff --git a/app/src/main/jni/util/encodings/encodings.cc b/app/src/main/jni/compact_enc_det/util/encodings/encodings.cc
similarity index 100%
rename from app/src/main/jni/util/encodings/encodings.cc
rename to app/src/main/jni/compact_enc_det/util/encodings/encodings.cc
diff --git a/app/src/main/jni/util/encodings/encodings.h b/app/src/main/jni/compact_enc_det/util/encodings/encodings.h
similarity index 100%
rename from app/src/main/jni/util/encodings/encodings.h
rename to app/src/main/jni/compact_enc_det/util/encodings/encodings.h
diff --git a/app/src/main/jni/util/encodings/encodings.pb.h b/app/src/main/jni/compact_enc_det/util/encodings/encodings.pb.h
similarity index 100%
rename from app/src/main/jni/util/encodings/encodings.pb.h
rename to app/src/main/jni/compact_enc_det/util/encodings/encodings.pb.h
diff --git a/app/src/main/jni/util/encodings/encodings_unittest.cc b/app/src/main/jni/compact_enc_det/util/encodings/encodings_unittest.cc
similarity index 100%
rename from app/src/main/jni/util/encodings/encodings_unittest.cc
rename to app/src/main/jni/compact_enc_det/util/encodings/encodings_unittest.cc
diff --git a/app/src/main/jni/util/languages/languages.cc b/app/src/main/jni/compact_enc_det/util/languages/languages.cc
similarity index 100%
rename from app/src/main/jni/util/languages/languages.cc
rename to app/src/main/jni/compact_enc_det/util/languages/languages.cc
diff --git a/app/src/main/jni/util/languages/languages.h b/app/src/main/jni/compact_enc_det/util/languages/languages.h
similarity index 100%
rename from app/src/main/jni/util/languages/languages.h
rename to app/src/main/jni/compact_enc_det/util/languages/languages.h
diff --git a/app/src/main/jni/util/languages/languages.pb.h b/app/src/main/jni/compact_enc_det/util/languages/languages.pb.h
similarity index 100%
rename from app/src/main/jni/util/languages/languages.pb.h
rename to app/src/main/jni/compact_enc_det/util/languages/languages.pb.h
diff --git a/app/src/main/jni/util/logging.h b/app/src/main/jni/compact_enc_det/util/logging.h
similarity index 100%
rename from app/src/main/jni/util/logging.h
rename to app/src/main/jni/compact_enc_det/util/logging.h
diff --git a/app/src/main/jni/util/port.h b/app/src/main/jni/compact_enc_det/util/port.h
similarity index 100%
rename from app/src/main/jni/util/port.h
rename to app/src/main/jni/compact_enc_det/util/port.h
diff --git a/app/src/main/jni/util/string_util.h b/app/src/main/jni/compact_enc_det/util/string_util.h
similarity index 100%
rename from app/src/main/jni/util/string_util.h
rename to app/src/main/jni/compact_enc_det/util/string_util.h
diff --git a/app/src/main/jni/util/varsetter.h b/app/src/main/jni/compact_enc_det/util/varsetter.h
similarity index 100%
rename from app/src/main/jni/util/varsetter.h
rename to app/src/main/jni/compact_enc_det/util/varsetter.h