Handle subpackage imports better