Starting to move things into a single Python module.