diff --git a/runtime/Go/src/antlr/ATN.go b/runtime/Go/antlr/ATN.go
similarity index 100%
rename from runtime/Go/src/antlr/ATN.go
rename to runtime/Go/antlr/ATN.go
diff --git a/runtime/Go/src/antlr/ATNConfig.go b/runtime/Go/antlr/ATNConfig.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNConfig.go
rename to runtime/Go/antlr/ATNConfig.go
diff --git a/runtime/Go/src/antlr/ATNConfigSet.go b/runtime/Go/antlr/ATNConfigSet.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNConfigSet.go
rename to runtime/Go/antlr/ATNConfigSet.go
diff --git a/runtime/Go/src/antlr/ATNDeserializationOptions.go b/runtime/Go/antlr/ATNDeserializationOptions.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNDeserializationOptions.go
rename to runtime/Go/antlr/ATNDeserializationOptions.go
diff --git a/runtime/Go/src/antlr/ATNDeserializer.go b/runtime/Go/antlr/ATNDeserializer.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNDeserializer.go
rename to runtime/Go/antlr/ATNDeserializer.go
diff --git a/runtime/Go/src/antlr/ATNSimulator.go b/runtime/Go/antlr/ATNSimulator.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNSimulator.go
rename to runtime/Go/antlr/ATNSimulator.go
diff --git a/runtime/Go/src/antlr/ATNState.go b/runtime/Go/antlr/ATNState.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNState.go
rename to runtime/Go/antlr/ATNState.go
diff --git a/runtime/Go/src/antlr/ATNType.go b/runtime/Go/antlr/ATNType.go
similarity index 100%
rename from runtime/Go/src/antlr/ATNType.go
rename to runtime/Go/antlr/ATNType.go
diff --git a/runtime/Go/src/antlr/CharStream.go b/runtime/Go/antlr/CharStream.go
similarity index 100%
rename from runtime/Go/src/antlr/CharStream.go
rename to runtime/Go/antlr/CharStream.go
diff --git a/runtime/Go/src/antlr/CommonTokenFactory.go b/runtime/Go/antlr/CommonTokenFactory.go
similarity index 100%
rename from runtime/Go/src/antlr/CommonTokenFactory.go
rename to runtime/Go/antlr/CommonTokenFactory.go
diff --git a/runtime/Go/src/antlr/CommonTokenStream.go b/runtime/Go/antlr/CommonTokenStream.go
similarity index 100%
rename from runtime/Go/src/antlr/CommonTokenStream.go
rename to runtime/Go/antlr/CommonTokenStream.go
diff --git a/runtime/Go/src/antlr/DFA.go b/runtime/Go/antlr/DFA.go
similarity index 100%
rename from runtime/Go/src/antlr/DFA.go
rename to runtime/Go/antlr/DFA.go
diff --git a/runtime/Go/src/antlr/DFASerializer.go b/runtime/Go/antlr/DFASerializer.go
similarity index 100%
rename from runtime/Go/src/antlr/DFASerializer.go
rename to runtime/Go/antlr/DFASerializer.go
diff --git a/runtime/Go/src/antlr/DFAState.go b/runtime/Go/antlr/DFAState.go
similarity index 100%
rename from runtime/Go/src/antlr/DFAState.go
rename to runtime/Go/antlr/DFAState.go
diff --git a/runtime/Go/src/antlr/DiagnosticErrorListener.go b/runtime/Go/antlr/DiagnosticErrorListener.go
similarity index 100%
rename from runtime/Go/src/antlr/DiagnosticErrorListener.go
rename to runtime/Go/antlr/DiagnosticErrorListener.go
diff --git a/runtime/Go/src/antlr/ErrorListener.go b/runtime/Go/antlr/ErrorListener.go
similarity index 100%
rename from runtime/Go/src/antlr/ErrorListener.go
rename to runtime/Go/antlr/ErrorListener.go
diff --git a/runtime/Go/src/antlr/ErrorStrategy.go b/runtime/Go/antlr/ErrorStrategy.go
similarity index 100%
rename from runtime/Go/src/antlr/ErrorStrategy.go
rename to runtime/Go/antlr/ErrorStrategy.go
diff --git a/runtime/Go/src/antlr/Errors.go b/runtime/Go/antlr/Errors.go
similarity index 100%
rename from runtime/Go/src/antlr/Errors.go
rename to runtime/Go/antlr/Errors.go
diff --git a/runtime/Go/src/antlr/FileStream.go b/runtime/Go/antlr/FileStream.go
similarity index 100%
rename from runtime/Go/src/antlr/FileStream.go
rename to runtime/Go/antlr/FileStream.go
diff --git a/runtime/Go/src/antlr/InputStream.go b/runtime/Go/antlr/InputStream.go
similarity index 100%
rename from runtime/Go/src/antlr/InputStream.go
rename to runtime/Go/antlr/InputStream.go
diff --git a/runtime/Go/src/antlr/IntStream.go b/runtime/Go/antlr/IntStream.go
similarity index 100%
rename from runtime/Go/src/antlr/IntStream.go
rename to runtime/Go/antlr/IntStream.go
diff --git a/runtime/Go/src/antlr/IntervalSet.go b/runtime/Go/antlr/IntervalSet.go
similarity index 100%
rename from runtime/Go/src/antlr/IntervalSet.go
rename to runtime/Go/antlr/IntervalSet.go
diff --git a/runtime/Go/src/antlr/LICENSE.txt b/runtime/Go/antlr/LICENSE.txt
similarity index 100%
rename from runtime/Go/src/antlr/LICENSE.txt
rename to runtime/Go/antlr/LICENSE.txt
diff --git a/runtime/Go/src/antlr/LL1Analyzer.go b/runtime/Go/antlr/LL1Analyzer.go
similarity index 100%
rename from runtime/Go/src/antlr/LL1Analyzer.go
rename to runtime/Go/antlr/LL1Analyzer.go
diff --git a/runtime/Go/src/antlr/Lexer.go b/runtime/Go/antlr/Lexer.go
similarity index 100%
rename from runtime/Go/src/antlr/Lexer.go
rename to runtime/Go/antlr/Lexer.go
diff --git a/runtime/Go/src/antlr/LexerATNSimulator.go b/runtime/Go/antlr/LexerATNSimulator.go
similarity index 100%
rename from runtime/Go/src/antlr/LexerATNSimulator.go
rename to runtime/Go/antlr/LexerATNSimulator.go
diff --git a/runtime/Go/src/antlr/LexerAction.go b/runtime/Go/antlr/LexerAction.go
similarity index 100%
rename from runtime/Go/src/antlr/LexerAction.go
rename to runtime/Go/antlr/LexerAction.go
diff --git a/runtime/Go/src/antlr/LexerActionExecutor.go b/runtime/Go/antlr/LexerActionExecutor.go
similarity index 100%
rename from runtime/Go/src/antlr/LexerActionExecutor.go
rename to runtime/Go/antlr/LexerActionExecutor.go
diff --git a/runtime/Go/src/antlr/Parser.go b/runtime/Go/antlr/Parser.go
similarity index 100%
rename from runtime/Go/src/antlr/Parser.go
rename to runtime/Go/antlr/Parser.go
diff --git a/runtime/Go/src/antlr/ParserATNSimulator.go b/runtime/Go/antlr/ParserATNSimulator.go
similarity index 100%
rename from runtime/Go/src/antlr/ParserATNSimulator.go
rename to runtime/Go/antlr/ParserATNSimulator.go
diff --git a/runtime/Go/src/antlr/ParserRuleContext.go b/runtime/Go/antlr/ParserRuleContext.go
similarity index 100%
rename from runtime/Go/src/antlr/ParserRuleContext.go
rename to runtime/Go/antlr/ParserRuleContext.go
diff --git a/runtime/Go/src/antlr/PredictionContext.go b/runtime/Go/antlr/PredictionContext.go
similarity index 100%
rename from runtime/Go/src/antlr/PredictionContext.go
rename to runtime/Go/antlr/PredictionContext.go
diff --git a/runtime/Go/src/antlr/PredictionMode.go b/runtime/Go/antlr/PredictionMode.go
similarity index 100%
rename from runtime/Go/src/antlr/PredictionMode.go
rename to runtime/Go/antlr/PredictionMode.go
diff --git a/runtime/Go/src/antlr/README.md b/runtime/Go/antlr/README.md
similarity index 100%
rename from runtime/Go/src/antlr/README.md
rename to runtime/Go/antlr/README.md
diff --git a/runtime/Go/src/antlr/Recognizer.go b/runtime/Go/antlr/Recognizer.go
similarity index 100%
rename from runtime/Go/src/antlr/Recognizer.go
rename to runtime/Go/antlr/Recognizer.go
diff --git a/runtime/Go/src/antlr/RuleContext.go b/runtime/Go/antlr/RuleContext.go
similarity index 100%
rename from runtime/Go/src/antlr/RuleContext.go
rename to runtime/Go/antlr/RuleContext.go
diff --git a/runtime/Go/src/antlr/SemanticContext.go b/runtime/Go/antlr/SemanticContext.go
similarity index 100%
rename from runtime/Go/src/antlr/SemanticContext.go
rename to runtime/Go/antlr/SemanticContext.go
diff --git a/runtime/Go/src/antlr/Token.go b/runtime/Go/antlr/Token.go
similarity index 100%
rename from runtime/Go/src/antlr/Token.go
rename to runtime/Go/antlr/Token.go
diff --git a/runtime/Go/src/antlr/TokenSource.go b/runtime/Go/antlr/TokenSource.go
similarity index 100%
rename from runtime/Go/src/antlr/TokenSource.go
rename to runtime/Go/antlr/TokenSource.go
diff --git a/runtime/Go/src/antlr/TokenStream.go b/runtime/Go/antlr/TokenStream.go
similarity index 100%
rename from runtime/Go/src/antlr/TokenStream.go
rename to runtime/Go/antlr/TokenStream.go
diff --git a/runtime/Go/src/antlr/TraceListener.go b/runtime/Go/antlr/TraceListener.go
similarity index 100%
rename from runtime/Go/src/antlr/TraceListener.go
rename to runtime/Go/antlr/TraceListener.go
diff --git a/runtime/Go/src/antlr/Transition.go b/runtime/Go/antlr/Transition.go
similarity index 100%
rename from runtime/Go/src/antlr/Transition.go
rename to runtime/Go/antlr/Transition.go
diff --git a/runtime/Go/src/antlr/Tree.go b/runtime/Go/antlr/Tree.go
similarity index 100%
rename from runtime/Go/src/antlr/Tree.go
rename to runtime/Go/antlr/Tree.go
diff --git a/runtime/Go/src/antlr/Trees.go b/runtime/Go/antlr/Trees.go
similarity index 100%
rename from runtime/Go/src/antlr/Trees.go
rename to runtime/Go/antlr/Trees.go
diff --git a/runtime/Go/src/antlr/Utils.go b/runtime/Go/antlr/Utils.go
similarity index 100%
rename from runtime/Go/src/antlr/Utils.go
rename to runtime/Go/antlr/Utils.go
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
index 510f152d9..4d562ed99 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
@@ -7,10 +7,11 @@ ParserFile(file, parser, namedActions) ::= <<
 package parser // <file.grammarName>
 
 import (
-    "github.com/antlr/antlr4/runtime/Go/src/antlr"
     "reflect"
     "fmt"
     "strconv"
+
+    "github.com/antlr/antlr4/runtime/Go/antlr"
 )
 
 // Stopgap to suppress unused import error. We aren't certain
