More restructuring.
Updated to use new binary paths.
Fixed problem with make clean throwing errors when file doesn't exist.
Start on master Makefile for the tree to replace buildxia.