ENH: Major reorganization of Rmd