Images reorganization - update