added more detailed catkin information to CMakeLists.txt file
updated src files to catkin compatibility