Api rearranging, and refactored sample game with enum