Got a bit confused on the timeline

So it goes from amane introducing nagi to Saoniji(?) then nagi gains his trust by working for him then tells him amane plans to kill him, then amane brings snj to the warehouse where they beat him up. For some reason I thought that nagi worked with saoniji before and then amane went to introduce him, not knowing that they worked together before