Improved file layout
Added command line tool for generator