Removing unnecessary dependencies from the common module. Moving some federation specific classes to the federation module.