Restructured module with proper __init__.py