renamed some classes; generating NAMESPACE now with roxygen2