Further restructuring

Removed a lot of the old code, RIP :(