Switch to storaged

This depends on storaged master, but let's start the review already now.