Moved main() files to tools/ dir; Fixed Makefile bug in prev commit