Moved complexity data out of the concrete data structure. More to follow...
Move complexity data from all classes to their new location