fixes for moved headers in Reflect
WIP reflect refactor
Structure -> Composite
Merge remote-tracking branch 'origin/master' into reflect_refactor
Merge remote-tracking branch 'origin/master' into reflect_refactor
WIP reflect_refactor updates
Data -> Translator