modify structure

Change-Id: Id8e590168e024a772cc36b7a9fa1007c8e637b8c