; (ii) by striking on the Secretary's and inserting on the Secretary of Homeland Security's ; and (iii) by striking Under Secretary's and inserting Administrator's . (2) Deputy administrator of the TSA Section 5314 of title 5, United States Code, is amended by inserting after the item relating to Deputy Administrators, Federal Emergency Management Agency the following: Deputy Administrator, Transportation Security Administration. . (3) Nonapplicability The amendment made by paragraph (2) of this subsection shall not affect the salary of an individual who is performing the duties of the Deputy Administrator on the date of enactment of this Act, even if that individual is subsequently appointed as Deputy Administrator. 1905. Transportation Security Administration organization Section 114, as amended by sections 1903 and 1904 of this Act, is further amended by adding at the end the following: (w) Leadership and organization (1) In general For each of the areas described in paragraph (2), the Administrator of the Transportation Security Administration shall appoint at least 1 individual who shall— (A) report directly to the Administrator or the Administrator’s designated direct report; and (B) be responsible and accountable for that area. (2) Areas described The areas described in this paragraph are as follows: (A) Aviation security operations and training, including risk-based, adaptive security— (i) focused on airport checkpoint and baggage screening operations; (ii) workforce training and development programs; and (iii) ensuring compliance with aviation security law, including regulations, and other specialized programs designed to secure air transportation. (B) Surface transportation security operations and training, including risk-based, adaptive security— (i) focused on accomplishing security systems assessments; (ii) reviewing and prioritizing projects for appropriated surface transportation security grants