Change the package structure