Convert to use flat files