Config update

Some reorganisation, new features, and fixes
RR 2.6.6.0-EXP XML update