Reorganize the base module somewhat.