Reorganize structs and add debug methods

Bug: N/A
Test: minikin_tests
Change-Id: I06260a4a90e2c969bfd5667868638067b6c3dc06
10 files changed