don't organise it by nip unless the nip is very narrow, eg 42, 5, 45, 19

honestly, nip 1 has so many things in it and it's really brittle architecture to build as a set, can't change so much code becouse it's a monolith