improve and reorganize the data format for future Dev