Made more generic.
Removed the auto-added __init__.py.