EAGLESIX-2992: Organizing the code to be better understood.