Started data structure redesign

Redesigning the classes to use better patters and data types.