Simplify boot storage

Well, It is just first part to make method slightly easier to understand what it actually do. In the end I hope that DiskMapping will be own class with easy to understand methods.