Fixing a bug with configuration; Adding generator2 package which is supposed to serve as an interface to the code generator