Refactoring launch files, fixing openrave files