Another small Makefile tweak to ensure build order is correct.
Re-organizing.
Reorganization and prep for C++ updates.
dos2unix to correct line endings.