Second final changes of old structure into new one