some cleanup and reorg
add the data files back