added dirs; updated config and sample config: #MSG-342 fixed
#MSG-341 fixed