Bundle restructuring

Change-Id: I5a9efa7f4d03bd78dd17297731c5addea5cf0442
67 files changed