Revert "Revert "Removed: Image Class""

This reverts commit 65538de3c76ecf4b46aac4c687f9f93037963521.