Updated the package structure.