Simplify boot storage

I just agreed with @mvidner  that it is easier to review it by steps.