simplify file store path calculations

@apanzerj @rafaelfranca