Added structure to tools listing