TC Reorganization part 1 - DO NOT MERGE YET

Change-Id: I4b5af40536e66d368c064e791e87f8d6da6fd85c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Merge "TC Reorganization part 1 - DO NOT MERGE YET"