Update transition to the new directory structure

Bug: 134082137
Test: Existing tests
Change-Id: Ic9602c0a9b8e992c67bf105c52b75aee00088499
169 files changed