Updated to include package version in output directory