this was unecessary after refactoring, so this moves them back to their
original location in package structs