TCs Resorganization part 4 - DO NOT MERGE

Change-Id: Ifd47a1b705d56e38db9ead8fb7e82f46fb051548
Signed-off-by: Luis Gomez <ecelgp@gmail.com>