Use storage dir for everything