Complete restructure of data