Arranging repos

Change-Id: I2a87f98564dc30ff63a248fb01d4843acd617395