add __init__.py to classic, fix a few imports