Reorganize files; add __init__.py files