Make R2A2 match the same contract as ReVerb.
Rework directory layout to match packages.