Starting to refactor stuff into their proper homes