Change some code structures. Move ROC into System::Image.