moved changes related classes from tools to api
moved trees into ordering
contract variations
removed duplicate tests