initial work required to move to antlr4

+ more package naming changes