fixed the stucture to be that of a package