Updates to package structure

Cleaning up the R package some.