Moved some common data classes into the commondata package.