changed to R package structure