Restructuring the package structure