Refactor structure project