Rearranged and added new launch files