Fixing up public header path, standardizing header access
Merge pull request #2 from khawkins/header_updates

Fixing up public header path, standardizing header access