[Dev] Modify structure.