Flatten structure

Change-Id: I9e9e5debec93d9429c68b7dba90da2efc06d40d7