Refactored antlr from io into dsl