files adapter dependencies
refactoring of file structure adapter
images adapter improvements
Merge remote-tracking branch 'upstream/master'