Refactor structure