relocate some tools
Fix paths in Makefile
Merge GitHub brance into SourceForge