Removed a bunch of shit
Moved some stuff around (hopefully for better)