Refactoring

Started full application refactoring! Woohoo!