Filemanager code updated, ready to be used
Merged both versions of code