image reorganization
updated to align with image reorganization