Address tweaks from cleanup PR

Hits up notes made in #1. Both of the following now pass:

```
./venv/bin/flake8 agi
./venv/bin/python -m tests.runner
```

This is a major version bump because #1 moved things around in the namespace and we don't want to break callers.