Moving around the structure to be more sensible.