Restructuring of data structures stuff
Merge branch 'master' of https://github.com/Shawn5961/src