Changed directory structure to fit ROS/catkin conventions