Import public classes into __init__.py, fix manifest