more restructuring
work on bindings