Cleaned up directory structure, and added GameState