Adjusted data structure

Adjusted data structure to match gameplay requirements.