[Update] Update code structure