Rearranged configuration, so it will use the correct storage and filesystem layer.