revert to File Manager in HK summit + changes
Merge pull request #26 from Leon-G/master

revert to File Manager in HK summit + changes