BF: addded missing __init__.py files and minor import corrections