Modifying package structure to pass R CMD check