from . import ...
post-rewrite and refactoring