I vote we do that kind of stuff later as a code quality bug (maybe after we removed tastypie) to keep the diff as readable as possible.

There is a bunch of code to re-organize in the repos, not just in this PR: some DRF stuff live next to tastypie stuff, some is still in `resource.py` or `api.py` instead of `views.py` and `serializers.py`.