Start structure refactor