Fixed the package structure.