Cleanup of jive folder

Anne Poot requested to merge jive-folder-cleanup into master

Merge request reports