Reordered the structure