Removed files from gen, to allow for compiling in IntelliJ
Some reformatting
line list xml missed from previous commit