[PATCH 02/16] Modify collect so it works with directories with missing __init__.py