Added 'watch' to Grunt targets; rearragend some Grunt tasks.
Started on the code generator.