Changed structure to create catkin workspace