refactored some of the data Structures
Merge remote-tracking branch 'origin/master'