diff --git a/startop/tools/view_compiler/Android.bp b/startop/view_compiler/Android.bp similarity index 100% rename from startop/tools/view_compiler/Android.bp rename to startop/view_compiler/Android.bp diff --git a/startop/tools/view_compiler/README.md b/startop/view_compiler/README.md similarity index 100% rename from startop/tools/view_compiler/README.md rename to startop/view_compiler/README.md diff --git a/startop/tools/view_compiler/TEST_MAPPING b/startop/view_compiler/TEST_MAPPING similarity index 100% rename from startop/tools/view_compiler/TEST_MAPPING rename to startop/view_compiler/TEST_MAPPING diff --git a/startop/tools/view_compiler/dex_builder.cc b/startop/view_compiler/dex_builder.cc similarity index 100% rename from startop/tools/view_compiler/dex_builder.cc rename to startop/view_compiler/dex_builder.cc diff --git a/startop/tools/view_compiler/dex_builder.h b/startop/view_compiler/dex_builder.h similarity index 100% rename from startop/tools/view_compiler/dex_builder.h rename to startop/view_compiler/dex_builder.h diff --git a/startop/tools/view_compiler/dex_builder_test.cc b/startop/view_compiler/dex_builder_test.cc similarity index 100% rename from startop/tools/view_compiler/dex_builder_test.cc rename to startop/view_compiler/dex_builder_test.cc diff --git a/startop/tools/view_compiler/java_lang_builder.cc b/startop/view_compiler/java_lang_builder.cc similarity index 100% rename from startop/tools/view_compiler/java_lang_builder.cc rename to startop/view_compiler/java_lang_builder.cc diff --git a/startop/tools/view_compiler/java_lang_builder.h b/startop/view_compiler/java_lang_builder.h similarity index 100% rename from startop/tools/view_compiler/java_lang_builder.h rename to startop/view_compiler/java_lang_builder.h diff --git a/startop/tools/view_compiler/main.cc b/startop/view_compiler/main.cc similarity index 100% rename from startop/tools/view_compiler/main.cc rename to startop/view_compiler/main.cc diff --git a/startop/tools/view_compiler/util.cc b/startop/view_compiler/util.cc similarity index 100% rename from startop/tools/view_compiler/util.cc rename to startop/view_compiler/util.cc diff --git a/startop/tools/view_compiler/util.h b/startop/view_compiler/util.h similarity index 100% rename from startop/tools/view_compiler/util.h rename to startop/view_compiler/util.h diff --git a/startop/tools/view_compiler/util_test.cc b/startop/view_compiler/util_test.cc similarity index 100% rename from startop/tools/view_compiler/util_test.cc rename to startop/view_compiler/util_test.cc