Moving things around for move to catkin build system