package macros now is negotiation-dsl;
 the DSL is moved to that package and the intent is to use macros.