Refactor/Restructure Round 1