Continue to work on the build system

- standardize locations of things
1 job for 4-beta-1 in 37 seconds (queued for 1 second)