Revert "more file manager work done"

This reverts commit 532a122e0dbfad371bb7b059d0a19bb96d4104ca.
Revert "Revert "more file manager work done""

This reverts commit 0c57a8ba13f4e5b25f3bdd5581ffb29dd358e4fd.