Some restructuring in the AC code
Merge remote-tracking branch 'origin/master'