Move on of change code structure.