more minor directory cleanup

acoburn requested to merge more_directory_cleanup into master

Merge request reports