Update code structure