More cleanup
Moving around a few files
Adding some more messaging shiz
Refactoring a bunch of stuff