Switching some sections around of edited in the structure