Launch files re-structured