improving baseDir in generated products