[Update] Update the code structure