restuctured layout, working on bindings for tools