Fixing this module/submodule/package __init__/setup mess