added antlr4, refactored spring context