Update DOMAINS_DIR and WIZ_DIR and RACE_DIR so they look a little nicer
when in use.  Also tried to find places where they should be used and were
not currently used.