Initial refactoring changes
Refactored everything into my new conventions