Simplify boot storage

Agreed, this part is not yet finalized. I need to check which way is better.