PackagePath/Directory generation fix