diff --git a/pkg/git/cloner.go b/api/internal/git/cloner.go
similarity index 100%
rename from pkg/git/cloner.go
rename to api/internal/git/cloner.go
diff --git a/pkg/git/repospec.go b/api/internal/git/repospec.go
similarity index 100%
rename from pkg/git/repospec.go
rename to api/internal/git/repospec.go
diff --git a/pkg/git/repospec_test.go b/api/internal/git/repospec_test.go
similarity index 93%
rename from pkg/git/repospec_test.go
rename to api/internal/git/repospec_test.go
index ea1bfc368..3a1a760f9 100644
--- a/pkg/git/repospec_test.go
+++ b/api/internal/git/repospec_test.go
@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 package git
 
diff --git a/api/loader/fileloader.go b/api/loader/fileloader.go
index f4c60aff2..e7822bbe6 100644
--- a/api/loader/fileloader.go
+++ b/api/loader/fileloader.go
@@ -11,7 +11,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/git"
+	"sigs.k8s.io/kustomize/v3/api/internal/git"
 )
 
 // fileLoader is a kustomization's interface to files.
diff --git a/api/loader/fileloader_test.go b/api/loader/fileloader_test.go
index a27d26080..b71417772 100644
--- a/api/loader/fileloader_test.go
+++ b/api/loader/fileloader_test.go
@@ -27,7 +27,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/git"
+	"sigs.k8s.io/kustomize/v3/api/internal/git"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )
 
diff --git a/api/loader/loader.go b/api/loader/loader.go
index 59e0a799a..10880f936 100644
--- a/api/loader/loader.go
+++ b/api/loader/loader.go
@@ -7,7 +7,7 @@ package loader
 import (
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/git"
+	"sigs.k8s.io/kustomize/v3/api/internal/git"
 )
 
 // NewLoader returns a Loader pointed at the given target.
diff --git a/pkg/expansion/expand.go b/pkg/accumulator/expansion/expand.go
similarity index 86%
rename from pkg/expansion/expand.go
rename to pkg/accumulator/expansion/expand.go
index fb15f2e13..aff2bdd59 100644
--- a/pkg/expansion/expand.go
+++ b/pkg/accumulator/expansion/expand.go
@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 // Package expansion provides functions find and replace $(FOO) style variables in strings.
 package expansion
diff --git a/pkg/expansion/expand_test.go b/pkg/accumulator/expansion/expand_test.go
similarity index 92%
rename from pkg/expansion/expand_test.go
rename to pkg/accumulator/expansion/expand_test.go
index 59b02791b..43bfeba06 100644
--- a/pkg/expansion/expand_test.go
+++ b/pkg/accumulator/expansion/expand_test.go
@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 package expansion_test
 
@@ -20,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/pkg/expansion"
+	. "sigs.k8s.io/kustomize/v3/pkg/accumulator/expansion"
 )
 
 type expected struct {
diff --git a/pkg/accumulator/refvartransformer.go b/pkg/accumulator/refvartransformer.go
index fd9d897d3..e6f21e830 100644
--- a/pkg/accumulator/refvartransformer.go
+++ b/pkg/accumulator/refvartransformer.go
@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/expansion"
+	"sigs.k8s.io/kustomize/v3/pkg/accumulator/expansion"
 )
 
 type refVarTransformer struct {
diff --git a/pkg/git/cloner_test.go b/pkg/git/cloner_test.go
deleted file mode 100644
index d3816aacf..000000000
--- a/pkg/git/cloner_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package git