diff --git a/bp2build/build_conversion.go b/bp2build/build_conversion.go
index a64d474d3..f652a3517 100644
--- a/bp2build/build_conversion.go
+++ b/bp2build/build_conversion.go
@@ -14,14 +14,20 @@
 
 package bp2build
 
+/*
+For shareable/common functionality for conversion from soong-module to build files
+for queryview/bp2build
+*/
+
 import (
-	"android/soong/android"
-	"android/soong/bazel"
 	"fmt"
 	"reflect"
 	"sort"
 	"strings"
 
+	"android/soong/android"
+	"android/soong/bazel"
+
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 )
diff --git a/bp2build/testing.go b/bp2build/testing.go
index 376bf49d2..ba328e941 100644
--- a/bp2build/testing.go
+++ b/bp2build/testing.go
@@ -1,5 +1,10 @@
 package bp2build
 
+/*
+For shareable/common bp2build testing functionality and dumping ground for
+specific-but-shared functionality among tests in package
+*/
+
 import (
 	"strings"
 	"testing"