Reorganized the Surface into groupings. Changed no logic, just shuffled things around.