Move the rest of datastructures to constants.cpp