Move headless classes into headless subsystem
Merge pull request #940 from mkienenb/PR-consolidate-headless-code

Move headless classes into headless subsystem