final structure reorganisation