Reorganize where the stuff compiles too