Move some stuff into subpackages of /common/util/[data/math]