[#PRX-239 Refactor Storage commitment and FileForwarding]