change the package structure