Restore directory hierarchy to original design

Change-Id: I5f51faec8970cab79c685a275a365855f73e61c8