Architectural overhaul

APBrain tgt now separate for all modes.