Major level data restructure
Major level data restructure