upgrade: reorg

Signed-off-by: Sage Weil <sage@inktank.com>