civil service restructuring