Reorganize the template pkg, make it match upstream patterns

* Storage -> REST