Merge "Move files in antlr to match upstream directory structure"