Changed launch file structure, removed old files