Reducing the `main` package's footprint a bunch

because it was bothering me, plus there was a bit of package pollution going on...