US in final stage of national security revamp