Reorganize launcher with new util