Moves tools to separate dir
Misc fixes