add file-organizer support - this is pending a pull request being accepted.  It it isnt, this will need to be backed out before release 0.8