little fix
removed reduntatd dirs; copied tools to sep dir