Refactor structure

Change-Id: I78d8d4493d556a50c3ce69bc6b190b426ae171fd