add rString class
clean up types / defs files