Mostly .hpp elimination and include/ use

No actual code changes here; another pull request coming in a while.  Will need to be further file/directory motion going forward but wanted to go step by step.