Updating structure

Change-Id: Ic3a930b2248bf6f32a2ec095287234145b732967
Keep on working

Change-Id: Icb2495f0283ecd68166519916f19b86d6fd5aaaa