Use subDir
not src
to construct default names
#506
Merged
subDir
not src
to construct default names
#506