Updated output dir to be subfolder