Adjust the file manager and file picker to the new logic