Fix stale internal imports — module path now consistent across all subpackages