@@ -30,7 +31,7 @@ ListenerFile(file, header) ::= <<
 <fileHeader(file.grammarFileName, file.ANTLRVersion)>
 package parser // <file.grammarName>
 
-import "github.com/antlr/antlr4/runtime/Go/src/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 // A complete listener for a parse tree produced by <file.parserName>
 
@@ -49,7 +50,7 @@ BaseListenerFile(file, header) ::= <<
 <fileHeader(file.grammarFileName, file.ANTLRVersion)>
 package parser // <file.grammarName>
 
-import "github.com/antlr/antlr4/runtime/Go/src/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 // A complete base listener for a parse tree produced by <file.parserName>
 
@@ -77,7 +78,7 @@ VisitorFile(file, header) ::= <<
 <fileHeader(file.grammarFileName, file.ANTLRVersion)>
 package parser // <file.grammarName>
 
-import "github.com/antlr/antlr4/runtime/Go/src/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 <header>
 
@@ -97,7 +98,7 @@ BaseVisitorFile(file, header) ::= <<
 <fileHeader(file.grammarFileName, file.ANTLRVersion)>
 package parser // <file.grammarName>
 
-import "github.com/antlr/antlr4/runtime/Go/src/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 type Base<file.grammarName>Visitor struct {
     *antlr.BaseParseTreeVisitor
@@ -894,8 +895,9 @@ LexerFile(lexerFile, lexer, namedActions) ::= <<
 package parser
 
 import (
-    "github.com/antlr/antlr4/runtime/Go/src/antlr"
     "fmt"
+
+    "github.com/antlr/antlr4/runtime/Go/antlr"
 )
 
 // suppress unused import error, many tests