Restructuring into a package