Changes modules and infiles to use agent-specs as per CEP21