Reorganization, Makefile clean-up, style revisions, etc.