Code reorganization

Moved the methods that read branches to the correponding BranchElements.