Reorganize imports
Package game states
Delete unneeded image
Add missing import