Removed old files, refactored launch files. Untested