Changed the package structure.

Changed the package structure.