Refactor

Moved a lot of stuff around