Fixing issue with package adding - now handling __init__.py correctly.