Restructured image upload