just a comment
merge back headers
update project and test include for consolidated headers
remove old files, fix includes
standardize header guards
update usage instructions