Update datastructures

A simple compilation of all relevant data structures so one doesn't have to go back and forth between infinite files.