Minor changes to the package structure
Minor changes to the package structure