Rework of launch scripts