Restructured ImageController