__init__.py: add back in namespace packages.
rest: more flake8