Revert "Tools restructure"
Merge pull request #35 from tldrcode/revert-34-tools-restructure

Revert "Tools restructure"