removed leftovers from rosbuild including lisp files, makefile.  Also reorganized includes to get rid of unneccessary subdirectory