major engine re-org in preparation for GL engine