(added) - merged tools structure into a single structure instead