Major restructure

Sorry if I broke Windows build :)