cleanup and reorganize tools

Yakubov, Sergeyrequested to merge
110-cleanup-tools into dev

Closes #110 (closed)

Merge request reports