Move storage into cms/lib.