Minor changes to files and locations.
Overhaul to build system