Correct import package path and __init__.py in some files