Started to modify structure.