Update notes for submitted changes

* Refactor federation controller class hierarchy
Update notes for submitted changes

* Remove unnecessary test methods