Implement proper structure for game