finish rework of file manager