Adapting FolderManager and the folder part of the CLI