Some changes to imports based on the reorganization of packages.
Resolving merge conflicts from a fetch, all minor import issues from the change to the gamegeneratorcollection package.