refactor configure structure

Change-Id: I1742b31089bfe5422b88a015b8891c4d20b57589