Roxygen versions of documentation, and merged some files