Move headless classes into headless subsystem
Fix engine changes