Refactor R plays to separate R-base from RServe