A lot of changes and moves

Jira: SUP-12345
Reviewed-by: Some One <some.one@google.com>
Signed-off-by: From Myself <from.myself@google.com>