Fixed pkgutil path stuff in __init__.py files