Restructured hierarchy; added gamestates for real