Combine FolderLinks and DirectoryIndicator into FileSystemPlugin

cc @aaroncampf