Restructuring the packages