more launcher reorg