Added game states / folders
Organized code