TOOLS-53 (Improvement - Complete): Fix and refactor XnatFolderMaker