Modify structure for googleadmin branch