Further re-organization of launcher code