Reorganize the code so that SADIT_ROOT is not necessary