reorganize and clean up R support (+ update to develop)