Refactor in progress
Structure refactor