Updates to the package structure.