KRACOEUS-7022 moving some negotiations code into negotiations

This pull request is just moving negotiations code into negotiations but no other code reorganization is being done at this time.