diff --git a/ref_trace_decoder/build/linux/makefile b/decoder/build/linux/makefile
similarity index 100%
rename from ref_trace_decoder/build/linux/makefile
rename to decoder/build/linux/makefile
diff --git a/ref_trace_decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile
similarity index 100%
rename from ref_trace_decoder/build/linux/rctdl_c_api_lib/makefile
rename to decoder/build/linux/rctdl_c_api_lib/makefile
diff --git a/ref_trace_decoder/build/linux/ref_trace_decode_lib/makefile b/decoder/build/linux/ref_trace_decode_lib/makefile
similarity index 100%
rename from ref_trace_decoder/build/linux/ref_trace_decode_lib/makefile
rename to decoder/build/linux/ref_trace_decode_lib/makefile
diff --git a/ref_trace_decoder/build/win/opencsd.props b/decoder/build/win/opencsd.props
similarity index 100%
rename from ref_trace_decoder/build/win/opencsd.props
rename to decoder/build/win/opencsd.props
diff --git a/ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj b/decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj
similarity index 100%
rename from ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj
rename to decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj
diff --git a/ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.filters b/decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.filters
similarity index 100%
rename from ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.filters
rename to decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.filters
diff --git a/ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.user b/decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.user
similarity index 100%
rename from ref_trace_decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.user
rename to decoder/build/win/rctdl_c_api_lib/rctdl_c_api_lib.vcxproj.user
diff --git a/ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.sln b/decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.sln
similarity index 100%
rename from ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.sln
rename to decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.sln
diff --git a/ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj b/decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
similarity index 100%
rename from ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
rename to decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
diff --git a/ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters b/decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
similarity index 100%
rename from ref_trace_decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
rename to decoder/build/win/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
diff --git a/ref_trace_decoder/docs/build_libs.md b/decoder/docs/build_libs.md
similarity index 100%
rename from ref_trace_decoder/docs/build_libs.md
rename to decoder/docs/build_libs.md
diff --git a/ref_trace_decoder/docs/doxygen_config.dox b/decoder/docs/doxygen_config.dox
similarity index 100%
rename from ref_trace_decoder/docs/doxygen_config.dox
rename to decoder/docs/doxygen_config.dox
diff --git a/ref_trace_decoder/docs/test_progs.md b/decoder/docs/test_progs.md
similarity index 100%
rename from ref_trace_decoder/docs/test_progs.md
rename to decoder/docs/test_progs.md
diff --git a/ref_trace_decoder/include/c_api/rctdl_c_api.h b/decoder/include/c_api/rctdl_c_api.h
similarity index 100%
rename from ref_trace_decoder/include/c_api/rctdl_c_api.h
rename to decoder/include/c_api/rctdl_c_api.h
diff --git a/ref_trace_decoder/include/c_api/rctdl_c_api_types.h b/decoder/include/c_api/rctdl_c_api_types.h
similarity index 100%
rename from ref_trace_decoder/include/c_api/rctdl_c_api_types.h
rename to decoder/include/c_api/rctdl_c_api_types.h
diff --git a/ref_trace_decoder/include/comp_attach_notifier_i.h b/decoder/include/comp_attach_notifier_i.h
similarity index 100%
rename from ref_trace_decoder/include/comp_attach_notifier_i.h
rename to decoder/include/comp_attach_notifier_i.h
diff --git a/ref_trace_decoder/include/comp_attach_pt_t.h b/decoder/include/comp_attach_pt_t.h
similarity index 100%
rename from ref_trace_decoder/include/comp_attach_pt_t.h
rename to decoder/include/comp_attach_pt_t.h
diff --git a/ref_trace_decoder/include/etmv3/etmv3_decoder.h b/decoder/include/etmv3/etmv3_decoder.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/etmv3_decoder.h
rename to decoder/include/etmv3/etmv3_decoder.h
diff --git a/ref_trace_decoder/include/etmv3/trc_cmp_cfg_etmv3.h b/decoder/include/etmv3/trc_cmp_cfg_etmv3.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/trc_cmp_cfg_etmv3.h
rename to decoder/include/etmv3/trc_cmp_cfg_etmv3.h
diff --git a/ref_trace_decoder/include/etmv3/trc_pkt_decode_etmv3.h b/decoder/include/etmv3/trc_pkt_decode_etmv3.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/trc_pkt_decode_etmv3.h
rename to decoder/include/etmv3/trc_pkt_decode_etmv3.h
diff --git a/ref_trace_decoder/include/etmv3/trc_pkt_elem_etmv3.h b/decoder/include/etmv3/trc_pkt_elem_etmv3.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/trc_pkt_elem_etmv3.h
rename to decoder/include/etmv3/trc_pkt_elem_etmv3.h
diff --git a/ref_trace_decoder/include/etmv3/trc_pkt_proc_etmv3.h b/decoder/include/etmv3/trc_pkt_proc_etmv3.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/trc_pkt_proc_etmv3.h
rename to decoder/include/etmv3/trc_pkt_proc_etmv3.h
diff --git a/ref_trace_decoder/include/etmv3/trc_pkt_types_etmv3.h b/decoder/include/etmv3/trc_pkt_types_etmv3.h
similarity index 100%
rename from ref_trace_decoder/include/etmv3/trc_pkt_types_etmv3.h
rename to decoder/include/etmv3/trc_pkt_types_etmv3.h
diff --git a/ref_trace_decoder/include/etmv4/etmv4_decoder.h b/decoder/include/etmv4/etmv4_decoder.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/etmv4_decoder.h
rename to decoder/include/etmv4/etmv4_decoder.h
diff --git a/ref_trace_decoder/include/etmv4/trc_cmp_cfg_etmv4.h b/decoder/include/etmv4/trc_cmp_cfg_etmv4.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_cmp_cfg_etmv4.h
rename to decoder/include/etmv4/trc_cmp_cfg_etmv4.h
diff --git a/ref_trace_decoder/include/etmv4/trc_pkt_decode_etmv4i.h b/decoder/include/etmv4/trc_pkt_decode_etmv4i.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_pkt_decode_etmv4i.h
rename to decoder/include/etmv4/trc_pkt_decode_etmv4i.h
diff --git a/ref_trace_decoder/include/etmv4/trc_pkt_elem_etmv4d.h b/decoder/include/etmv4/trc_pkt_elem_etmv4d.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_pkt_elem_etmv4d.h
rename to decoder/include/etmv4/trc_pkt_elem_etmv4d.h
diff --git a/ref_trace_decoder/include/etmv4/trc_pkt_elem_etmv4i.h b/decoder/include/etmv4/trc_pkt_elem_etmv4i.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_pkt_elem_etmv4i.h
rename to decoder/include/etmv4/trc_pkt_elem_etmv4i.h
diff --git a/ref_trace_decoder/include/etmv4/trc_pkt_proc_etmv4.h b/decoder/include/etmv4/trc_pkt_proc_etmv4.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_pkt_proc_etmv4.h
rename to decoder/include/etmv4/trc_pkt_proc_etmv4.h
diff --git a/ref_trace_decoder/include/etmv4/trc_pkt_types_etmv4.h b/decoder/include/etmv4/trc_pkt_types_etmv4.h
similarity index 100%
rename from ref_trace_decoder/include/etmv4/trc_pkt_types_etmv4.h
rename to decoder/include/etmv4/trc_pkt_types_etmv4.h
diff --git a/ref_trace_decoder/include/i_dec/trc_i_decode.h b/decoder/include/i_dec/trc_i_decode.h
similarity index 100%
rename from ref_trace_decoder/include/i_dec/trc_i_decode.h
rename to decoder/include/i_dec/trc_i_decode.h
diff --git a/ref_trace_decoder/include/i_dec/trc_idec_arminst.h b/decoder/include/i_dec/trc_idec_arminst.h
similarity index 100%
rename from ref_trace_decoder/include/i_dec/trc_idec_arminst.h
rename to decoder/include/i_dec/trc_idec_arminst.h
diff --git a/ref_trace_decoder/include/interfaces/trc_data_raw_in_i.h b/decoder/include/interfaces/trc_data_raw_in_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_data_raw_in_i.h
rename to decoder/include/interfaces/trc_data_raw_in_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_data_rawframe_in_i.h b/decoder/include/interfaces/trc_data_rawframe_in_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_data_rawframe_in_i.h
rename to decoder/include/interfaces/trc_data_rawframe_in_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_error_log_i.h b/decoder/include/interfaces/trc_error_log_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_error_log_i.h
rename to decoder/include/interfaces/trc_error_log_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_gen_elem_in_i.h b/decoder/include/interfaces/trc_gen_elem_in_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_gen_elem_in_i.h
rename to decoder/include/interfaces/trc_gen_elem_in_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_indexer_pkt_i.h b/decoder/include/interfaces/trc_indexer_pkt_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_indexer_pkt_i.h
rename to decoder/include/interfaces/trc_indexer_pkt_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_indexer_src_i.h b/decoder/include/interfaces/trc_indexer_src_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_indexer_src_i.h
rename to decoder/include/interfaces/trc_indexer_src_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_instr_decode_i.h b/decoder/include/interfaces/trc_instr_decode_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_instr_decode_i.h
rename to decoder/include/interfaces/trc_instr_decode_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_pkt_in_i.h b/decoder/include/interfaces/trc_pkt_in_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_pkt_in_i.h
rename to decoder/include/interfaces/trc_pkt_in_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_pkt_raw_in_i.h b/decoder/include/interfaces/trc_pkt_raw_in_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_pkt_raw_in_i.h
rename to decoder/include/interfaces/trc_pkt_raw_in_i.h
diff --git a/ref_trace_decoder/include/interfaces/trc_tgt_mem_access_i.h b/decoder/include/interfaces/trc_tgt_mem_access_i.h
similarity index 100%
rename from ref_trace_decoder/include/interfaces/trc_tgt_mem_access_i.h
rename to decoder/include/interfaces/trc_tgt_mem_access_i.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc.h b/decoder/include/mem_acc/trc_mem_acc.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc.h
rename to decoder/include/mem_acc/trc_mem_acc.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_base.h b/decoder/include/mem_acc/trc_mem_acc_base.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_base.h
rename to decoder/include/mem_acc/trc_mem_acc_base.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_bufptr.h b/decoder/include/mem_acc/trc_mem_acc_bufptr.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_bufptr.h
rename to decoder/include/mem_acc/trc_mem_acc_bufptr.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_cb.h b/decoder/include/mem_acc/trc_mem_acc_cb.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_cb.h
rename to decoder/include/mem_acc/trc_mem_acc_cb.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_cb_if.h b/decoder/include/mem_acc/trc_mem_acc_cb_if.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_cb_if.h
rename to decoder/include/mem_acc/trc_mem_acc_cb_if.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_file.h b/decoder/include/mem_acc/trc_mem_acc_file.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_file.h
rename to decoder/include/mem_acc/trc_mem_acc_file.h
diff --git a/ref_trace_decoder/include/mem_acc/trc_mem_acc_mapper.h b/decoder/include/mem_acc/trc_mem_acc_mapper.h
similarity index 100%
rename from ref_trace_decoder/include/mem_acc/trc_mem_acc_mapper.h
rename to decoder/include/mem_acc/trc_mem_acc_mapper.h
diff --git a/ref_trace_decoder/include/ptm/ptm_decoder.h b/decoder/include/ptm/ptm_decoder.h
similarity index 100%
rename from ref_trace_decoder/include/ptm/ptm_decoder.h
rename to decoder/include/ptm/ptm_decoder.h
diff --git a/ref_trace_decoder/include/ptm/trc_cmp_cfg_ptm.h b/decoder/include/ptm/trc_cmp_cfg_ptm.h
similarity index 100%
rename from ref_trace_decoder/include/ptm/trc_cmp_cfg_ptm.h
rename to decoder/include/ptm/trc_cmp_cfg_ptm.h
diff --git a/ref_trace_decoder/include/ptm/trc_pkt_elem_ptm.h b/decoder/include/ptm/trc_pkt_elem_ptm.h
similarity index 100%
rename from ref_trace_decoder/include/ptm/trc_pkt_elem_ptm.h
rename to decoder/include/ptm/trc_pkt_elem_ptm.h
diff --git a/ref_trace_decoder/include/ptm/trc_pkt_proc_ptm.h b/decoder/include/ptm/trc_pkt_proc_ptm.h
similarity index 100%
rename from ref_trace_decoder/include/ptm/trc_pkt_proc_ptm.h
rename to decoder/include/ptm/trc_pkt_proc_ptm.h
diff --git a/ref_trace_decoder/include/ptm/trc_pkt_types_ptm.h b/decoder/include/ptm/trc_pkt_types_ptm.h
similarity index 100%
rename from ref_trace_decoder/include/ptm/trc_pkt_types_ptm.h
rename to decoder/include/ptm/trc_pkt_types_ptm.h
diff --git a/ref_trace_decoder/include/rctdl.h b/decoder/include/rctdl.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl.h
rename to decoder/include/rctdl.h
diff --git a/ref_trace_decoder/include/rctdl_dcd_tree.h b/decoder/include/rctdl_dcd_tree.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_dcd_tree.h
rename to decoder/include/rctdl_dcd_tree.h
diff --git a/ref_trace_decoder/include/rctdl_dcd_tree_elem.h b/decoder/include/rctdl_dcd_tree_elem.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_dcd_tree_elem.h
rename to decoder/include/rctdl_dcd_tree_elem.h
diff --git a/ref_trace_decoder/include/rctdl_error.h b/decoder/include/rctdl_error.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_error.h
rename to decoder/include/rctdl_error.h
diff --git a/ref_trace_decoder/include/rctdl_error_logger.h b/decoder/include/rctdl_error_logger.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_error_logger.h
rename to decoder/include/rctdl_error_logger.h
diff --git a/ref_trace_decoder/include/rctdl_if_types.h b/decoder/include/rctdl_if_types.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_if_types.h
rename to decoder/include/rctdl_if_types.h
diff --git a/ref_trace_decoder/include/rctdl_msg_logger.h b/decoder/include/rctdl_msg_logger.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_msg_logger.h
rename to decoder/include/rctdl_msg_logger.h
diff --git a/ref_trace_decoder/include/rctdl_version.h b/decoder/include/rctdl_version.h
similarity index 100%
rename from ref_trace_decoder/include/rctdl_version.h
rename to decoder/include/rctdl_version.h
diff --git a/ref_trace_decoder/include/stm/stm_decoder.h b/decoder/include/stm/stm_decoder.h
similarity index 100%
rename from ref_trace_decoder/include/stm/stm_decoder.h
rename to decoder/include/stm/stm_decoder.h
diff --git a/ref_trace_decoder/include/stm/trc_cmp_cfg_stm.h b/decoder/include/stm/trc_cmp_cfg_stm.h
similarity index 100%
rename from ref_trace_decoder/include/stm/trc_cmp_cfg_stm.h
rename to decoder/include/stm/trc_cmp_cfg_stm.h
diff --git a/ref_trace_decoder/include/stm/trc_pkt_elem_stm.h b/decoder/include/stm/trc_pkt_elem_stm.h
similarity index 100%
rename from ref_trace_decoder/include/stm/trc_pkt_elem_stm.h
rename to decoder/include/stm/trc_pkt_elem_stm.h
diff --git a/ref_trace_decoder/include/stm/trc_pkt_proc_stm.h b/decoder/include/stm/trc_pkt_proc_stm.h
similarity index 100%
rename from ref_trace_decoder/include/stm/trc_pkt_proc_stm.h
rename to decoder/include/stm/trc_pkt_proc_stm.h
diff --git a/ref_trace_decoder/include/stm/trc_pkt_types_stm.h b/decoder/include/stm/trc_pkt_types_stm.h
similarity index 100%
rename from ref_trace_decoder/include/stm/trc_pkt_types_stm.h
rename to decoder/include/stm/trc_pkt_types_stm.h
diff --git a/ref_trace_decoder/include/trc_component.h b/decoder/include/trc_component.h
similarity index 100%
rename from ref_trace_decoder/include/trc_component.h
rename to decoder/include/trc_component.h
diff --git a/ref_trace_decoder/include/trc_core_arch_map.h b/decoder/include/trc_core_arch_map.h
similarity index 100%
rename from ref_trace_decoder/include/trc_core_arch_map.h
rename to decoder/include/trc_core_arch_map.h
diff --git a/ref_trace_decoder/include/trc_frame_deformatter.h b/decoder/include/trc_frame_deformatter.h
similarity index 100%
rename from ref_trace_decoder/include/trc_frame_deformatter.h
rename to decoder/include/trc_frame_deformatter.h
diff --git a/ref_trace_decoder/include/trc_gen_elem.h b/decoder/include/trc_gen_elem.h
similarity index 100%
rename from ref_trace_decoder/include/trc_gen_elem.h
rename to decoder/include/trc_gen_elem.h
diff --git a/ref_trace_decoder/include/trc_gen_elem_types.h b/decoder/include/trc_gen_elem_types.h
similarity index 100%
rename from ref_trace_decoder/include/trc_gen_elem_types.h
rename to decoder/include/trc_gen_elem_types.h
diff --git a/ref_trace_decoder/include/trc_pkt_decode_base.h b/decoder/include/trc_pkt_decode_base.h
similarity index 100%
rename from ref_trace_decoder/include/trc_pkt_decode_base.h
rename to decoder/include/trc_pkt_decode_base.h
diff --git a/ref_trace_decoder/include/trc_pkt_proc_base.h b/decoder/include/trc_pkt_proc_base.h
similarity index 100%
rename from ref_trace_decoder/include/trc_pkt_proc_base.h
rename to decoder/include/trc_pkt_proc_base.h
diff --git a/ref_trace_decoder/include/trc_pkt_types.h b/decoder/include/trc_pkt_types.h
similarity index 100%
rename from ref_trace_decoder/include/trc_pkt_types.h
rename to decoder/include/trc_pkt_types.h
diff --git a/ref_trace_decoder/include/trc_printable_elem.h b/decoder/include/trc_printable_elem.h
similarity index 100%
rename from ref_trace_decoder/include/trc_printable_elem.h
rename to decoder/include/trc_printable_elem.h
diff --git a/ref_trace_decoder/source/c_api/rctdl_c_api.cpp b/decoder/source/c_api/rctdl_c_api.cpp
similarity index 100%
rename from ref_trace_decoder/source/c_api/rctdl_c_api.cpp
rename to decoder/source/c_api/rctdl_c_api.cpp
diff --git a/ref_trace_decoder/source/c_api/rctdl_c_api_obj.h b/decoder/source/c_api/rctdl_c_api_obj.h
similarity index 100%
rename from ref_trace_decoder/source/c_api/rctdl_c_api_obj.h
rename to decoder/source/c_api/rctdl_c_api_obj.h
diff --git a/ref_trace_decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp b/decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp
rename to decoder/source/etmv3/trc_cmp_cfg_etmv3.cpp
diff --git a/ref_trace_decoder/source/etmv3/trc_pkt_decode_etmv3.cpp b/decoder/source/etmv3/trc_pkt_decode_etmv3.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_pkt_decode_etmv3.cpp
rename to decoder/source/etmv3/trc_pkt_decode_etmv3.cpp
diff --git a/ref_trace_decoder/source/etmv3/trc_pkt_elem_etmv3.cpp b/decoder/source/etmv3/trc_pkt_elem_etmv3.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_pkt_elem_etmv3.cpp
rename to decoder/source/etmv3/trc_pkt_elem_etmv3.cpp
diff --git a/ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3.cpp b/decoder/source/etmv3/trc_pkt_proc_etmv3.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3.cpp
rename to decoder/source/etmv3/trc_pkt_proc_etmv3.cpp
diff --git a/ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp
rename to decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp
diff --git a/ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h
similarity index 100%
rename from ref_trace_decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h
rename to decoder/source/etmv3/trc_pkt_proc_etmv3_impl.h
diff --git a/ref_trace_decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp b/decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp
rename to decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_etmv4_stack_elem.h b/decoder/source/etmv4/trc_etmv4_stack_elem.h
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_etmv4_stack_elem.h
rename to decoder/source/etmv4/trc_etmv4_stack_elem.h
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
rename to decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp b/decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
rename to decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp
rename to decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4.cpp b/decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
rename to decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h b/decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
rename to decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp
rename to decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp
diff --git a/ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h
similarity index 100%
rename from ref_trace_decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h
rename to decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h
diff --git a/ref_trace_decoder/source/i_dec/trc_i_decode.cpp b/decoder/source/i_dec/trc_i_decode.cpp
similarity index 100%
rename from ref_trace_decoder/source/i_dec/trc_i_decode.cpp
rename to decoder/source/i_dec/trc_i_decode.cpp
diff --git a/ref_trace_decoder/source/i_dec/trc_idec_arminst.cpp b/decoder/source/i_dec/trc_idec_arminst.cpp
similarity index 100%
rename from ref_trace_decoder/source/i_dec/trc_idec_arminst.cpp
rename to decoder/source/i_dec/trc_idec_arminst.cpp
diff --git a/ref_trace_decoder/source/mem_acc/trc_mem_acc_base.cpp b/decoder/source/mem_acc/trc_mem_acc_base.cpp
similarity index 100%
rename from ref_trace_decoder/source/mem_acc/trc_mem_acc_base.cpp
rename to decoder/source/mem_acc/trc_mem_acc_base.cpp
diff --git a/ref_trace_decoder/source/mem_acc/trc_mem_acc_bufptr.cpp b/decoder/source/mem_acc/trc_mem_acc_bufptr.cpp
similarity index 100%
rename from ref_trace_decoder/source/mem_acc/trc_mem_acc_bufptr.cpp
rename to decoder/source/mem_acc/trc_mem_acc_bufptr.cpp
diff --git a/ref_trace_decoder/source/mem_acc/trc_mem_acc_cb.cpp b/decoder/source/mem_acc/trc_mem_acc_cb.cpp
similarity index 100%
rename from ref_trace_decoder/source/mem_acc/trc_mem_acc_cb.cpp
rename to decoder/source/mem_acc/trc_mem_acc_cb.cpp
diff --git a/ref_trace_decoder/source/mem_acc/trc_mem_acc_file.cpp b/decoder/source/mem_acc/trc_mem_acc_file.cpp
similarity index 100%
rename from ref_trace_decoder/source/mem_acc/trc_mem_acc_file.cpp
rename to decoder/source/mem_acc/trc_mem_acc_file.cpp
diff --git a/ref_trace_decoder/source/mem_acc/trc_mem_acc_mapper.cpp b/decoder/source/mem_acc/trc_mem_acc_mapper.cpp
similarity index 100%
rename from ref_trace_decoder/source/mem_acc/trc_mem_acc_mapper.cpp
rename to decoder/source/mem_acc/trc_mem_acc_mapper.cpp
diff --git a/ref_trace_decoder/source/ptm/trc_cmp_cfg_ptm.cpp b/decoder/source/ptm/trc_cmp_cfg_ptm.cpp
similarity index 100%
rename from ref_trace_decoder/source/ptm/trc_cmp_cfg_ptm.cpp
rename to decoder/source/ptm/trc_cmp_cfg_ptm.cpp
diff --git a/ref_trace_decoder/source/ptm/trc_pkt_elem_ptm.cpp b/decoder/source/ptm/trc_pkt_elem_ptm.cpp
similarity index 100%
rename from ref_trace_decoder/source/ptm/trc_pkt_elem_ptm.cpp
rename to decoder/source/ptm/trc_pkt_elem_ptm.cpp
diff --git a/ref_trace_decoder/source/ptm/trc_pkt_proc_ptm.cpp b/decoder/source/ptm/trc_pkt_proc_ptm.cpp
similarity index 100%
rename from ref_trace_decoder/source/ptm/trc_pkt_proc_ptm.cpp
rename to decoder/source/ptm/trc_pkt_proc_ptm.cpp
diff --git a/ref_trace_decoder/source/ptm/trc_pkt_proc_ptm_impl.h b/decoder/source/ptm/trc_pkt_proc_ptm_impl.h
similarity index 100%
rename from ref_trace_decoder/source/ptm/trc_pkt_proc_ptm_impl.h
rename to decoder/source/ptm/trc_pkt_proc_ptm_impl.h
diff --git a/ref_trace_decoder/source/rctdl_dcd_tree.cpp b/decoder/source/rctdl_dcd_tree.cpp
similarity index 100%
rename from ref_trace_decoder/source/rctdl_dcd_tree.cpp
rename to decoder/source/rctdl_dcd_tree.cpp
diff --git a/ref_trace_decoder/source/rctdl_error.cpp b/decoder/source/rctdl_error.cpp
similarity index 100%
rename from ref_trace_decoder/source/rctdl_error.cpp
rename to decoder/source/rctdl_error.cpp
diff --git a/ref_trace_decoder/source/rctdl_error_logger.cpp b/decoder/source/rctdl_error_logger.cpp
similarity index 100%
rename from ref_trace_decoder/source/rctdl_error_logger.cpp
rename to decoder/source/rctdl_error_logger.cpp
diff --git a/ref_trace_decoder/source/rctdl_msg_logger.cpp b/decoder/source/rctdl_msg_logger.cpp
similarity index 100%
rename from ref_trace_decoder/source/rctdl_msg_logger.cpp
rename to decoder/source/rctdl_msg_logger.cpp
diff --git a/ref_trace_decoder/source/rctdl_version.cpp b/decoder/source/rctdl_version.cpp
similarity index 100%
rename from ref_trace_decoder/source/rctdl_version.cpp
rename to decoder/source/rctdl_version.cpp
diff --git a/ref_trace_decoder/source/stm/trc_pkt_elem_stm.cpp b/decoder/source/stm/trc_pkt_elem_stm.cpp
similarity index 100%
rename from ref_trace_decoder/source/stm/trc_pkt_elem_stm.cpp
rename to decoder/source/stm/trc_pkt_elem_stm.cpp
diff --git a/ref_trace_decoder/source/stm/trc_pkt_proc_stm.cpp b/decoder/source/stm/trc_pkt_proc_stm.cpp
similarity index 100%
rename from ref_trace_decoder/source/stm/trc_pkt_proc_stm.cpp
rename to decoder/source/stm/trc_pkt_proc_stm.cpp
diff --git a/ref_trace_decoder/source/trc_component.cpp b/decoder/source/trc_component.cpp
similarity index 100%
rename from ref_trace_decoder/source/trc_component.cpp
rename to decoder/source/trc_component.cpp
diff --git a/ref_trace_decoder/source/trc_core_arch_map.cpp b/decoder/source/trc_core_arch_map.cpp
similarity index 100%
rename from ref_trace_decoder/source/trc_core_arch_map.cpp
rename to decoder/source/trc_core_arch_map.cpp
diff --git a/ref_trace_decoder/source/trc_frame_deformatter.cpp b/decoder/source/trc_frame_deformatter.cpp
similarity index 100%
rename from ref_trace_decoder/source/trc_frame_deformatter.cpp
rename to decoder/source/trc_frame_deformatter.cpp
diff --git a/ref_trace_decoder/source/trc_frame_deformatter_impl.h b/decoder/source/trc_frame_deformatter_impl.h
similarity index 100%
rename from ref_trace_decoder/source/trc_frame_deformatter_impl.h
rename to decoder/source/trc_frame_deformatter_impl.h
diff --git a/ref_trace_decoder/source/trc_gen_elem.cpp b/decoder/source/trc_gen_elem.cpp
similarity index 100%
rename from ref_trace_decoder/source/trc_gen_elem.cpp
rename to decoder/source/trc_gen_elem.cpp
diff --git a/ref_trace_decoder/source/trc_printable_elem.cpp b/decoder/source/trc_printable_elem.cpp
similarity index 100%
rename from ref_trace_decoder/source/trc_printable_elem.cpp
rename to decoder/source/trc_printable_elem.cpp
diff --git a/ref_trace_decoder/tests/build/linux/simple_pkt_print_c_api/makefile b/decoder/tests/build/linux/simple_pkt_print_c_api/makefile
similarity index 100%
rename from ref_trace_decoder/tests/build/linux/simple_pkt_print_c_api/makefile
rename to decoder/tests/build/linux/simple_pkt_print_c_api/makefile
diff --git a/ref_trace_decoder/tests/build/linux/snapshot_parser_lib/makefile b/decoder/tests/build/linux/snapshot_parser_lib/makefile
similarity index 100%
rename from ref_trace_decoder/tests/build/linux/snapshot_parser_lib/makefile
rename to decoder/tests/build/linux/snapshot_parser_lib/makefile
diff --git a/ref_trace_decoder/tests/build/linux/trc_pkt_lister/makefile b/decoder/tests/build/linux/trc_pkt_lister/makefile
similarity index 100%
rename from ref_trace_decoder/tests/build/linux/trc_pkt_lister/makefile
rename to decoder/tests/build/linux/trc_pkt_lister/makefile
diff --git a/ref_trace_decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj b/decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj
similarity index 100%
rename from ref_trace_decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj
rename to decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj
diff --git a/ref_trace_decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj.filters b/decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj.filters
similarity index 100%
rename from ref_trace_decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj.filters
rename to decoder/tests/build/win/simple_pkt_print_c_api/simple_pkt_print_c_api.vcxproj.filters
diff --git a/ref_trace_decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj b/decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj
similarity index 100%
rename from ref_trace_decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj
rename to decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj
diff --git a/ref_trace_decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj.filters b/decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj.filters
similarity index 100%
rename from ref_trace_decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj.filters
rename to decoder/tests/build/win/snapshot_parser_lib/snapshot_parser_lib.vcxproj.filters
diff --git a/ref_trace_decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj b/decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj
similarity index 100%
rename from ref_trace_decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj
rename to decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj
diff --git a/ref_trace_decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj.filters b/decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj.filters
similarity index 100%
rename from ref_trace_decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj.filters
rename to decoder/tests/build/win/trc_pkt_lister/trc_pkt_lister.vcxproj.filters
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/device_info.h b/decoder/tests/snapshot_parser_lib/include/device_info.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/device_info.h
rename to decoder/tests/snapshot_parser_lib/include/device_info.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/device_parser.h b/decoder/tests/snapshot_parser_lib/include/device_parser.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/device_parser.h
rename to decoder/tests/snapshot_parser_lib/include/device_parser.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/ini_section_names.h b/decoder/tests/snapshot_parser_lib/include/ini_section_names.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/ini_section_names.h
rename to decoder/tests/snapshot_parser_lib/include/ini_section_names.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_info.h b/decoder/tests/snapshot_parser_lib/include/snapshot_info.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_info.h
rename to decoder/tests/snapshot_parser_lib/include/snapshot_info.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_parser.h b/decoder/tests/snapshot_parser_lib/include/snapshot_parser.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_parser.h
rename to decoder/tests/snapshot_parser_lib/include/snapshot_parser.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_parser_util.h b/decoder/tests/snapshot_parser_lib/include/snapshot_parser_util.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_parser_util.h
rename to decoder/tests/snapshot_parser_lib/include/snapshot_parser_util.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_reader.h b/decoder/tests/snapshot_parser_lib/include/snapshot_reader.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/snapshot_reader.h
rename to decoder/tests/snapshot_parser_lib/include/snapshot_reader.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/ss_key_value_names.h b/decoder/tests/snapshot_parser_lib/include/ss_key_value_names.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/ss_key_value_names.h
rename to decoder/tests/snapshot_parser_lib/include/ss_key_value_names.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/ss_to_dcdtree.h b/decoder/tests/snapshot_parser_lib/include/ss_to_dcdtree.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/ss_to_dcdtree.h
rename to decoder/tests/snapshot_parser_lib/include/ss_to_dcdtree.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/include/trace_snapshots.h b/decoder/tests/snapshot_parser_lib/include/trace_snapshots.h
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/include/trace_snapshots.h
rename to decoder/tests/snapshot_parser_lib/include/trace_snapshots.h
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/device_info.cpp b/decoder/tests/snapshot_parser_lib/source/device_info.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/device_info.cpp
rename to decoder/tests/snapshot_parser_lib/source/device_info.cpp
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/device_parser.cpp b/decoder/tests/snapshot_parser_lib/source/device_parser.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/device_parser.cpp
rename to decoder/tests/snapshot_parser_lib/source/device_parser.cpp
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_parser.cpp b/decoder/tests/snapshot_parser_lib/source/snapshot_parser.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_parser.cpp
rename to decoder/tests/snapshot_parser_lib/source/snapshot_parser.cpp
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_parser_util.cpp b/decoder/tests/snapshot_parser_lib/source/snapshot_parser_util.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_parser_util.cpp
rename to decoder/tests/snapshot_parser_lib/source/snapshot_parser_util.cpp
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_reader.cpp b/decoder/tests/snapshot_parser_lib/source/snapshot_reader.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/snapshot_reader.cpp
rename to decoder/tests/snapshot_parser_lib/source/snapshot_reader.cpp
diff --git a/ref_trace_decoder/tests/snapshot_parser_lib/source/ss_to_dcdtree.cpp b/decoder/tests/snapshot_parser_lib/source/ss_to_dcdtree.cpp
similarity index 100%
rename from ref_trace_decoder/tests/snapshot_parser_lib/source/ss_to_dcdtree.cpp
rename to decoder/tests/snapshot_parser_lib/source/ss_to_dcdtree.cpp
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/cpu_0.ini b/decoder/tests/snapshots/Snowball/cpu_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/cpu_0.ini
rename to decoder/tests/snapshots/Snowball/cpu_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/cpu_1.ini b/decoder/tests/snapshots/Snowball/cpu_1.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/cpu_1.ini
rename to decoder/tests/snapshots/Snowball/cpu_1.ini
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/cstrace.bin b/decoder/tests/snapshots/Snowball/cstrace.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/cstrace.bin
rename to decoder/tests/snapshots/Snowball/cstrace.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/device_2.ini b/decoder/tests/snapshots/Snowball/device_2.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/device_2.ini
rename to decoder/tests/snapshots/Snowball/device_2.ini
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/device_3.ini b/decoder/tests/snapshots/Snowball/device_3.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/device_3.ini
rename to decoder/tests/snapshots/Snowball/device_3.ini
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/kernel_dump.bin b/decoder/tests/snapshots/Snowball/kernel_dump.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/kernel_dump.bin
rename to decoder/tests/snapshots/Snowball/kernel_dump.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/snapshot.ini b/decoder/tests/snapshots/Snowball/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/snapshot.ini
rename to decoder/tests/snapshots/Snowball/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/Snowball/trace.ini b/decoder/tests/snapshots/Snowball/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/Snowball/trace.ini
rename to decoder/tests/snapshots/Snowball/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cpu_0.ini b/decoder/tests/snapshots/TC2/cpu_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cpu_0.ini
rename to decoder/tests/snapshots/TC2/cpu_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cpu_1.ini b/decoder/tests/snapshots/TC2/cpu_1.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cpu_1.ini
rename to decoder/tests/snapshots/TC2/cpu_1.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cpu_2.ini b/decoder/tests/snapshots/TC2/cpu_2.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cpu_2.ini
rename to decoder/tests/snapshots/TC2/cpu_2.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cpu_3.ini b/decoder/tests/snapshots/TC2/cpu_3.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cpu_3.ini
rename to decoder/tests/snapshots/TC2/cpu_3.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cpu_4.ini b/decoder/tests/snapshots/TC2/cpu_4.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cpu_4.ini
rename to decoder/tests/snapshots/TC2/cpu_4.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/cstrace.bin b/decoder/tests/snapshots/TC2/cstrace.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/cstrace.bin
rename to decoder/tests/snapshots/TC2/cstrace.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_10.ini b/decoder/tests/snapshots/TC2/device_10.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_10.ini
rename to decoder/tests/snapshots/TC2/device_10.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_5.ini b/decoder/tests/snapshots/TC2/device_5.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_5.ini
rename to decoder/tests/snapshots/TC2/device_5.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_6.ini b/decoder/tests/snapshots/TC2/device_6.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_6.ini
rename to decoder/tests/snapshots/TC2/device_6.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_7.ini b/decoder/tests/snapshots/TC2/device_7.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_7.ini
rename to decoder/tests/snapshots/TC2/device_7.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_8.ini b/decoder/tests/snapshots/TC2/device_8.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_8.ini
rename to decoder/tests/snapshots/TC2/device_8.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/device_9.ini b/decoder/tests/snapshots/TC2/device_9.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/device_9.ini
rename to decoder/tests/snapshots/TC2/device_9.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/ds5-dumps/etm_0.txt b/decoder/tests/snapshots/TC2/ds5-dumps/etm_0.txt
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/ds5-dumps/etm_0.txt
rename to decoder/tests/snapshots/TC2/ds5-dumps/etm_0.txt
diff --git a/ref_trace_decoder/tests/snapshots/TC2/kernel_dump.bin b/decoder/tests/snapshots/TC2/kernel_dump.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/kernel_dump.bin
rename to decoder/tests/snapshots/TC2/kernel_dump.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/TC2/snapshot.ini b/decoder/tests/snapshots/TC2/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/snapshot.ini
rename to decoder/tests/snapshots/TC2/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/TC2/trace.ini b/decoder/tests/snapshots/TC2/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/TC2/trace.ini
rename to decoder/tests/snapshots/TC2/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/CSTMC_TRACE_FIFO.bin b/decoder/tests/snapshots/a57_single_step/CSTMC_TRACE_FIFO.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/CSTMC_TRACE_FIFO.bin
rename to decoder/tests/snapshots/a57_single_step/CSTMC_TRACE_FIFO.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/device1.ini b/decoder/tests/snapshots/a57_single_step/device1.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/device1.ini
rename to decoder/tests/snapshots/a57_single_step/device1.ini
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/device2.ini b/decoder/tests/snapshots/a57_single_step/device2.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/device2.ini
rename to decoder/tests/snapshots/a57_single_step/device2.ini
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/mem_Cortex-A57_0.bin b/decoder/tests/snapshots/a57_single_step/mem_Cortex-A57_0.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/mem_Cortex-A57_0.bin
rename to decoder/tests/snapshots/a57_single_step/mem_Cortex-A57_0.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-1.ppl b/decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-1.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-1.ppl
rename to decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-1.ppl
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-2.ppl b/decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-2.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-2.ppl
rename to decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss-2.ppl
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss.ppl b/decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss.ppl
rename to decoder/tests/snapshots/a57_single_step/pkt_proc_logs/trc_pkt_lister_a57ss.ppl
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/snapshot.ini b/decoder/tests/snapshots/a57_single_step/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/snapshot.ini
rename to decoder/tests/snapshots/a57_single_step/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/a57_single_step/trace.ini b/decoder/tests/snapshots/a57_single_step/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/a57_single_step/trace.ini
rename to decoder/tests/snapshots/a57_single_step/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/cpu_0.ini b/decoder/tests/snapshots/juno-uname-001/cpu_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/cpu_0.ini
rename to decoder/tests/snapshots/juno-uname-001/cpu_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/device_6.ini b/decoder/tests/snapshots/juno-uname-001/device_6.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/device_6.ini
rename to decoder/tests/snapshots/juno-uname-001/device_6.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/snapshot.ini b/decoder/tests/snapshots/juno-uname-001/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/snapshot.ini
rename to decoder/tests/snapshots/juno-uname-001/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/trace.ini b/decoder/tests/snapshots/juno-uname-001/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/trace.ini
rename to decoder/tests/snapshots/juno-uname-001/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/uname.bin b/decoder/tests/snapshots/juno-uname-001/uname.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/uname.bin
rename to decoder/tests/snapshots/juno-uname-001/uname.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/uname_trace.bin b/decoder/tests/snapshots/juno-uname-001/uname_trace.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/uname_trace.bin
rename to decoder/tests/snapshots/juno-uname-001/uname_trace.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-001/vdso.bin b/decoder/tests/snapshots/juno-uname-001/vdso.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-001/vdso.bin
rename to decoder/tests/snapshots/juno-uname-001/vdso.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_0.ini b/decoder/tests/snapshots/juno-uname-002/cpu_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_0.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_1.ini b/decoder/tests/snapshots/juno-uname-002/cpu_1.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_1.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_1.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_2.ini b/decoder/tests/snapshots/juno-uname-002/cpu_2.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_2.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_2.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_3.ini b/decoder/tests/snapshots/juno-uname-002/cpu_3.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_3.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_3.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_4.ini b/decoder/tests/snapshots/juno-uname-002/cpu_4.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_4.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_4.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_5.ini b/decoder/tests/snapshots/juno-uname-002/cpu_5.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/cpu_5.ini
rename to decoder/tests/snapshots/juno-uname-002/cpu_5.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_10.ini b/decoder/tests/snapshots/juno-uname-002/device_10.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_10.ini
rename to decoder/tests/snapshots/juno-uname-002/device_10.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_11.ini b/decoder/tests/snapshots/juno-uname-002/device_11.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_11.ini
rename to decoder/tests/snapshots/juno-uname-002/device_11.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_6.ini b/decoder/tests/snapshots/juno-uname-002/device_6.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_6.ini
rename to decoder/tests/snapshots/juno-uname-002/device_6.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_7.ini b/decoder/tests/snapshots/juno-uname-002/device_7.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_7.ini
rename to decoder/tests/snapshots/juno-uname-002/device_7.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_8.ini b/decoder/tests/snapshots/juno-uname-002/device_8.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_8.ini
rename to decoder/tests/snapshots/juno-uname-002/device_8.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/device_9.ini b/decoder/tests/snapshots/juno-uname-002/device_9.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/device_9.ini
rename to decoder/tests/snapshots/juno-uname-002/device_9.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/ld-2.21.bin b/decoder/tests/snapshots/juno-uname-002/ld-2.21.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/ld-2.21.bin
rename to decoder/tests/snapshots/juno-uname-002/ld-2.21.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/libc-2.21.bin b/decoder/tests/snapshots/juno-uname-002/libc-2.21.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/libc-2.21.bin
rename to decoder/tests/snapshots/juno-uname-002/libc-2.21.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/snapshot.ini b/decoder/tests/snapshots/juno-uname-002/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/snapshot.ini
rename to decoder/tests/snapshots/juno-uname-002/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/trace.bin b/decoder/tests/snapshots/juno-uname-002/trace.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/trace.bin
rename to decoder/tests/snapshots/juno-uname-002/trace.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/trace.ini b/decoder/tests/snapshots/juno-uname-002/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/trace.ini
rename to decoder/tests/snapshots/juno-uname-002/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/uname.bin b/decoder/tests/snapshots/juno-uname-002/uname.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/uname.bin
rename to decoder/tests/snapshots/juno-uname-002/uname.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno-uname-002/vdso.bin b/decoder/tests/snapshots/juno-uname-002/vdso.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno-uname-002/vdso.bin
rename to decoder/tests/snapshots/juno-uname-002/vdso.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_0.ini b/decoder/tests/snapshots/juno_r1_1/cpu_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_0.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_1.ini b/decoder/tests/snapshots/juno_r1_1/cpu_1.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_1.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_1.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_2.ini b/decoder/tests/snapshots/juno_r1_1/cpu_2.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_2.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_2.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_3.ini b/decoder/tests/snapshots/juno_r1_1/cpu_3.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_3.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_3.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_4.ini b/decoder/tests/snapshots/juno_r1_1/cpu_4.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_4.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_4.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_5.ini b/decoder/tests/snapshots/juno_r1_1/cpu_5.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cpu_5.ini
rename to decoder/tests/snapshots/juno_r1_1/cpu_5.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cstrace.bin b/decoder/tests/snapshots/juno_r1_1/cstrace.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cstrace.bin
rename to decoder/tests/snapshots/juno_r1_1/cstrace.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/cstraceitm.bin b/decoder/tests/snapshots/juno_r1_1/cstraceitm.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/cstraceitm.bin
rename to decoder/tests/snapshots/juno_r1_1/cstraceitm.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_10.ini b/decoder/tests/snapshots/juno_r1_1/device_10.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_10.ini
rename to decoder/tests/snapshots/juno_r1_1/device_10.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_11.ini b/decoder/tests/snapshots/juno_r1_1/device_11.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_11.ini
rename to decoder/tests/snapshots/juno_r1_1/device_11.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_12.ini b/decoder/tests/snapshots/juno_r1_1/device_12.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_12.ini
rename to decoder/tests/snapshots/juno_r1_1/device_12.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_6.ini b/decoder/tests/snapshots/juno_r1_1/device_6.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_6.ini
rename to decoder/tests/snapshots/juno_r1_1/device_6.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_7.ini b/decoder/tests/snapshots/juno_r1_1/device_7.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_7.ini
rename to decoder/tests/snapshots/juno_r1_1/device_7.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_8.ini b/decoder/tests/snapshots/juno_r1_1/device_8.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_8.ini
rename to decoder/tests/snapshots/juno_r1_1/device_8.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/device_9.ini b/decoder/tests/snapshots/juno_r1_1/device_9.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/device_9.ini
rename to decoder/tests/snapshots/juno_r1_1/device_9.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x10_cpu_0_2015Sep17_104900.txt b/decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x10_cpu_0_2015Sep17_104900.txt
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x10_cpu_0_2015Sep17_104900.txt
rename to decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x10_cpu_0_2015Sep17_104900.txt
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x11_cpu_1_2015Sep17_104748.txt b/decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x11_cpu_1_2015Sep17_104748.txt
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x11_cpu_1_2015Sep17_104748.txt
rename to decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x11_cpu_1_2015Sep17_104748.txt
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x13_cpu_3_2015Sep17_104147.txt b/decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x13_cpu_3_2015Sep17_104147.txt
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x13_cpu_3_2015Sep17_104147.txt
rename to decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x13_cpu_3_2015Sep17_104147.txt
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x15_cpu_5_2015Sep17_105126.txt b/decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x15_cpu_5_2015Sep17_105126.txt
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x15_cpu_5_2015Sep17_105126.txt
rename to decoder/tests/snapshots/juno_r1_1/ds-5-dumps/Trace_Report_0x15_cpu_5_2015Sep17_105126.txt
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/kernel_dump.bin b/decoder/tests/snapshots/juno_r1_1/kernel_dump.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/kernel_dump.bin
rename to decoder/tests/snapshots/juno_r1_1/kernel_dump.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x10.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x10.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x10.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x10.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x11.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x11.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x11.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x11.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x12.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x12.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x12.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x12.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x13.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x13.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x13.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x13.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x14.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x14.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x14.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x14.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x15.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x15.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x15.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_0x15.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_all.ppl b/decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_all.ppl
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_all.ppl
rename to decoder/tests/snapshots/juno_r1_1/pkt_proc_logs/trc_pkt_lister_all.ppl
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/snapshot.ini b/decoder/tests/snapshots/juno_r1_1/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/snapshot.ini
rename to decoder/tests/snapshots/juno_r1_1/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/juno_r1_1/trace.ini b/decoder/tests/snapshots/juno_r1_1/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/juno_r1_1/trace.ini
rename to decoder/tests/snapshots/juno_r1_1/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-2/cstraceitm.bin b/decoder/tests/snapshots/stm_only-2/cstraceitm.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-2/cstraceitm.bin
rename to decoder/tests/snapshots/stm_only-2/cstraceitm.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-2/device_0.ini b/decoder/tests/snapshots/stm_only-2/device_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-2/device_0.ini
rename to decoder/tests/snapshots/stm_only-2/device_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-2/snapshot.ini b/decoder/tests/snapshots/stm_only-2/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-2/snapshot.ini
rename to decoder/tests/snapshots/stm_only-2/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-2/trace.ini b/decoder/tests/snapshots/stm_only-2/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-2/trace.ini
rename to decoder/tests/snapshots/stm_only-2/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-juno/cstraceitm.bin b/decoder/tests/snapshots/stm_only-juno/cstraceitm.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-juno/cstraceitm.bin
rename to decoder/tests/snapshots/stm_only-juno/cstraceitm.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-juno/device_0.ini b/decoder/tests/snapshots/stm_only-juno/device_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-juno/device_0.ini
rename to decoder/tests/snapshots/stm_only-juno/device_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-juno/snapshot.ini b/decoder/tests/snapshots/stm_only-juno/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-juno/snapshot.ini
rename to decoder/tests/snapshots/stm_only-juno/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only-juno/trace.ini b/decoder/tests/snapshots/stm_only-juno/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only-juno/trace.ini
rename to decoder/tests/snapshots/stm_only-juno/trace.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only/cstraceitm.bin b/decoder/tests/snapshots/stm_only/cstraceitm.bin
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only/cstraceitm.bin
rename to decoder/tests/snapshots/stm_only/cstraceitm.bin
Binary files differ
diff --git a/ref_trace_decoder/tests/snapshots/stm_only/device_0.ini b/decoder/tests/snapshots/stm_only/device_0.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only/device_0.ini
rename to decoder/tests/snapshots/stm_only/device_0.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only/snapshot.ini b/decoder/tests/snapshots/stm_only/snapshot.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only/snapshot.ini
rename to decoder/tests/snapshots/stm_only/snapshot.ini
diff --git a/ref_trace_decoder/tests/snapshots/stm_only/trace.ini b/decoder/tests/snapshots/stm_only/trace.ini
similarity index 100%
rename from ref_trace_decoder/tests/snapshots/stm_only/trace.ini
rename to decoder/tests/snapshots/stm_only/trace.ini
diff --git a/ref_trace_decoder/tests/source/gen_elem_printer.h b/decoder/tests/source/gen_elem_printer.h
similarity index 100%
rename from ref_trace_decoder/tests/source/gen_elem_printer.h
rename to decoder/tests/source/gen_elem_printer.h
diff --git a/ref_trace_decoder/tests/source/item_printer.h b/decoder/tests/source/item_printer.h
similarity index 100%
rename from ref_trace_decoder/tests/source/item_printer.h
rename to decoder/tests/source/item_printer.h
diff --git a/ref_trace_decoder/tests/source/pkt_printer_t.h b/decoder/tests/source/pkt_printer_t.h
similarity index 100%
rename from ref_trace_decoder/tests/source/pkt_printer_t.h
rename to decoder/tests/source/pkt_printer_t.h
diff --git a/ref_trace_decoder/tests/source/raw_frame_printer.cpp b/decoder/tests/source/raw_frame_printer.cpp
similarity index 100%
rename from ref_trace_decoder/tests/source/raw_frame_printer.cpp
rename to decoder/tests/source/raw_frame_printer.cpp
diff --git a/ref_trace_decoder/tests/source/raw_frame_printer.h b/decoder/tests/source/raw_frame_printer.h
similarity index 100%
rename from ref_trace_decoder/tests/source/raw_frame_printer.h
rename to decoder/tests/source/raw_frame_printer.h
diff --git a/ref_trace_decoder/tests/source/simple_pkt_c_api.c b/decoder/tests/source/simple_pkt_c_api.c
similarity index 100%
rename from ref_trace_decoder/tests/source/simple_pkt_c_api.c
rename to decoder/tests/source/simple_pkt_c_api.c
diff --git a/ref_trace_decoder/tests/source/trc_pkt_lister.cpp b/decoder/tests/source/trc_pkt_lister.cpp
similarity index 100%
rename from ref_trace_decoder/tests/source/trc_pkt_lister.cpp
rename to decoder/tests/source/trc_pkt_lister.cpp