subdirs

Merged dreamer requested to merge subdir into master

some improvements

Merge request reports