; and (2) by adding at the end the following new subsection: (h) Headquarters (1) In general There is in the Department a Headquarters. (2) Components The Headquarters shall include each of the following: (A) The Office of the Secretary, which shall include— (i) the Deputy Secretary; (ii) the Associate Secretary; (iii) the Chief of Staff; and (iv) the Executive Secretary. (B) The Management Directorate, including the Office of the Chief Financial Officer, Federal Protective Service, and Office of Biometric Identity Management. (C) The Science and Technology Directorate. (D) The Office of Strategy, Policy, and Plans. (E) The Office of the General Counsel. (F) The Office of the Chief Privacy and FOIA Officer. (G) The Office for Civil Rights and Civil Liberties. (H) The Office of Operations Coordination. (I) The Office of Intelligence and Analysis. (J) The Office of Legislative Affairs. (K) The Office of Public Affairs. (L) The Office of the Inspector General. (M) The Office of the Citizenship and Immigration Services Ombudsman. (N) The Countering Weapons of Mass Destruction Office. (O) The Office of Partnership and Engagement. (P) The Ombudsman for Border and Immigration Enforcement Related Concerns. . (b) Conforming amendments Section 103(a) of the Homeland Security Act of 2002 ( 6 U.S.C. 113(a) ) is amended— (1) in the subsection heading, by inserting ; Assistant Secretaries and Other Officers after Under Secretaries