Moved things around to get a proper folder structure

Moving things around to get better folder structure


we may want an `__init__.py` and `__all__=...` to make that nicer. Then again, this is internal code