diff --git a/internal_do_not_use/BUILD b/internal_do_not_use/BUILD
index af7e9d0..b6a57a4 100644
--- a/internal_do_not_use/BUILD
+++ b/internal_do_not_use/BUILD
@@ -1,3 +1,4 @@
+
 # Description:
 #   Build rules in this directory are used by our tooling and build rules
 package(
diff --git a/javatests/jsinterop/generator/externs/dependency/BUILD b/javatests/jsinterop/generator/externs/dependency/BUILD
index 9584d98..23d13fa 100644
--- a/javatests/jsinterop/generator/externs/dependency/BUILD
+++ b/javatests/jsinterop/generator/externs/dependency/BUILD
@@ -2,17 +2,17 @@
 #   Tests dependency mechanism
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "dependency",
     srcs = ["dependency.js"],
diff --git a/javatests/jsinterop/generator/externs/dependency/parentthirdparty/BUILD b/javatests/jsinterop/generator/externs/dependency/parentthirdparty/BUILD
index a4cebb9..d2d51c0 100644
--- a/javatests/jsinterop/generator/externs/dependency/parentthirdparty/BUILD
+++ b/javatests/jsinterop/generator/externs/dependency/parentthirdparty/BUILD
@@ -2,17 +2,17 @@
 #   Tests dependency mechanism
 #
 
+load(
+    "//:jsinterop_generator.bzl",
+    "jsinterop_generator",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//:jsinterop_generator.bzl",
-    "jsinterop_generator",
-)
-
 jsinterop_generator(
     name = "parentthirdparty",
     srcs = ["parentthirdparty.js"],
diff --git a/javatests/jsinterop/generator/externs/dependency/thirdparty/BUILD b/javatests/jsinterop/generator/externs/dependency/thirdparty/BUILD
index 5b1422d..0ac0b53 100644
--- a/javatests/jsinterop/generator/externs/dependency/thirdparty/BUILD
+++ b/javatests/jsinterop/generator/externs/dependency/thirdparty/BUILD
@@ -2,17 +2,17 @@
 #   Tests dependency mechanism
 #
 
+load(
+    "//:jsinterop_generator.bzl",
+    "jsinterop_generator",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//:jsinterop_generator.bzl",
-    "jsinterop_generator",
-)
-
 jsinterop_generator(
     name = "thirdparty",
     srcs = ["thirdparty.js"],
diff --git a/javatests/jsinterop/generator/externs/dependency/thirdparty2/BUILD b/javatests/jsinterop/generator/externs/dependency/thirdparty2/BUILD
index d63077f..9cc3b7a 100644
--- a/javatests/jsinterop/generator/externs/dependency/thirdparty2/BUILD
+++ b/javatests/jsinterop/generator/externs/dependency/thirdparty2/BUILD
@@ -2,17 +2,17 @@
 #   Tests dependency mechanism
 #
 
+load(
+    "//:jsinterop_generator.bzl",
+    "jsinterop_generator",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//:jsinterop_generator.bzl",
-    "jsinterop_generator",
-)
-
 jsinterop_generator(
     name = "thirdparty2",
     srcs = ["thirdparty2.js"],
diff --git a/javatests/jsinterop/generator/externs/dictionarytype/BUILD b/javatests/jsinterop/generator/externs/dictionarytype/BUILD
index f943db0..80e939d 100644
--- a/javatests/jsinterop/generator/externs/dictionarytype/BUILD
+++ b/javatests/jsinterop/generator/externs/dictionarytype/BUILD
@@ -2,17 +2,17 @@
 #   Tests dictionary types conversion
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "dictionarytype",
     srcs = ["dictionarytype.js"],
diff --git a/javatests/jsinterop/generator/externs/entitiesrenaming/BUILD b/javatests/jsinterop/generator/externs/entitiesrenaming/BUILD
index 12613c8..66ad99d 100644
--- a/javatests/jsinterop/generator/externs/entitiesrenaming/BUILD
+++ b/javatests/jsinterop/generator/externs/entitiesrenaming/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of function types.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "entitiesrenaming",
     srcs = ["entitiesrenaming.js"],
diff --git a/javatests/jsinterop/generator/externs/enums/BUILD b/javatests/jsinterop/generator/externs/enums/BUILD
index 76e37fd..24ab814 100644
--- a/javatests/jsinterop/generator/externs/enums/BUILD
+++ b/javatests/jsinterop/generator/externs/enums/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of closure enums.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "enums",
     srcs = ["enums.js"],
diff --git a/javatests/jsinterop/generator/externs/functiontype/BUILD b/javatests/jsinterop/generator/externs/functiontype/BUILD
index f0c6f23..967177e 100644
--- a/javatests/jsinterop/generator/externs/functiontype/BUILD
+++ b/javatests/jsinterop/generator/externs/functiontype/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of function types.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "FunctionType",
     srcs = ["functiontype.js"],
diff --git a/javatests/jsinterop/generator/externs/generics/BUILD b/javatests/jsinterop/generator/externs/generics/BUILD
index 78bd87c..e958c30 100644
--- a/javatests/jsinterop/generator/externs/generics/BUILD
+++ b/javatests/jsinterop/generator/externs/generics/BUILD
@@ -1,17 +1,17 @@
 # Description:
 #   Tests conversion of generics
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "Generics",
     srcs = ["generics.js"],
diff --git a/javatests/jsinterop/generator/externs/globalscope/BUILD b/javatests/jsinterop/generator/externs/globalscope/BUILD
index f42dab5..b056a5b 100644
--- a/javatests/jsinterop/generator/externs/globalscope/BUILD
+++ b/javatests/jsinterop/generator/externs/globalscope/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion property/functions defined on the global scope
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "GlobalScope",
     srcs = ["globalscope.js"],
diff --git a/javatests/jsinterop/generator/externs/integerentities/BUILD b/javatests/jsinterop/generator/externs/integerentities/BUILD
index 8a65d8d..2587fc2 100644
--- a/javatests/jsinterop/generator/externs/integerentities/BUILD
+++ b/javatests/jsinterop/generator/externs/integerentities/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion integer entities.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "integerentities",
     srcs = ["integerentities.js"],
diff --git a/javatests/jsinterop/generator/externs/iobjectiarraylike/BUILD b/javatests/jsinterop/generator/externs/iobjectiarraylike/BUILD
index 60c7b3e..08b8e23 100644
--- a/javatests/jsinterop/generator/externs/iobjectiarraylike/BUILD
+++ b/javatests/jsinterop/generator/externs/iobjectiarraylike/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion index signatures
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "iobjectiarraylike",
     srcs = ["iobjectiarraylike.js"],
diff --git a/javatests/jsinterop/generator/externs/modules/BUILD b/javatests/jsinterop/generator/externs/modules/BUILD
index 3811d2e..81a32eb 100644
--- a/javatests/jsinterop/generator/externs/modules/BUILD
+++ b/javatests/jsinterop/generator/externs/modules/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of modules
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "Modules",
     srcs = ["modules.js"],
diff --git a/javatests/jsinterop/generator/externs/natives/BUILD b/javatests/jsinterop/generator/externs/natives/BUILD
index 0afa6d6..f714309 100644
--- a/javatests/jsinterop/generator/externs/natives/BUILD
+++ b/javatests/jsinterop/generator/externs/natives/BUILD
@@ -2,6 +2,11 @@
 #   Contains helper lib used by tests
 #
 
+load(
+    "//:jsinterop_generator_import.bzl",
+    "jsinterop_generator_import",
+)
+
 package(
     default_visibility = [
         "//javatests/jsinterop/generator/externs:__subpackages__",
@@ -10,11 +15,6 @@ package(
     licenses = ["notice"],
 )
 
-load(
-    "//:jsinterop_generator_import.bzl",
-    "jsinterop_generator_import",
-)
-
 # In our test, we use a reference to native js types like Object or Array.
 # In order to avoid generating java types for those types, we put its definitions in a separate lib
 # and use it as a dependency or our test.
diff --git a/javatests/jsinterop/generator/externs/optionalparameters/BUILD b/javatests/jsinterop/generator/externs/optionalparameters/BUILD
index cfb5bdd..10e690d 100644
--- a/javatests/jsinterop/generator/externs/optionalparameters/BUILD
+++ b/javatests/jsinterop/generator/externs/optionalparameters/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of optional parameters
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "optionalparameters",
     srcs = ["optionalparameters.js"],
diff --git a/javatests/jsinterop/generator/externs/structuraltypes/BUILD b/javatests/jsinterop/generator/externs/structuraltypes/BUILD
index 201978c..f3b3595 100644
--- a/javatests/jsinterop/generator/externs/structuraltypes/BUILD
+++ b/javatests/jsinterop/generator/externs/structuraltypes/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of type literal.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "structuraltypes",
     srcs = ["structuraltypes.js"],
diff --git a/javatests/jsinterop/generator/externs/uniontypes/BUILD b/javatests/jsinterop/generator/externs/uniontypes/BUILD
index 72d0c63..c5a9535 100644
--- a/javatests/jsinterop/generator/externs/uniontypes/BUILD
+++ b/javatests/jsinterop/generator/externs/uniontypes/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion of union types
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "UnionTypes",
     srcs = ["uniontypes.js"],
diff --git a/javatests/jsinterop/generator/externs/wildcardtypes/BUILD b/javatests/jsinterop/generator/externs/wildcardtypes/BUILD
index cb96af3..54292da 100644
--- a/javatests/jsinterop/generator/externs/wildcardtypes/BUILD
+++ b/javatests/jsinterop/generator/externs/wildcardtypes/BUILD
@@ -2,17 +2,17 @@
 #   Tests conversion with forced wildcard types.
 #
 
+load(
+    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
+    "jsinterop_generator_test",
+)
+
 package(
     default_visibility = ["//:__subpackages__"],
     # Apache2
     licenses = ["notice"],
 )
 
-load(
-    "//javatests/jsinterop/generator:jsinterop_generator_test.bzl",
-    "jsinterop_generator_test",
-)
-
 jsinterop_generator_test(
     name = "wildcardtypes",
     srcs = ["wildcardtypes.js"],