Rearrange directory structure/build scripts for easier viewing/searching