More refactoring of the code to differentiate between the default OU and
the contractors organizational unit.