Reorginezed structs