Move z and grc to the more apt system folder