Refactoring and Reorganizing
Refactor and remove.
HUGE refactor.