Changes to package structure.