Added file manager bases, adapt code for new location of file_manager
Fixed code to support new location of filesystem_notifications