Working gamestates, more changes to project structure