Move backwards compat stuff to __init__.py