proper dir structure, add __init__.py files, corrected import statements