switch to a flat file structure