Changes of contact

Finished
Reorganize tools