Rename libftrace to ftrace_reader
Also changes the directory layout to follow protozero's example:
ftrace_reader/BUILD.gn
ftrace_reader/include/ftrace_reader/public_blah.h
ftrace_reader/src/public_blah.cc
ftrace_reader/src/public_blah_unittest.cc
ftrace_reader/src/private_blah.h
ftrace_reader/src/private_blah.cc
ftrace_reader/src/private_blah_unittest.cc
Change-Id: Ib06628397f4aaab5a58dc09507410bbc8bba8e04
diff --git a/BUILD.gn b/BUILD.gn
index 2b8918b..614289c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -18,7 +18,7 @@
":tests",
"//buildtools:protobuf_lite",
"//buildtools:protoc($host_toolchain)",
- "//libftrace:libftrace_driver",
+ "//ftrace_reader:ftrace_reader_demo",
"//protozero/src/protoc_plugin($host_toolchain)",
"//tools/ftrace_proto_gen:ftrace_proto_gen",
]
@@ -28,7 +28,7 @@
testonly = true
deps = [
"//base:base_unittests",
- "//libftrace:libftrace_unittests",
+ "//ftrace_reader:ftrace_reader_unittests",
"//protozero:protozero_unittests",
"//tools/ftrace_proto_gen:ftrace_proto_gen_unittests",
"//tools/sanitizers_unittests",
diff --git a/libftrace/BUILD.gn b/ftrace_reader/BUILD.gn
similarity index 64%
rename from libftrace/BUILD.gn
rename to ftrace_reader/BUILD.gn
index da102af..96b614d 100644
--- a/libftrace/BUILD.gn
+++ b/ftrace_reader/BUILD.gn
@@ -12,29 +12,37 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-executable("libftrace_unittests") {
+config("ftrace_reader_config") {
+ include_dirs = [ "include" ]
+}
+
+executable("ftrace_reader_unittests") {
testonly = true
deps += [
- ":lib",
+ ":ftrace_reader",
"//buildtools:gmock",
"//buildtools:gtest",
"//buildtools:gtest_main",
]
sources = [
- "ftrace_unittest.cc",
+ "src/ftrace_cpu_reader_unittest.cc",
]
}
-executable("libftrace_driver") {
+executable("ftrace_reader_demo") {
sources = [
"main.cc",
]
- deps += [ ":lib" ]
+ deps += [ ":ftrace_reader" ]
}
-source_set("lib") {
+source_set("ftrace_reader") {
+ all_dependent_configs = [ ":ftrace_reader_config" ]
+ deps += [
+ "//protozero",
+ ]
sources = [
- "ftrace.cc",
- "ftrace.h",
+ "include/ftrace_reader/ftrace_cpu_reader.h",
+ "src/ftrace_cpu_reader.cc",
]
}
diff --git a/libftrace/ftrace.h b/ftrace_reader/include/ftrace_reader/ftrace_cpu_reader.h
similarity index 83%
rename from libftrace/ftrace.h
rename to ftrace_reader/include/ftrace_reader/ftrace_cpu_reader.h
index 08677da..cf5e4b4 100644
--- a/libftrace/ftrace.h
+++ b/ftrace_reader/include/ftrace_reader/ftrace_cpu_reader.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef LIBFTRACE_FTRACE_H_
-#define LIBFTRACE_FTRACE_H_
+#ifndef FTRACE_READER_FTRACE_CPU_READER_H_
+#define FTRACE_READER_FTRACE_CPU_READER_H_
namespace perfetto {
@@ -23,4 +23,4 @@
} // namespace perfetto
-#endif // LIBFTRACE_FTRACE_H_
+#endif // FTRACE_READER_FTRACE_CPU_READER_H_
diff --git a/libftrace/main.cc b/ftrace_reader/main.cc
similarity index 94%
rename from libftrace/main.cc
rename to ftrace_reader/main.cc
index 8f4333f..cc396f8 100644
--- a/libftrace/main.cc
+++ b/ftrace_reader/main.cc
@@ -16,7 +16,7 @@
#include <stdio.h>
-#include "libftrace/ftrace.h"
+#include "ftrace_reader/ftrace_cpu_reader.h"
int main(int argc, const char** argv) {
if (argc > 1)
diff --git a/libftrace/ftrace.cc b/ftrace_reader/src/ftrace_cpu_reader.cc
similarity index 93%
rename from libftrace/ftrace.cc
rename to ftrace_reader/src/ftrace_cpu_reader.cc
index b304a68..57f7dec 100644
--- a/libftrace/ftrace.cc
+++ b/ftrace_reader/src/ftrace_cpu_reader.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "libftrace/ftrace.h"
+#include "ftrace_reader/ftrace_cpu_reader.h"
namespace perfetto {
diff --git a/libftrace/ftrace_unittest.cc b/ftrace_reader/src/ftrace_cpu_reader_unittest.cc
similarity index 93%
rename from libftrace/ftrace_unittest.cc
rename to ftrace_reader/src/ftrace_cpu_reader_unittest.cc
index 4ef0f2e..248ca07 100644
--- a/libftrace/ftrace_unittest.cc
+++ b/ftrace_reader/src/ftrace_cpu_reader_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "libftrace/ftrace.h"
+#include "ftrace_reader/ftrace_cpu_reader.h"
#include "gtest/gtest.h"
namespace perfetto {
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_bias_level_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_cache_sync/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_cache_sync/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_cache_sync/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_cache_sync/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_connected/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_connected/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_connected/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_connected/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_input_path/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_input_path/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_input_path/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_input_path/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_output_path/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_output_path/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_output_path/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_output_path/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_walk_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_walk_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_walk_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_walk_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_event_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_power/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_power/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_power/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_dapm_widget_power/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_irq/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_irq/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_irq/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_irq/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_report/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_report/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_report/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_jack_report/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_read/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_read/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_read/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_read/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_write/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_write/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_write/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_preg_write/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_read/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_read/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_read/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_read/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_write/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_write/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_write/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/asoc/snd_soc_reg_write/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_command/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_command/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_command/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_command/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_ioctl_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_lock/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_lock/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_lock/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_lock/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_locked/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_locked/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_locked/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_locked/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_read_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_read_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_read_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_read_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_return/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_return/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_return/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_return/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_alloc_buf/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_alloc_buf/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_alloc_buf/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_alloc_buf/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_buffer_release/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_buffer_release/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_buffer_release/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_buffer_release/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_failed_buffer_release/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_failed_buffer_release/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_failed_buffer_release/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_failed_buffer_release/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_fd/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_fd/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_fd/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_fd/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_node_to_ref/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_node_to_ref/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_node_to_ref/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_node_to_ref/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_received/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_received/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_received/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_received/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_node/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_node/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_node/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_node/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_ref/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_ref/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_ref/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_transaction_ref_to_ref/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_unlock/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_unlock/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_unlock/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_unlock/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_update_page_range/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_update_page_range/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_update_page_range/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_update_page_range/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_wait_for_work/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_wait_for_work/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_wait_for_work/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_wait_for_work/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_write_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_write_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/binder/binder_write_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/binder/binder_write_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_backmerge/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_backmerge/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_backmerge/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_backmerge/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_bounce/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_bounce/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_bounce/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_bounce/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_frontmerge/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_frontmerge/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_frontmerge/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_frontmerge/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_queue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_queue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_queue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_queue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_remap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_remap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_bio_remap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_bio_remap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_dirty_buffer/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_dirty_buffer/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_dirty_buffer/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_dirty_buffer/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_getrq/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_getrq/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_getrq/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_getrq/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_plug/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_plug/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_plug/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_plug/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_abort/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_abort/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_abort/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_abort/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_insert/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_insert/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_insert/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_insert/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_issue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_issue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_issue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_issue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_remap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_remap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_remap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_remap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_requeue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_requeue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_rq_requeue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_rq_requeue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_sleeprq/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_sleeprq/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_sleeprq/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_sleeprq/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_split/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_split/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_split/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_split/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_touch_buffer/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_touch_buffer/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_touch_buffer/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_touch_buffer/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/block/block_unplug/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_unplug/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/block/block_unplug/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/block/block_unplug/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_deauth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_deauth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_deauth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_deauth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_disassoc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_disassoc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_disassoc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/__cfg80211_send_disassoc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_authorization_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_authorization_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_authorization_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_authorization_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cac_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cac_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cac_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cac_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ch_switch_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ch_switch_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ch_switch_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ch_switch_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_chandef_dfs_required/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_chandef_dfs_required/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_chandef_dfs_required/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_chandef_dfs_required/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_pktloss_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_pktloss_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_pktloss_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_pktloss_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_rssi_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_rssi_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_rssi_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_cqm_rssi_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_del_sta/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_del_sta/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_del_sta/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_del_sta/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ft_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ft_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ft_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ft_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_get_bss/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_get_bss/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_get_bss/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_get_bss/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_gtk_rekey_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_gtk_rekey_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_gtk_rekey_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_gtk_rekey_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ibss_joined/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ibss_joined/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ibss_joined/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ibss_joined/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_inform_bss_frame/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_inform_bss_frame/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_inform_bss_frame/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_inform_bss_frame/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_mgmt_tx_status/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_mgmt_tx_status/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_mgmt_tx_status/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_mgmt_tx_status/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_michael_mic_failure/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_michael_mic_failure/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_michael_mic_failure/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_michael_mic_failure/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_new_sta/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_new_sta/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_new_sta/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_new_sta/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_notify_new_peer_candidate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_notify_new_peer_candidate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_notify_new_peer_candidate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_notify_new_peer_candidate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_pmksa_candidate_notify/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_pmksa_candidate_notify/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_pmksa_candidate_notify/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_pmksa_candidate_notify/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_probe_status/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_probe_status/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_probe_status/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_probe_status/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_radar_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_radar_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_radar_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_radar_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel_expired/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel_expired/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel_expired/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_ready_on_channel_expired/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_reg_can_beacon/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_reg_can_beacon/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_reg_can_beacon/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_reg_can_beacon/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_obss_beacon/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_obss_beacon/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_obss_beacon/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_obss_beacon/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_wowlan_wakeup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_wowlan_wakeup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_wowlan_wakeup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_report_wowlan_wakeup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bool/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bool/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bool/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bool/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bss/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bss/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bss/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_bss/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_u32/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_u32/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_u32/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_u32/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_uint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_uint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_uint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_return_uint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_mgmt/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_mgmt/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_mgmt/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_mgmt/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_spurious_frame/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_spurious_frame/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_spurious_frame/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_spurious_frame/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_unexpected_4addr_frame/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_rx_unexpected_4addr_frame/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_scan_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_scan_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_scan_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_scan_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_results/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_results/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_results/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_results/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_stopped/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_stopped/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_stopped/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_sched_scan_stopped/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_assoc_timeout/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_assoc_timeout/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_assoc_timeout/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_assoc_timeout/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_auth_timeout/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_auth_timeout/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_auth_timeout/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_auth_timeout/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_assoc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_assoc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_assoc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_assoc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_auth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_auth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_auth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_rx_auth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_deauth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_deauth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_deauth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_deauth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_disassoc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_disassoc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_disassoc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_send_unprot_disassoc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_tdls_oper_request/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_tdls_oper_request/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_tdls_oper_request/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/cfg80211_tdls_oper_request/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_key/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_key/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_key/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_key/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_mpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_mpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_mpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_mpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_station/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_station/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_station/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_station/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_virtual_intf/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_virtual_intf/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_virtual_intf/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_add_virtual_intf/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_assoc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_assoc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_assoc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_assoc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_auth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_auth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_auth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_auth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_cancel_remain_on_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_cancel_remain_on_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_cancel_remain_on_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_cancel_remain_on_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_beacon/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_beacon/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_beacon/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_beacon/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_bss/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_bss/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_bss/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_bss/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_mpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_mpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_mpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_mpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_station/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_station/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_station/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_station/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_virtual_intf/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_virtual_intf/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_virtual_intf/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_change_virtual_intf/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_connect/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_connect/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_connect/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_connect/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_stop/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_stop/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_stop/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_crit_proto_stop/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_deauth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_deauth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_deauth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_deauth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_key/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_key/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_key/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_key/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_mpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_mpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_mpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_mpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_pmksa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_pmksa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_pmksa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_pmksa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_station/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_station/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_station/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_station/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_virtual_intf/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_virtual_intf/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_virtual_intf/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_del_virtual_intf/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disassoc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disassoc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disassoc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disassoc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disconnect/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disconnect/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disconnect/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_disconnect/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_mpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_mpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_mpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_mpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_station/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_station/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_station/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_station/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_survey/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_survey/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_survey/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_dump_survey/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_flush_pmksa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_flush_pmksa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_flush_pmksa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_flush_pmksa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_antenna/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_antenna/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_antenna/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_antenna/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_sset_count/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_sset_count/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_sset_count/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_sset_count/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_stats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_stats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_stats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_stats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_strings/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_strings/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_strings/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_et_strings/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_key/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_key/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_key/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_key/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mesh_config/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mesh_config/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mesh_config/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mesh_config/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_mpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_ringparam/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_ringparam/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_ringparam/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_ringparam/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_station/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_station/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_station/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_station/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_tx_power/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_tx_power/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_tx_power/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_get_tx_power/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_ibss/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_ibss/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_ibss/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_ibss/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_mesh/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_mesh/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_mesh/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_join_mesh/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_key_mgmt_set_pmk/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_key_mgmt_set_pmk/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_key_mgmt_set_pmk/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_key_mgmt_set_pmk/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_ibss/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_ibss/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_ibss/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_ibss/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_mesh/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_mesh/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_mesh/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_leave_mesh/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_libertas_set_mesh_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_libertas_set_mesh_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_libertas_set_mesh_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_libertas_set_mesh_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_frame_register/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_frame_register/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_frame_register/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_frame_register/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx_cancel_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx_cancel_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx_cancel_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_mgmt_tx_cancel_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_probe_client/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_probe_client/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_probe_client/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_probe_client/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_remain_on_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_remain_on_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_remain_on_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_remain_on_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_resume/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_resume/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_resume/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_resume/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_chandef/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_chandef/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_chandef/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_chandef/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_cookie/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_cookie/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_cookie/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_cookie/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_int/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_int/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_int/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_int/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mesh_config/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mesh_config/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mesh_config/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mesh_config/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mpath_info/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mpath_info/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mpath_info/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_mpath_info/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_station_info/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_station_info/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_station_info/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_station_info/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_survey_info/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_survey_info/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_survey_info/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_survey_info/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_tx_rx/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_tx_rx/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_tx_rx/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_int_tx_rx/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void_tx_rx/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void_tx_rx/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void_tx_rx/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_void_tx_rx/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_wdev/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_wdev/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_wdev/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_return_wdev/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_rfkill_poll/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_rfkill_poll/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_rfkill_poll/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_rfkill_poll/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_scan/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_scan/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_scan/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_scan/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_stop/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_stop/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_stop/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_sched_scan_stop/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_antenna/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_antenna/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_antenna/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_antenna/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ap_chanwidth/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ap_chanwidth/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ap_chanwidth/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ap_chanwidth/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_bitrate_mask/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_bitrate_mask/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_bitrate_mask/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_bitrate_mask/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_rssi_config/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_rssi_config/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_rssi_config/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_rssi_config/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_txe_config/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_txe_config/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_txe_config/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_cqm_txe_config/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_key/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_key/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_key/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_key/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_mgmt_key/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_mgmt_key/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_mgmt_key/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_default_mgmt_key/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_mac_acl/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_mac_acl/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_mac_acl/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_mac_acl/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_monitor_channel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_monitor_channel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_monitor_channel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_monitor_channel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_noack_map/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_noack_map/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_noack_map/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_noack_map/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_pmksa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_pmksa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_pmksa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_pmksa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_power_mgmt/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_power_mgmt/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_power_mgmt/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_power_mgmt/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_qos_map/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_qos_map/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_qos_map/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_qos_map/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_rekey_data/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_rekey_data/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_rekey_data/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_rekey_data/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ringparam/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ringparam/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ringparam/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_ringparam/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_tx_power/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_tx_power/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_tx_power/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_tx_power/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_txq_params/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_txq_params/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_txq_params/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_txq_params/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wakeup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wakeup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wakeup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wakeup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wds_peer/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wds_peer/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wds_peer/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wds_peer/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wiphy_params/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wiphy_params/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wiphy_params/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_set_wiphy_params/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_ap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_ap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_ap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_ap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_p2p_device/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_p2p_device/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_p2p_device/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_start_p2p_device/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_ap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_ap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_ap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_ap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_p2p_device/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_p2p_device/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_p2p_device/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_stop_p2p_device/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_suspend/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_suspend/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_suspend/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_suspend/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_mgmt/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_mgmt/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_mgmt/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_mgmt/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_oper/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_oper/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_oper/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_tdls_oper/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_cmd/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_cmd/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_cmd/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_cmd/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_dump/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_dump/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_dump/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_testmode_dump/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_ft_ies/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_ft_ies/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_ft_ies/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_ft_ies/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_mesh_config/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_mesh_config/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_mesh_config/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cfg80211/rdev_update_mesh_config/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_freepages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_freepages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_freepages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_freepages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_migratepages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_migratepages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_migratepages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_isolate_migratepages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_migratepages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_migratepages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_migratepages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/compaction/mm_compaction_migratepages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_already/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_already/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_already/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_already/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_boost/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_boost/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_boost/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_boost/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_load_change/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_load_change/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_load_change/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_load_change/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_notyet/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_notyet/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_notyet/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_notyet/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_setspeed/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_setspeed/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_setspeed/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_setspeed/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_target/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_target/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_target/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_target/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_unboost/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_unboost/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_unboost/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/cpufreq_interactive/cpufreq_interactive_unboost/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/devfreq/devfreq_msg/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/devfreq/devfreq_msg/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/devfreq/devfreq_msg/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/devfreq/devfreq_msg/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic_late/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic_late/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic_late/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/kernel_panic_late/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/exception/undef_instr/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/undef_instr/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/exception/undef_instr/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/undef_instr/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/exception/unhandled_abort/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/unhandled_abort/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/exception/unhandled_abort/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/unhandled_abort/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/exception/user_fault/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/user_fault/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/exception/user_fault/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/exception/user_fault/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_alloc_new_reservation/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_alloc_new_reservation/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_alloc_new_reservation/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_alloc_new_reservation/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_allocate_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_direct_IO_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_reservation/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_reservation/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_reservation/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_discard_reservation/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_drop_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_drop_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_drop_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_drop_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_evict_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_evict_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_evict_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_evict_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_forget/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_forget/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_forget/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_forget/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_free_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_get_blocks_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_invalidatepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_invalidatepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_invalidatepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_invalidatepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_journalled_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_load_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_load_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_load_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_load_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_mark_inode_dirty/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_mark_inode_dirty/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_mark_inode_dirty/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_mark_inode_dirty/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_ordered_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_read_block_bitmap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_read_block_bitmap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_read_block_bitmap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_read_block_bitmap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_readpage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_readpage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_readpage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_readpage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_releasepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_releasepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_releasepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_releasepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_request_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_reserved/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_reserved/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_reserved/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_reserved/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_rsv_window_add/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_rsv_window_add/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_rsv_window_add/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_rsv_window_add/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_file_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_fs/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_fs/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_fs/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_sync_fs/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_truncate_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_unlink_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_write_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_write_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_write_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_write_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext3/ext3_writeback_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_alloc_da_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_alloc_da_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_alloc_da_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_alloc_da_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_allocate_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_begin_ordered_truncate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_begin_ordered_truncate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_begin_ordered_truncate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_begin_ordered_truncate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_release_space/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_release_space/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_release_space/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_release_space/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_reserve_space/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_reserve_space/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_reserve_space/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_reserve_space/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_update_reserve_space/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_update_reserve_space/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_update_reserve_space/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_update_reserve_space/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_pages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_pages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_pages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_write_pages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages_result/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages_result/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages_result/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_da_writepages_result/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_direct_IO_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_preallocations/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_preallocations/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_preallocations/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_discard_preallocations/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_drop_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_drop_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_drop_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_drop_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_find_delayed_extent_range_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_insert_extent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_insert_extent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_insert_extent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_insert_extent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_lookup_extent_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_remove_extent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_remove_extent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_remove_extent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_remove_extent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_es_shrink_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_evict_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_evict_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_evict_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_evict_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_fastpath/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_fastpath/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_fastpath/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_convert_to_initialized_fastpath/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_handle_uninitialized_extents/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_handle_uninitialized_extents/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_handle_uninitialized_extents/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_handle_uninitialized_extents/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_in_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_in_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_in_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_in_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_load_extent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_load_extent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_load_extent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_load_extent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_map_blocks_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_put_in_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_put_in_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_put_in_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_put_in_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_remove_space_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_idx/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_idx/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_idx/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_idx/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_leaf/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_leaf/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_leaf/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_rm_leaf/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_show_extent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_show_extent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_show_extent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ext_show_extent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_fallocate_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_find_delalloc_range/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_find_delalloc_range/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_find_delalloc_range/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_find_delalloc_range/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_forget/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_forget/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_forget/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_forget/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_free_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_implied_cluster_alloc_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_implied_cluster_alloc_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_implied_cluster_alloc_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_implied_cluster_alloc_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_reserved_cluster_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_reserved_cluster_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_reserved_cluster_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_get_reserved_cluster_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_ind_map_blocks_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_invalidatepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_invalidatepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_invalidatepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_invalidatepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journal_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journal_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journal_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journal_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_invalidatepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_invalidatepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_invalidatepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_invalidatepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_journalled_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode_bitmap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode_bitmap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode_bitmap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_load_inode_bitmap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mark_inode_dirty/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mark_inode_dirty/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mark_inode_dirty/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mark_inode_dirty/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_bitmap_load/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_bitmap_load/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_bitmap_load/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_bitmap_load/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_buddy_bitmap_load/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_buddy_bitmap_load/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_buddy_bitmap_load/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_buddy_bitmap_load/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_discard_preallocations/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_discard_preallocations/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_discard_preallocations/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_discard_preallocations/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_group_pa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_group_pa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_group_pa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_group_pa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_inode_pa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_inode_pa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_inode_pa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_new_inode_pa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_group_pa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_group_pa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_group_pa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_group_pa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_inode_pa/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_inode_pa/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_inode_pa/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mb_release_inode_pa/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_discard/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_discard/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_discard/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_discard/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_prealloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_prealloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_prealloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_mballoc_prealloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_punch_hole/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_punch_hole/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_punch_hole/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_punch_hole/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_read_block_bitmap_load/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_read_block_bitmap_load/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_read_block_bitmap_load/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_read_block_bitmap_load/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_readpage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_readpage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_readpage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_readpage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_releasepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_releasepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_releasepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_releasepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_remove_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_remove_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_remove_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_remove_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_blocks/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_blocks/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_blocks/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_blocks/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_request_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_file_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_fs/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_fs/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_fs/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_sync_fs/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_all_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_all_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_all_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_all_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_extent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_extent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_extent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_trim_extent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_truncate_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_unlink_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_write_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ext4/ext4_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ext4/ext4_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_add_to_page_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_add_to_page_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_add_to_page_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_add_to_page_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_delete_from_page_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_delete_from_page_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_delete_from_page_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/filemap/mm_filemap_delete_from_page_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/bprint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/bprint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/bprint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/bprint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/bputs/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/bputs/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/bputs/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/bputs/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/branch/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/branch/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/branch/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/branch/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/context_switch/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/context_switch/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/context_switch/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/context_switch/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/funcgraph_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/function/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/function/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/function/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/function/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/kernel_stack/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/kernel_stack/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/kernel_stack/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/kernel_stack/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_map/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_map/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_map/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_map/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_rw/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_rw/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_rw/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/mmiotrace_rw/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/print/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/print/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/print/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/print/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/user_stack/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/user_stack/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/user_stack/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/user_stack/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/wakeup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/wakeup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ftrace/wakeup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ftrace/wakeup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/gpio/gpio_direction/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/gpio/gpio_direction/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/gpio/gpio_direction/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/gpio/gpio_direction/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/gpio/gpio_value/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/gpio/gpio_value/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/gpio/gpio_value/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/gpio/gpio_value/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_resume/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_resume/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_resume/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_resume/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_suspend/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_suspend/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_suspend/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_bus_suspend/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_ep0/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_ep0/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_ep0/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_ep0/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_hub_control/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_hub_control/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_hub_control/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_hub_control/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_in/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_in/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_in/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_in/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_out/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_out/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_out/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_out/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_read/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_read/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_read/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_read/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_write/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_write/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_write/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_reg_write/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_setup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_setup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_setup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_setup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_dequeue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_dequeue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_dequeue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_dequeue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_enqueue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_enqueue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_enqueue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/ice40/ice40_urb_enqueue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/irq_handler_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_raise/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_raise/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/irq/softirq_raise/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/irq/softirq_raise/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_checkpoint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_checkpoint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_checkpoint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_checkpoint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_cleanup_journal_tail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_cleanup_journal_tail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_cleanup_journal_tail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_cleanup_journal_tail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_flushing/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_flushing/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_flushing/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_flushing/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_locking/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_locking/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_locking/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_locking/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_logging/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_logging/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_logging/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_commit_logging/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_do_submit_data/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_do_submit_data/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_do_submit_data/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_do_submit_data/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_drop_transaction/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_drop_transaction/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_drop_transaction/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_drop_transaction/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_end_commit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_end_commit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_end_commit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_end_commit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_start_commit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_start_commit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/jbd_start_commit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/jbd_start_commit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd/journal_write_superblock/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/journal_write_superblock/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd/journal_write_superblock/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd/journal_write_superblock/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint_stats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint_stats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint_stats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_checkpoint_stats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_flushing/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_flushing/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_flushing/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_flushing/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_locking/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_locking/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_locking/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_locking/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_logging/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_logging/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_logging/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_commit_logging/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_drop_transaction/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_drop_transaction/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_drop_transaction/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_drop_transaction/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_end_commit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_end_commit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_end_commit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_end_commit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_extend/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_extend/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_extend/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_extend/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_stats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_stats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_stats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_handle_stats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_lock_buffer_stall/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_lock_buffer_stall/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_lock_buffer_stall/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_lock_buffer_stall/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_run_stats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_run_stats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_run_stats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_run_stats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_start_commit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_start_commit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_start_commit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_start_commit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_submit_inode_data/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_submit_inode_data/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_submit_inode_data/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_submit_inode_data/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_update_log_tail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_update_log_tail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_update_log_tail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_update_log_tail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_write_superblock/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_write_superblock/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_write_superblock/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/jbd2/jbd2_write_superblock/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_fault/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_fault/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_fault/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_fault/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_queued/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_queued/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_queued/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_queued/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_recovery/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_recovery/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_recovery/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_recovery/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_retired/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_retired/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_retired/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_retired/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_submitted/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_submitted/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_submitted/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_cmdbatch_submitted/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_invalidate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_invalidate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_invalidate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_invalidate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_sleep/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_sleep/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_sleep/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_sleep/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_switch/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_switch/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_switch/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_switch/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wait_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wake/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wake/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wake/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_drawctxt_wake/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_gpu_fault/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_gpu_fault/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_gpu_fault/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_gpu_fault/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_sp_tp/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_sp_tp/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_sp_tp/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/adreno_sp_tp/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/dispatch_queue_context/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/dispatch_queue_context/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/dispatch_queue_context/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/dispatch_queue_context/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a3xx_irq_status/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a3xx_irq_status/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a3xx_irq_status/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a3xx_irq_status/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a4xx_irq_status/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a4xx_irq_status/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a4xx_irq_status/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_a4xx_irq_status/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_active_count/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_active_count/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_active_count/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_active_count/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_bus/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_bus/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_bus/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_bus/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_buslevel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_buslevel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_buslevel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_buslevel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_clk/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_clk/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_clk/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_clk/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_constraint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_constraint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_constraint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_constraint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_create/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_create/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_create/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_create/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_destroy/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_destroy/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_destroy/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_destroy/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_detach/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_detach/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_detach/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_context_detach/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_fire_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_fire_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_fire_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_fire_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_gpubusy/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_gpubusy/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_gpubusy/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_gpubusy/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_irq/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_irq/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_irq/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_irq/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_issueibcmds/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_issueibcmds/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_issueibcmds/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_issueibcmds/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_map/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_map/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_map/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_map/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_mmap/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_mmap/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_mmap/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_mmap/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_full_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_full_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_full_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_sync_full_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_queue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_queue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_queue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_timestamp_queue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_unmapped_area_collision/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_unmapped_area_collision/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_unmapped_area_collision/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mem_unmapped_area_collision/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mmu_pagefault/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mmu_pagefault/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mmu_pagefault/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_mmu_pagefault/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_msg/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_msg/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_msg/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_msg/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_alloc_pages_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_page_pool_zero_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pagetable_destroy/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pagetable_destroy/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pagetable_destroy/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pagetable_destroy/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_request_state/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_request_state/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_request_state/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_request_state/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_set_state/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_set_state/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_set_state/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwr_set_state/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrlevel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrlevel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrlevel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrlevel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrstats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrstats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrstats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_pwrstats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_rail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_rail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_rail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_rail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_readtimestamp/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_readtimestamp/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_readtimestamp/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_readtimestamp/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_register_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_register_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_register_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_register_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_regwrite/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_regwrite/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_regwrite/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_regwrite/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_sharedmem_page_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_sharedmem_page_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_sharedmem_page_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_sharedmem_page_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_user_pwrlevel_constraint/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_user_pwrlevel_constraint/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_user_pwrlevel_constraint/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_user_pwrlevel_constraint/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/kgsl_waittimestamp_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence_expire/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence_expire/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence_expire/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_fence_expire/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp_expire/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp_expire/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp_expire/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kgsl/syncpoint_timestamp_expire/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_fail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_fail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_fail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_fail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_iommu_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_fail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_fail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_fail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_fail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/alloc_pages_sys_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/dma_alloc_contiguous_retry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/dma_alloc_contiguous_retry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/dma_alloc_contiguous_retry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/dma_alloc_contiguous_retry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_map_range/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_map_range/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_map_range/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_map_range/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/iommu_sec_ptbl_map_range_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fail/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fail/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fail/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fail/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fallback/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fallback/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fallback/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_fallback/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_alloc_buffer_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_alloc_retry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_alloc_retry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_alloc_retry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_alloc_retry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_cp_secure_buffer_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_prefetching/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_prefetching/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_prefetching/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_prefetching/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_add_to_pool_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_allocate_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/ion_secure_cma_shrink_pool_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kfree/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kfree/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kfree/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kfree/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc_node/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc_node/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc_node/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmalloc_node/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc_node/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc_node/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc_node/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_alloc_node/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/kmem_cache_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_pages_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_retry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_retry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/migrate_retry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/migrate_retry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_extfrag/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_extfrag/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_extfrag/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_extfrag/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_zone_locked/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_zone_locked/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_zone_locked/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_alloc_zone_locked/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free_batched/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free_batched/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free_batched/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_free_batched/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_pcpu_drain/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_pcpu_drain/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_pcpu_drain/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/kmem/mm_page_pcpu_drain/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/lowmemorykiller/lowmemory_kill/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/lowmemorykiller/lowmemory_kill/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/lowmemorykiller/lowmemory_kill/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/lowmemorykiller/lowmemory_kill/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_kickoff/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_kickoff/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_kickoff/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_kickoff/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_pingpong_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_pingpong_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_pingpong_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_pingpong_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_release_bw/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_release_bw/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_release_bw/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_release_bw/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_wait_pingpong/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_wait_pingpong/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_wait_pingpong/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_cmd_wait_pingpong/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_commit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_commit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_commit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_commit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_mixer_update/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_mixer_update/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_mixer_update/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_mixer_update/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_prefill_calc/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_prefill_calc/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_prefill_calc/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_prefill_calc/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_set_wm_levels/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_set_wm_levels/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_set_wm_levels/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_set_wm_levels/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_update_bus/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_update_bus/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_update_bus/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_perf_update_bus/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_change/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_change/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_change/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_change/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_set/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_set/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_set/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_sspp_set/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_trace_counter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_trace_counter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_trace_counter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_trace_counter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_video_underrun_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_video_underrun_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/mdp_video_underrun_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/mdp_video_underrun_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mdss/tracing_mark_write/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/tracing_mark_write/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mdss/tracing_mark_write/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mdss/tracing_mark_write/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/migrate/mm_migrate_pages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/migrate/mm_migrate_pages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/migrate/mm_migrate_pages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/migrate/mm_migrate_pages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_post/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_post/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_post/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_post/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_pre/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_pre/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_pre/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_adma_table_pre/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_erase_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_blk_rw_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_clk/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_clk/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_clk/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_clk/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_cmd_rw_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_data_rw_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_data_rw_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_data_rw_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_data_rw_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_resume_host/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_resume_host/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_resume_host/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_resume_host/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_suspend_host/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_suspend_host/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/mmc/mmc_suspend_host/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/mmc/mmc_suspend_host/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_bw/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_bw/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_bw/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_bw/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_clk/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_clk/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_clk/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_agg_clk/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_avail_bw/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_avail_bw/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_avail_bw/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_avail_bw/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bimc_config_limiter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bimc_config_limiter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bimc_config_limiter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bimc_config_limiter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bke_params/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bke_params/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bke_params/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_bke_params/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_noc_set_qos_mode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_noc_set_qos_mode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_noc_set_qos_mode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_noc_set_qos_mode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_apply/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_apply/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_apply/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_apply/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_matches/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_matches/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_matches/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_rules_matches/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_bus/bus_update_request_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cluster_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/cpu_idle_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/pre_pc_cb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/pre_pc_cb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_low_power/pre_pc_cb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_low_power/pre_pc_cb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_iommu_op_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_smem_buffer_ion_op_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_buffer_event_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_close_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_fw_load_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_v4l2_vidc_open_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_vidc_common_state_change/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_vidc_common_state_change/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_vidc_common_state_change/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/msm_vidc_common_state_change/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/venus_hfi_var_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/venus_hfi_var_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/msm_vidc/venus_hfi_var_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/msm_vidc/venus_hfi_var_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/napi/napi_poll/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/napi/napi_poll/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/napi/napi_poll/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/napi/napi_poll/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/net/net_dev_queue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/net_dev_queue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/net/net_dev_queue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/net_dev_queue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/net/net_dev_xmit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/net_dev_xmit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/net/net_dev_xmit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/net_dev_xmit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/net/netif_receive_skb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/netif_receive_skb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/net/netif_receive_skb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/netif_receive_skb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/net/netif_rx/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/netif_rx/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/net/netif_rx/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/net/netif_rx/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/oom/oom_score_adj_update/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/oom/oom_score_adj_update/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/oom/oom_score_adj_update/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/oom/oom_score_adj_update/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/perf_trace_counters/sched_switch_with_ctrs/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/perf_trace_counters/sched_switch_with_ctrs/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/perf_trace_counters/sched_switch_with_ctrs/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/perf_trace_counters/sched_switch_with_ctrs/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_disable/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_disable/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_disable/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_disable/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_enable/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_enable/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_enable/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_enable/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_set_parent/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_set_parent/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_set_parent/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_set_parent/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_set_rate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_set_rate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/clock_set_rate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/clock_set_rate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_frequency_switch_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_idle/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_idle/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpu_idle/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpu_idle/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpufreq_freq_synced/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpufreq_freq_synced/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpufreq_freq_synced/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpufreq_freq_synced/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/cpufreq_sampling_event/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpufreq_sampling_event/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/cpufreq_sampling_event/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/cpufreq_sampling_event/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/machine_suspend/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/machine_suspend/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/machine_suspend/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/machine_suspend/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/power_domain_target/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/power_domain_target/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/power_domain_target/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/power_domain_target/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/reevaluate_hotplug/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/reevaluate_hotplug/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/reevaluate_hotplug/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/reevaluate_hotplug/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/set_max_cpus/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/set_max_cpus/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/set_max_cpus/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/set_max_cpus/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_activate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_activate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_activate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_activate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_deactivate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_deactivate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_deactivate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/power/wakeup_source_deactivate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/printk/console/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/printk/console/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/printk/console/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/printk/console/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim_eff/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim_eff/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim_eff/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/process_reclaim/process_reclaim_eff/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/credit_entropy_bits/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/credit_entropy_bits/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/credit_entropy_bits/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/credit_entropy_bits/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/extract_entropy/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/extract_entropy/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/extract_entropy/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/extract_entropy/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/extract_entropy_user/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/extract_entropy_user/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/extract_entropy_user/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/extract_entropy_user/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/get_random_bytes/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/get_random_bytes/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/get_random_bytes/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/get_random_bytes/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes_nolock/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes_nolock/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes_nolock/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/random/mix_pool_bytes_nolock/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_enter/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_enter/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_enter/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_enter/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/raw_syscalls/sys_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rcu/rcu_utilization/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rcu/rcu_utilization/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rcu/rcu_utilization/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rcu/rcu_utilization/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regcache_sync/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regcache_sync/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regcache_sync/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regcache_sync/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_complete_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_io_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_io_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_io_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_io_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_write_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_write_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_write_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_async_write_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_bypass/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_bypass/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_bypass/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_bypass/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_only/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_only/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_only/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_cache_only/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_read_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_hw_write_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read_cache/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read_cache/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read_cache/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_read_cache/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_write/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_write/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_write/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regmap/regmap_reg_write/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_disable_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_delay/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_delay/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_delay/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_enable_delay/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage_complete/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage_complete/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage_complete/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/regulator/regulator_set_voltage_complete/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/__rmnet_deliver_skb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/__rmnet_deliver_skb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/__rmnet_deliver_skb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/__rmnet_deliver_skb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_egress_handler/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_egress_handler/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_egress_handler/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_egress_handler/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_end_deaggregation/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_end_deaggregation/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_end_deaggregation/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_end_deaggregation/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_map/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_map/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_map/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_map/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_qmi/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_qmi/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_qmi/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_fc_qmi/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_ingress_handler/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_ingress_handler/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_ingress_handler/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_ingress_handler/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_aggregate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_aggregate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_aggregate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_aggregate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_checksum_downlink_packet/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_checksum_downlink_packet/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_checksum_downlink_packet/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_checksum_downlink_packet/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_flush_packet_queue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_flush_packet_queue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_flush_packet_queue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_map_flush_packet_queue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_aggregation/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_aggregation/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_aggregation/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_aggregation/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_deaggregation/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_deaggregation/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_deaggregation/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_start_deaggregation/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_vnd_start_xmit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_vnd_start_xmit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_vnd_start_xmit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rmnet_data/rmnet_vnd_start_xmit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_idle/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_idle/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_idle/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_idle/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_resume/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_resume/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_resume/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_resume/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_return_int/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_return_int/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_return_int/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_return_int/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_suspend/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_suspend/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm/rpm_suspend/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm/rpm_suspend/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_ack_recd/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_ack_recd/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_ack_recd/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_ack_recd/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_send_message/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_send_message/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_send_message/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/rpm_smd/rpm_send_message/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_blocked_reason/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_blocked_reason/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_blocked_reason/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_blocked_reason/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_hotplug/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_hotplug/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_hotplug/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_hotplug/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_load/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_load/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_load/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_cpu_load/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_enq_deq_task/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_enq_deq_task/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_enq_deq_task/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_enq_deq_task/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop_ret/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop_ret/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop_ret/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_kthread_stop_ret/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_load_balance/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_load_balance/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_load_balance/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_load_balance/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_migrate_task/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_migrate_task/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_migrate_task/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_migrate_task/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_pi_setprio/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_pi_setprio/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_pi_setprio/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_pi_setprio/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exec/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exec/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exec/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exec/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_fork/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_fork/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_fork/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_fork/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_free/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_free/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_free/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_free/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_process_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_process_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_reset_all_window_stats/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_reset_all_window_stats/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_reset_all_window_stats/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_reset_all_window_stats/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_set_boost/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_set_boost/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_set_boost/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_set_boost/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_blocked/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_blocked/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_blocked/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_blocked/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_iowait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_iowait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_iowait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_iowait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_runtime/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_runtime/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_runtime/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_runtime/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_sleep/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_sleep/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_sleep/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_sleep/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_stat_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_switch/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_switch/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_switch/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_switch/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_task_load/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_task_load/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_task_load/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_task_load/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_update_history/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_update_history/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_update_history/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_update_history/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_update_task_ravg/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_update_task_ravg/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_update_task_ravg/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_update_task_ravg/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wait_task/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wait_task/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wait_task/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wait_task/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup_new/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup_new/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup_new/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sched/sched_wakeup_new/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_done/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_done/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_done/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_done/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_error/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_error/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_error/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_error/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_timeout/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_timeout/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_timeout/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_dispatch_cmd_timeout/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_eh_wakeup/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_eh_wakeup/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/scsi/scsi_eh_wakeup/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/scsi/scsi_eh_wakeup/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/signal/signal_deliver/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/signal/signal_deliver/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/signal/signal_deliver/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/signal/signal_deliver/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/signal/signal_generate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/signal/signal_generate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/signal/signal_generate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/signal/signal_generate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/skb/consume_skb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/consume_skb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/skb/consume_skb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/consume_skb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/skb/kfree_skb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/kfree_skb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/skb/kfree_skb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/kfree_skb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/skb/skb_copy_datagram_iovec/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/skb_copy_datagram_iovec/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/skb/skb_copy_datagram_iovec/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/skb/skb_copy_datagram_iovec/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sock/sock_exceed_buf_limit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sock/sock_exceed_buf_limit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sock/sock_exceed_buf_limit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sock/sock_exceed_buf_limit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sock/sock_rcvqueue_full/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sock/sock_rcvqueue_full/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sock/sock_rcvqueue_full/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sock/sock_rcvqueue_full/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_pt/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_pt/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_pt/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_pt/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_timeline/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_timeline/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_timeline/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_timeline/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/sync/sync_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/sync/sync_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/task/task_newtask/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/task/task_newtask/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/task/task_newtask/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/task/task_newtask/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/task/task_rename/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/task/task_rename/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/task/task_rename/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/task/task_rename/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_offline/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_offline/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_offline/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_offline/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_online/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_online/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_online/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_core_online/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_frequency_mit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_frequency_mit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_frequency_mit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_post_frequency_mit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_offline/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_offline/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_offline/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_offline/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_online/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_online/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_online/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_core_online/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_frequency_mit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_frequency_mit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_frequency_mit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/thermal_pre_frequency_mit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_read/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_read/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_read/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_read/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_clear/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_clear/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_clear/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_clear/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_hit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_hit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_hit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/thermal/tsens_threshold_hit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_cancel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_cancel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_cancel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_cancel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_expire_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_init/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_init/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_init/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_init/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/hrtimer_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/itimer_expire/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/itimer_expire/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/itimer_expire/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/itimer_expire/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/itimer_state/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/itimer_state/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/itimer_state/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/itimer_state/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/tick_stop/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/tick_stop/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/tick_stop/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/tick_stop/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_cancel/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_cancel/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_cancel/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_cancel/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_entry/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_entry/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_entry/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_entry/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_exit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_exit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_exit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_expire_exit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_init/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_init/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_init/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_init/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/timer/timer_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/timer/timer_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/udp/udp_fail_queue_rcv_skb/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/udp/udp_fail_queue_rcv_skb/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/udp/udp_fail_queue_rcv_skb/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/udp/udp_fail_queue_rcv_skb/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_shrink_slab_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_direct_reclaim_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_sleep/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_sleep/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_sleep/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_sleep/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_wake/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_wake/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_wake/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_kswapd_wake/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_isolate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_isolate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_isolate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_isolate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_shrink_inactive/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_shrink_inactive/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_shrink_inactive/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_lru_shrink_inactive/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_isolate/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_isolate/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_isolate/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_isolate/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_reclaim_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_begin/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_memcg_softlimit_reclaim_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/vmscan/mm_vmscan_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_activate_work/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_activate_work/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_activate_work/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_activate_work/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_end/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_end/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_end/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_end/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_execute_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_queue_work/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_queue_work/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_queue_work/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/workqueue/workqueue_queue_work/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/balance_dirty_pages/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/balance_dirty_pages/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/balance_dirty_pages/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/balance_dirty_pages/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/bdi_dirty_ratelimit/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/bdi_dirty_ratelimit/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/bdi_dirty_ratelimit/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/bdi_dirty_ratelimit/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/global_dirty_state/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/global_dirty_state/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/global_dirty_state/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/global_dirty_state/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/wbc_writepage/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/wbc_writepage/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/wbc_writepage/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/wbc_writepage/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_register/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_register/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_register/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_register/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_unregister/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_unregister/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_unregister/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_bdi_unregister/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_congestion_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_congestion_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_congestion_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_congestion_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_inode_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_page/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_page/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_page/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_dirty_page/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_exec/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_exec/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_exec/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_exec/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_nowork/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_nowork/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_nowork/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_nowork/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_pages_written/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_pages_written/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_pages_written/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_pages_written/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue_io/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue_io/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue_io/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_queue_io/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_sb_inodes_requeue/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_sb_inodes_requeue/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_sb_inodes_requeue/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_sb_inodes_requeue/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_single_inode_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait_iff_congested/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait_iff_congested/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait_iff_congested/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wait_iff_congested/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wake_background/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wake_background/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wake_background/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_wake_background/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode_start/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode_start/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode_start/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_write_inode_start/format
diff --git a/libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_written/format b/ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_written/format
similarity index 100%
rename from libftrace/test/data/android_seed_N2F62_3.10.49/writeback/writeback_written/format
rename to ftrace_reader/test/data/android_seed_N2F62_3.10.49/writeback/writeback_written/format
diff --git a/libftrace/test/test_proto_gen.py b/ftrace_reader/test/test_proto_gen.py
similarity index 100%
rename from libftrace/test/test_proto_gen.py
rename to ftrace_reader/test/test_proto_gen.py