Simplify boot storage

It should be in storage. I need target map factory and I guess it is not only place.