first pass structure refactoring
add __init__.py stubs