massive rearrangement of SYSDIR