Fixed the package structure of the code.