restructure project storage calls