Restructured the card data files