Changed: create dir per image