Reorganize the image package, make it match upstream patterns

* Storage -> REST
* Folders a bit more organized