Changed to R package format
Change to R package format