Use more direct import for filesystem storage
Use more direct import for filesystem storage

geier/khal,hobarrera/khal,sithglan/khal,dzoep/khal,pdav/khal,sithglan/khal,sdx23/khal,sheeprine/khal,sheeprine/khal,pimutils/khal