Improve command line tool
Fix generation path.