WIP: images refactoring
refactoring images manager
ensure images logic
fix bug in storeToDisk
change checks order