Fixing up public header path, standardizing header access