Consolidate file names, import all of them in the umbrella header
Rename class to OCAStructureAccessor