Refactor

I really need to put stuff where I want it the first time instead of the
root of the project... OH WELL!