Temporary socket code reorganization
tools/*.sh back into Makefile.

It was a bad decision anyway. Not, tt comes full circle :)