#5 - split out file store into seperate feature