Reorganizing and adding antlr project