Reorganize slightly, fixing silly circular mport issue.