Organize a bit to move some code to lit modules