diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index dae6cd0af..b8398adfe 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -67,4 +67,4 @@ jobs:
         run: go install github.com/google/go-licenses@latest
 
       - name: Run go-licenses
-        run: go-licenses check github.com/alcionai/corso --ignore github.com/alcionai/corso
\ No newline at end of file
+        run: go-licenses check github.com/alcionai/corso/src --ignore github.com/alcionai/corso/src
\ No newline at end of file
diff --git a/src/cli/backup/exchange.go b/src/cli/backup/exchange.go
index 78a4c10c7..1990dd7a5 100644
--- a/src/cli/backup/exchange.go
+++ b/src/cli/backup/exchange.go
@@ -5,14 +5,14 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/cli/options"
-	. "github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/cli/options"
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/cli/backup/exchange_integration_test.go b/src/cli/backup/exchange_integration_test.go
index ccda3c3cc..fb4e0b5f7 100644
--- a/src/cli/backup/exchange_integration_test.go
+++ b/src/cli/backup/exchange_integration_test.go
@@ -12,16 +12,16 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli"
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/internal/operations"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/cli"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/internal/operations"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/cli/backup/exchange_test.go b/src/cli/backup/exchange_test.go
index a37a48c34..d6be3ca69 100644
--- a/src/cli/backup/exchange_test.go
+++ b/src/cli/backup/exchange_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type ExchangeSuite struct {
diff --git a/src/cli/cli.go b/src/cli/cli.go
index 45537a7ae..4e8a4afd6 100644
--- a/src/cli/cli.go
+++ b/src/cli/cli.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/alcionai/corso/cli/backup"
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/cli/help"
-	"github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/cli/repo"
-	"github.com/alcionai/corso/cli/restore"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/cli/backup"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/cli/help"
+	"github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cli/repo"
+	"github.com/alcionai/corso/src/cli/restore"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 // ------------------------------------------------------------------------------------------
diff --git a/src/cli/cli_test.go b/src/cli/cli_test.go
index 0619e6f46..1c7ddbec0 100644
--- a/src/cli/cli_test.go
+++ b/src/cli/cli_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli"
+	"github.com/alcionai/corso/src/cli"
 )
 
 type CliSuite struct {
diff --git a/src/cli/config/account.go b/src/cli/config/account.go
index 8e746842c..fdc882f58 100644
--- a/src/cli/config/account.go
+++ b/src/cli/config/account.go
@@ -6,10 +6,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 // prerequisite: readRepoConfig must have been run prior to this to populate the global viper values.
diff --git a/src/cli/config/config.go b/src/cli/config/config.go
index 424699855..a7283ce87 100644
--- a/src/cli/config/config.go
+++ b/src/cli/config/config.go
@@ -11,10 +11,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	. "github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/logger"
-	"github.com/alcionai/corso/pkg/storage"
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/logger"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 const (
diff --git a/src/cli/config/config_test.go b/src/cli/config/config_test.go
index 01dbdb8b5..8f86bc768 100644
--- a/src/cli/config/config_test.go
+++ b/src/cli/config/config_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 const (
diff --git a/src/cli/config/storage.go b/src/cli/config/storage.go
index 40d20f0cf..3481538c2 100644
--- a/src/cli/config/storage.go
+++ b/src/cli/config/storage.go
@@ -8,10 +8,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 // prerequisite: readRepoConfig must have been run prior to this to populate the global viper values.
diff --git a/src/cli/help/env.go b/src/cli/help/env.go
index 6a8783cf2..b36054c0c 100644
--- a/src/cli/help/env.go
+++ b/src/cli/help/env.go
@@ -3,7 +3,7 @@ package help
 import (
 	"github.com/spf13/cobra"
 
-	. "github.com/alcionai/corso/cli/print"
+	. "github.com/alcionai/corso/src/cli/print"
 )
 
 // AddCommands attaches all `corso env * *` commands to the parent.
diff --git a/src/cli/help/env_test.go b/src/cli/help/env_test.go
index 8b1c04fb4..782e5d88c 100644
--- a/src/cli/help/env_test.go
+++ b/src/cli/help/env_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 type EnvSuite struct {
diff --git a/src/cli/options/options.go b/src/cli/options/options.go
index 29cda88d7..edaf6dc96 100644
--- a/src/cli/options/options.go
+++ b/src/cli/options/options.go
@@ -3,7 +3,7 @@ package options
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/alcionai/corso/pkg/control"
+	"github.com/alcionai/corso/src/pkg/control"
 )
 
 var fastFail bool
diff --git a/src/cli/print/print_test.go b/src/cli/print/print_test.go
index 259bf8e3c..a2efccd8a 100644
--- a/src/cli/print/print_test.go
+++ b/src/cli/print/print_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 type PrintUnitSuite struct {
diff --git a/src/cli/repo/s3.go b/src/cli/repo/s3.go
index 0fd03ef1e..be85e75e2 100644
--- a/src/cli/repo/s3.go
+++ b/src/cli/repo/s3.go
@@ -5,13 +5,13 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/alcionai/corso/cli/config"
-	. "github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/cli/config"
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 // s3 bucket info from flags
diff --git a/src/cli/repo/s3_integration_test.go b/src/cli/repo/s3_integration_test.go
index 6a5b8bb77..d7fea5bd7 100644
--- a/src/cli/repo/s3_integration_test.go
+++ b/src/cli/repo/s3_integration_test.go
@@ -6,11 +6,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli"
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/repository"
+	"github.com/alcionai/corso/src/cli"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/repository"
 )
 
 type S3IntegrationSuite struct {
diff --git a/src/cli/repo/s3_test.go b/src/cli/repo/s3_test.go
index 0cef2094e..7f49b640a 100644
--- a/src/cli/repo/s3_test.go
+++ b/src/cli/repo/s3_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 type S3Suite struct {
diff --git a/src/cli/restore/exchange.go b/src/cli/restore/exchange.go
index 04706d5dc..0f869b028 100644
--- a/src/cli/restore/exchange.go
+++ b/src/cli/restore/exchange.go
@@ -5,12 +5,12 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/cli/options"
-	. "github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/cli/options"
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 // exchange bucket info from flags
diff --git a/src/cli/restore/exchange_integration_test.go b/src/cli/restore/exchange_integration_test.go
index 6d868f6e6..7e3ca8359 100644
--- a/src/cli/restore/exchange_integration_test.go
+++ b/src/cli/restore/exchange_integration_test.go
@@ -7,15 +7,15 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli"
-	"github.com/alcionai/corso/cli/config"
-	"github.com/alcionai/corso/internal/operations"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/cli"
+	"github.com/alcionai/corso/src/cli/config"
+	"github.com/alcionai/corso/src/internal/operations"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 type RestoreExchangeIntegrationSuite struct {
diff --git a/src/cli/restore/exchange_test.go b/src/cli/restore/exchange_test.go
index 497cea3ae..ad737669d 100644
--- a/src/cli/restore/exchange_test.go
+++ b/src/cli/restore/exchange_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type ExchangeSuite struct {
diff --git a/src/cli/utils/utils.go b/src/cli/utils/utils.go
index bcd68c094..7d3adba24 100644
--- a/src/cli/utils/utils.go
+++ b/src/cli/utils/utils.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/alcionai/corso/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/repository"
 )
 
 const (
diff --git a/src/cli/utils/utils_test.go b/src/cli/utils/utils_test.go
index 09f56b305..b32c91a09 100644
--- a/src/cli/utils/utils_test.go
+++ b/src/cli/utils/utils_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/cli/utils"
+	"github.com/alcionai/corso/src/cli/utils"
 )
 
 type CliUtilsSuite struct {
diff --git a/src/cmd/mdgen/mdgen.go b/src/cmd/mdgen/mdgen.go
index c21c5cd9e..c735523d0 100644
--- a/src/cmd/mdgen/mdgen.go
+++ b/src/cmd/mdgen/mdgen.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"github.com/alcionai/corso/cli"
+	"github.com/alcionai/corso/src/cli"
 )
 
 // generate markdown files in the given.
diff --git a/src/cmd/purge/purge.go b/src/cmd/purge/purge.go
index d2c8c8721..73cbb4f55 100644
--- a/src/cmd/purge/purge.go
+++ b/src/cmd/purge/purge.go
@@ -8,13 +8,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	. "github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/cli/utils"
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector"
-	"github.com/alcionai/corso/internal/connector/exchange"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cli/utils"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector"
+	"github.com/alcionai/corso/src/internal/connector/exchange"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 var purgeCmd = &cobra.Command{
diff --git a/src/corso.go b/src/corso.go
index cc999e8c1..009a8cbed 100644
--- a/src/corso.go
+++ b/src/corso.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/alcionai/corso/cli"
+	"github.com/alcionai/corso/src/cli"
 )
 
 func main() {
diff --git a/src/go.mod b/src/go.mod
index 41e7e223a..bfdb667d1 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -1,4 +1,4 @@
-module github.com/alcionai/corso
+module github.com/alcionai/corso/src
 
 go 1.18
 
diff --git a/src/internal/common/configs_test.go b/src/internal/common/configs_test.go
index 48ef1e3c6..e59b98d08 100644
--- a/src/internal/common/configs_test.go
+++ b/src/internal/common/configs_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type CommonConfigsSuite struct {
diff --git a/src/internal/common/errors_test.go b/src/internal/common/errors_test.go
index bcc3e3c8a..0cb0ca048 100644
--- a/src/internal/common/errors_test.go
+++ b/src/internal/common/errors_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type testErr struct {
diff --git a/src/internal/common/slices_test.go b/src/internal/common/slices_test.go
index debd5928c..534b573a0 100644
--- a/src/internal/common/slices_test.go
+++ b/src/internal/common/slices_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type CommonSlicesSuite struct {
diff --git a/src/internal/common/time_test.go b/src/internal/common/time_test.go
index b92ec88b7..2f828b1dd 100644
--- a/src/internal/common/time_test.go
+++ b/src/internal/common/time_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type CommonTimeUnitSuite struct {
diff --git a/src/internal/connector/exchange/contact.go b/src/internal/connector/exchange/contact.go
index d6e401d20..ac1440ff4 100644
--- a/src/internal/connector/exchange/contact.go
+++ b/src/internal/connector/exchange/contact.go
@@ -3,7 +3,7 @@ package exchange
 import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // ContactInfo translate models.Contactable metadata into searchable content
diff --git a/src/internal/connector/exchange/contact_test.go b/src/internal/connector/exchange/contact_test.go
index bbc6fe9d5..e67898891 100644
--- a/src/internal/connector/exchange/contact_test.go
+++ b/src/internal/connector/exchange/contact_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 type ContactSuite struct {
diff --git a/src/internal/connector/exchange/event.go b/src/internal/connector/exchange/event.go
index 98836058f..e8eac0759 100644
--- a/src/internal/connector/exchange/event.go
+++ b/src/internal/connector/exchange/event.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // EventInfo searchable metadata for stored event objects.
diff --git a/src/internal/connector/exchange/event_test.go b/src/internal/connector/exchange/event_test.go
index 752d72ae7..0ea4b24e4 100644
--- a/src/internal/connector/exchange/event_test.go
+++ b/src/internal/connector/exchange/event_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 type EventSuite struct {
diff --git a/src/internal/connector/exchange/exchange_data_collection.go b/src/internal/connector/exchange/exchange_data_collection.go
index 56d550c32..bd29e555c 100644
--- a/src/internal/connector/exchange/exchange_data_collection.go
+++ b/src/internal/connector/exchange/exchange_data_collection.go
@@ -15,11 +15,11 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 var (
diff --git a/src/internal/connector/exchange/exchange_service_test.go b/src/internal/connector/exchange/exchange_service_test.go
index 054676747..485851ef9 100644
--- a/src/internal/connector/exchange/exchange_service_test.go
+++ b/src/internal/connector/exchange/exchange_service_test.go
@@ -9,14 +9,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type ExchangeServiceSuite struct {
diff --git a/src/internal/connector/exchange/iterators_test.go b/src/internal/connector/exchange/iterators_test.go
index 366c2a201..0eba2a875 100644
--- a/src/internal/connector/exchange/iterators_test.go
+++ b/src/internal/connector/exchange/iterators_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type ExchangeIteratorSuite struct {
diff --git a/src/internal/connector/exchange/mail_folder_cache.go b/src/internal/connector/exchange/mail_folder_cache.go
index 58a733c45..955af1167 100644
--- a/src/internal/connector/exchange/mail_folder_cache.go
+++ b/src/internal/connector/exchange/mail_folder_cache.go
@@ -8,8 +8,8 @@ import (
 	msfolderdelta "github.com/microsoftgraph/msgraph-sdk-go/users/item/mailfolders/delta"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/path"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/path"
 )
 
 const (
diff --git a/src/internal/connector/exchange/mail_folder_cache_test.go b/src/internal/connector/exchange/mail_folder_cache_test.go
index 2a58236eb..88e8a094c 100644
--- a/src/internal/connector/exchange/mail_folder_cache_test.go
+++ b/src/internal/connector/exchange/mail_folder_cache_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 const (
diff --git a/src/internal/connector/exchange/message.go b/src/internal/connector/exchange/message.go
index 1bf2bc394..e0728141f 100644
--- a/src/internal/connector/exchange/message.go
+++ b/src/internal/connector/exchange/message.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 func MessageInfo(msg models.Messageable) *details.ExchangeInfo {
diff --git a/src/internal/connector/exchange/message_test.go b/src/internal/connector/exchange/message_test.go
index 96a4f53d9..ea352722d 100644
--- a/src/internal/connector/exchange/message_test.go
+++ b/src/internal/connector/exchange/message_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 type MessageSuite struct {
diff --git a/src/internal/connector/exchange/query_options.go b/src/internal/connector/exchange/query_options.go
index 9e38c19be..45486dd9f 100644
--- a/src/internal/connector/exchange/query_options.go
+++ b/src/internal/connector/exchange/query_options.go
@@ -14,7 +14,7 @@ import (
 	msitem "github.com/microsoftgraph/msgraph-sdk-go/users/item/messages/item"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/path"
+	"github.com/alcionai/corso/src/internal/path"
 )
 
 //-----------------------------------------------------------------------
diff --git a/src/internal/connector/exchange/service_functions.go b/src/internal/connector/exchange/service_functions.go
index 25033dedc..867099a35 100644
--- a/src/internal/connector/exchange/service_functions.go
+++ b/src/internal/connector/exchange/service_functions.go
@@ -11,14 +11,14 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/logger"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/logger"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 var ErrFolderNotFound = errors.New("folder not found")
diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go
index ead4e775c..f9baa51f9 100644
--- a/src/internal/connector/exchange/service_iterators.go
+++ b/src/internal/connector/exchange/service_iterators.go
@@ -8,10 +8,10 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 var errNilResolver = errors.New("nil resolver")
diff --git a/src/internal/connector/exchange/service_query.go b/src/internal/connector/exchange/service_query.go
index 0f891eed6..2134aa5cf 100644
--- a/src/internal/connector/exchange/service_query.go
+++ b/src/internal/connector/exchange/service_query.go
@@ -9,8 +9,8 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
 )
 
 // GraphQuery represents functions which perform exchange-specific queries
diff --git a/src/internal/connector/graph/service.go b/src/internal/connector/graph/service.go
index d75388ba5..63a0b2f49 100644
--- a/src/internal/connector/graph/service.go
+++ b/src/internal/connector/graph/service.go
@@ -5,9 +5,9 @@ import (
 
 	msgraphsdk "github.com/microsoftgraph/msgraph-sdk-go"
 
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type QueryParams struct {
diff --git a/src/internal/connector/graph_connector.go b/src/internal/connector/graph_connector.go
index 8b207b8d4..51b01c512 100644
--- a/src/internal/connector/graph_connector.go
+++ b/src/internal/connector/graph_connector.go
@@ -14,14 +14,14 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/exchange"
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/connector/exchange"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 // GraphConnector is a struct used to wrap the GraphServiceClient and
diff --git a/src/internal/connector/graph_connector_disconnected_test.go b/src/internal/connector/graph_connector_disconnected_test.go
index 0eab39a7b..9205198f4 100644
--- a/src/internal/connector/graph_connector_disconnected_test.go
+++ b/src/internal/connector/graph_connector_disconnected_test.go
@@ -10,12 +10,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 // ---------------------------------------------------------------
diff --git a/src/internal/connector/graph_connector_test.go b/src/internal/connector/graph_connector_test.go
index f74006287..706c905d8 100644
--- a/src/internal/connector/graph_connector_test.go
+++ b/src/internal/connector/graph_connector_test.go
@@ -12,14 +12,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector/exchange"
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector/exchange"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type GraphConnectorIntegrationSuite struct {
diff --git a/src/internal/connector/mockconnector/mock_data_collection.go b/src/internal/connector/mockconnector/mock_data_collection.go
index 0595776e9..b881644b2 100644
--- a/src/internal/connector/mockconnector/mock_data_collection.go
+++ b/src/internal/connector/mockconnector/mock_data_collection.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // MockExchangeDataCollection represents a mock exchange mailbox
diff --git a/src/internal/connector/mockconnector/mock_data_collection_test.go b/src/internal/connector/mockconnector/mock_data_collection_test.go
index 44cf1035f..f18dd856c 100644
--- a/src/internal/connector/mockconnector/mock_data_collection_test.go
+++ b/src/internal/connector/mockconnector/mock_data_collection_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/support"
 )
 
 type MockExchangeCollectionSuite struct {
diff --git a/src/internal/connector/onedrive/collection.go b/src/internal/connector/onedrive/collection.go
index 4da69a356..60f71a213 100644
--- a/src/internal/connector/onedrive/collection.go
+++ b/src/internal/connector/onedrive/collection.go
@@ -6,11 +6,11 @@ import (
 	"io"
 	"path/filepath"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 const (
diff --git a/src/internal/connector/onedrive/collection_test.go b/src/internal/connector/onedrive/collection_test.go
index 8b2299d38..e66b03406 100644
--- a/src/internal/connector/onedrive/collection_test.go
+++ b/src/internal/connector/onedrive/collection_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
 )
 
 type OneDriveCollectionSuite struct {
diff --git a/src/internal/connector/onedrive/collections.go b/src/internal/connector/onedrive/collections.go
index bab9a7952..411d2cc44 100644
--- a/src/internal/connector/onedrive/collections.go
+++ b/src/internal/connector/onedrive/collections.go
@@ -7,9 +7,9 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
 )
 
 // Collections is used to retrieve OneDrive data for a
diff --git a/src/internal/connector/onedrive/drive.go b/src/internal/connector/onedrive/drive.go
index 81abb2da9..a299ea48a 100644
--- a/src/internal/connector/onedrive/drive.go
+++ b/src/internal/connector/onedrive/drive.go
@@ -7,9 +7,9 @@ import (
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 const (
diff --git a/src/internal/connector/onedrive/item.go b/src/internal/connector/onedrive/item.go
index 4233faa66..8124f0e3a 100644
--- a/src/internal/connector/onedrive/item.go
+++ b/src/internal/connector/onedrive/item.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 const (
diff --git a/src/internal/connector/onedrive/item_test.go b/src/internal/connector/onedrive/item_test.go
index 746e1275e..4da15bb66 100644
--- a/src/internal/connector/onedrive/item_test.go
+++ b/src/internal/connector/onedrive/item_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/graph"
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/connector/graph"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 type ItemIntegrationSuite struct {
diff --git a/src/internal/connector/support/errors.go b/src/internal/connector/support/errors.go
index d74589f09..4289e5058 100644
--- a/src/internal/connector/support/errors.go
+++ b/src/internal/connector/support/errors.go
@@ -9,7 +9,7 @@ import (
 	msgraph_errors "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 // GraphConnector has two types of errors that are exported
diff --git a/src/internal/connector/support/m365Support_test.go b/src/internal/connector/support/m365Support_test.go
index 7e6c08a5f..3e1fc1818 100644
--- a/src/internal/connector/support/m365Support_test.go
+++ b/src/internal/connector/support/m365Support_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
 )
 
 type DataSupportSuite struct {
diff --git a/src/internal/connector/support/m365Transform_test.go b/src/internal/connector/support/m365Transform_test.go
index 20ab6810e..d7a6584ef 100644
--- a/src/internal/connector/support/m365Transform_test.go
+++ b/src/internal/connector/support/m365Transform_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
 )
 
 type SupportTestSuite struct {
diff --git a/src/internal/connector/support/status.go b/src/internal/connector/support/status.go
index 0ec664e2c..095d79851 100644
--- a/src/internal/connector/support/status.go
+++ b/src/internal/connector/support/status.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 type ConnectorOperationStatus struct {
diff --git a/src/internal/data/data_collection.go b/src/internal/data/data_collection.go
index 7c143b17e..c5cae4e3e 100644
--- a/src/internal/data/data_collection.go
+++ b/src/internal/data/data_collection.go
@@ -3,7 +3,7 @@ package data
 import (
 	"io"
 
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // A Collection represents a compilation of data from the
diff --git a/src/internal/kopia/conn.go b/src/internal/kopia/conn.go
index a2e91f096..d39d0d7ab 100644
--- a/src/internal/kopia/conn.go
+++ b/src/internal/kopia/conn.go
@@ -13,8 +13,8 @@ import (
 	"github.com/kopia/kopia/snapshot/policy"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 const (
diff --git a/src/internal/kopia/conn_test.go b/src/internal/kopia/conn_test.go
index e041dd736..a4f325ead 100644
--- a/src/internal/kopia/conn_test.go
+++ b/src/internal/kopia/conn_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester"
 )
 
 //revive:disable:context-as-argument
diff --git a/src/internal/kopia/data_collection.go b/src/internal/kopia/data_collection.go
index 8b0236832..f7eb590fe 100644
--- a/src/internal/kopia/data_collection.go
+++ b/src/internal/kopia/data_collection.go
@@ -3,7 +3,7 @@ package kopia
 import (
 	"io"
 
-	"github.com/alcionai/corso/internal/data"
+	"github.com/alcionai/corso/src/internal/data"
 )
 
 var (
diff --git a/src/internal/kopia/data_collection_test.go b/src/internal/kopia/data_collection_test.go
index 3633c41f8..7fe4ecb18 100644
--- a/src/internal/kopia/data_collection_test.go
+++ b/src/internal/kopia/data_collection_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/data"
+	"github.com/alcionai/corso/src/internal/data"
 )
 
 // ---------------
diff --git a/src/internal/kopia/model_store.go b/src/internal/kopia/model_store.go
index 666baefe0..ca6a9907a 100644
--- a/src/internal/kopia/model_store.go
+++ b/src/internal/kopia/model_store.go
@@ -8,7 +8,7 @@ import (
 	"github.com/kopia/kopia/repo/manifest"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/model"
+	"github.com/alcionai/corso/src/internal/model"
 )
 
 const stableIDKey = "stableID"
diff --git a/src/internal/kopia/model_store_test.go b/src/internal/kopia/model_store_test.go
index 75145a124..361bd4c4d 100644
--- a/src/internal/kopia/model_store_test.go
+++ b/src/internal/kopia/model_store_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 type fooModel struct {
diff --git a/src/internal/kopia/s3.go b/src/internal/kopia/s3.go
index e029b5b87..833fa0da9 100644
--- a/src/internal/kopia/s3.go
+++ b/src/internal/kopia/s3.go
@@ -6,7 +6,7 @@ import (
 	"github.com/kopia/kopia/repo/blob"
 	"github.com/kopia/kopia/repo/blob/s3"
 
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 const (
diff --git a/src/internal/kopia/wrapper.go b/src/internal/kopia/wrapper.go
index 306592e62..0359d3d37 100644
--- a/src/internal/kopia/wrapper.go
+++ b/src/internal/kopia/wrapper.go
@@ -15,9 +15,9 @@ import (
 	"github.com/kopia/kopia/snapshot/snapshotfs"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/logger"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 const (
diff --git a/src/internal/kopia/wrapper_test.go b/src/internal/kopia/wrapper_test.go
index 2832c054e..6ba5c21b7 100644
--- a/src/internal/kopia/wrapper_test.go
+++ b/src/internal/kopia/wrapper_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/mockconnector"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/kopia/mockkopia"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/connector/mockconnector"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/kopia/mockkopia"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 const (
diff --git a/src/internal/model/model_test.go b/src/internal/model/model_test.go
index 4cdca6726..d55cffafb 100644
--- a/src/internal/model/model_test.go
+++ b/src/internal/model/model_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/model"
+	"github.com/alcionai/corso/src/internal/model"
 )
 
 type ModelUnitSuite struct {
diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go
index 136b35eb0..0472b73ce 100644
--- a/src/internal/operations/backup.go
+++ b/src/internal/operations/backup.go
@@ -7,17 +7,17 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/stats"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/connector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/stats"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // BackupOperation wraps an operation with backup-specific props.
diff --git a/src/internal/operations/backup_test.go b/src/internal/operations/backup_test.go
index d0b45e35e..d355b4355 100644
--- a/src/internal/operations/backup_test.go
+++ b/src/internal/operations/backup_test.go
@@ -10,13 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/internal/operations/operation.go b/src/internal/operations/operation.go
index d66b00c51..62e9eec37 100644
--- a/src/internal/operations/operation.go
+++ b/src/internal/operations/operation.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // opStatus describes the current status of an operation.
diff --git a/src/internal/operations/operation_test.go b/src/internal/operations/operation_test.go
index 59b721a92..d98c4f6b2 100644
--- a/src/internal/operations/operation_test.go
+++ b/src/internal/operations/operation_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 type OperationSuite struct {
diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go
index 2b666a9a2..c484220a5 100644
--- a/src/internal/operations/restore.go
+++ b/src/internal/operations/restore.go
@@ -8,17 +8,17 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/connector"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/stats"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/logger"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/connector"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/stats"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/logger"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // RestoreOperation wraps an operation with restore-specific props.
diff --git a/src/internal/operations/restore_test.go b/src/internal/operations/restore_test.go
index 98ad4aca9..ea600f9d9 100644
--- a/src/internal/operations/restore_test.go
+++ b/src/internal/operations/restore_test.go
@@ -10,16 +10,16 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/connector/exchange"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/data"
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/connector/exchange"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/data"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/internal/path/resource_path_test.go b/src/internal/path/resource_path_test.go
index d28a9c4d0..bd15f6d3b 100644
--- a/src/internal/path/resource_path_test.go
+++ b/src/internal/path/resource_path_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/path"
+	"github.com/alcionai/corso/src/internal/path"
 )
 
 const (
diff --git a/src/internal/tester/account.go b/src/internal/tester/account.go
index b5b75e636..45a06be41 100644
--- a/src/internal/tester/account.go
+++ b/src/internal/tester/account.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 var M365AcctCredEnvs = []string{
diff --git a/src/internal/tester/cli.go b/src/internal/tester/cli.go
index 842948d37..49c94a402 100644
--- a/src/internal/tester/cli.go
+++ b/src/internal/tester/cli.go
@@ -8,7 +8,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 // StubRootCmd builds a stub cobra command to be used as
diff --git a/src/internal/tester/config.go b/src/internal/tester/config.go
index 5a9bc286a..3d9d0e102 100644
--- a/src/internal/tester/config.go
+++ b/src/internal/tester/config.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 
-	"github.com/alcionai/corso/pkg/account"
+	"github.com/alcionai/corso/src/pkg/account"
 )
 
 const (
diff --git a/src/internal/tester/storage.go b/src/internal/tester/storage.go
index 4ab2b16c8..d4b50bb09 100644
--- a/src/internal/tester/storage.go
+++ b/src/internal/tester/storage.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 var AWSStorageCredEnvs = []string{
diff --git a/src/pkg/account/account.go b/src/pkg/account/account.go
index 264b8dcd5..f844eda01 100644
--- a/src/pkg/account/account.go
+++ b/src/pkg/account/account.go
@@ -3,7 +3,7 @@ package account
 import (
 	"errors"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type accountProvider int
diff --git a/src/pkg/account/m365.go b/src/pkg/account/m365.go
index 660d1e348..c175ebb4c 100644
--- a/src/pkg/account/m365.go
+++ b/src/pkg/account/m365.go
@@ -3,7 +3,7 @@ package account
 import (
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 // config exported name consts
diff --git a/src/pkg/account/m365_test.go b/src/pkg/account/m365_test.go
index 4c9cf176a..b9b2c363b 100644
--- a/src/pkg/account/m365_test.go
+++ b/src/pkg/account/m365_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 type M365CfgSuite struct {
diff --git a/src/pkg/backup/backup.go b/src/pkg/backup/backup.go
index 5322f3515..e1aa1af52 100644
--- a/src/pkg/backup/backup.go
+++ b/src/pkg/backup/backup.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/connector/support"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/stats"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/connector/support"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/stats"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 // Backup represents the result of a backup operation
diff --git a/src/pkg/backup/backup_test.go b/src/pkg/backup/backup_test.go
index daccffd30..2768235a1 100644
--- a/src/pkg/backup/backup_test.go
+++ b/src/pkg/backup/backup_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/stats"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/selectors"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/stats"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/selectors"
 )
 
 type BackupSuite struct {
diff --git a/src/pkg/backup/details/details.go b/src/pkg/backup/details/details.go
index a19aa50a2..181e36e83 100644
--- a/src/pkg/backup/details/details.go
+++ b/src/pkg/backup/details/details.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/alcionai/corso/cli/print"
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/model"
+	"github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/model"
 )
 
 // --------------------------------------------------------------------------------
diff --git a/src/pkg/backup/details/details_test.go b/src/pkg/backup/details/details_test.go
index 91dd3ce3e..2084d168c 100644
--- a/src/pkg/backup/details/details_test.go
+++ b/src/pkg/backup/details/details_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // ------------------------------------------------------------
diff --git a/src/pkg/control/options_test.go b/src/pkg/control/options_test.go
index b04bff045..34fda1feb 100644
--- a/src/pkg/control/options_test.go
+++ b/src/pkg/control/options_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/control"
+	"github.com/alcionai/corso/src/pkg/control"
 )
 
 type OptionsSuite struct {
diff --git a/src/pkg/filters/filters_test.go b/src/pkg/filters/filters_test.go
index f25f9232f..f11abc8cb 100644
--- a/src/pkg/filters/filters_test.go
+++ b/src/pkg/filters/filters_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 type FiltersSuite struct {
diff --git a/src/pkg/logger/logger.go b/src/pkg/logger/logger.go
index 1a72a574a..0d3f84c7c 100644
--- a/src/pkg/logger/logger.go
+++ b/src/pkg/logger/logger.go
@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/alcionai/corso/cli/print"
+	"github.com/alcionai/corso/src/cli/print"
 )
 
 var (
diff --git a/src/pkg/repository/repository.go b/src/pkg/repository/repository.go
index 7aaa9d813..c143b6e91 100644
--- a/src/pkg/repository/repository.go
+++ b/src/pkg/repository/repository.go
@@ -7,16 +7,16 @@ import (
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/internal/operations"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/storage"
-	"github.com/alcionai/corso/pkg/store"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/internal/operations"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/storage"
+	"github.com/alcionai/corso/src/pkg/store"
 )
 
 // Repository contains storage provider information.
diff --git a/src/pkg/repository/repository_test.go b/src/pkg/repository/repository_test.go
index 63ae7a08c..4f48b2ac3 100644
--- a/src/pkg/repository/repository_test.go
+++ b/src/pkg/repository/repository_test.go
@@ -8,12 +8,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/tester"
-	"github.com/alcionai/corso/pkg/account"
-	"github.com/alcionai/corso/pkg/control"
-	"github.com/alcionai/corso/pkg/repository"
-	"github.com/alcionai/corso/pkg/selectors"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/account"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/repository"
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 // ---------------
diff --git a/src/pkg/selectors/exchange.go b/src/pkg/selectors/exchange.go
index 10ad0549f..7de512d11 100644
--- a/src/pkg/selectors/exchange.go
+++ b/src/pkg/selectors/exchange.go
@@ -3,9 +3,9 @@ package selectors
 import (
 	"strconv"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/pkg/selectors/exchange_test.go b/src/pkg/selectors/exchange_test.go
index 1aa725004..cea6d1f10 100644
--- a/src/pkg/selectors/exchange_test.go
+++ b/src/pkg/selectors/exchange_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/internal/common"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 type ExchangeSelectorSuite struct {
diff --git a/src/pkg/selectors/helpers_test.go b/src/pkg/selectors/helpers_test.go
index 5477b1d75..cdc1198cf 100644
--- a/src/pkg/selectors/helpers_test.go
+++ b/src/pkg/selectors/helpers_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/pkg/selectors/onedrive.go b/src/pkg/selectors/onedrive.go
index 46561c3a0..820f81bfa 100644
--- a/src/pkg/selectors/onedrive.go
+++ b/src/pkg/selectors/onedrive.go
@@ -1,7 +1,7 @@
 package selectors
 
 import (
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/pkg/selectors/scopes.go b/src/pkg/selectors/scopes.go
index 405bea830..aaf9f403d 100644
--- a/src/pkg/selectors/scopes.go
+++ b/src/pkg/selectors/scopes.go
@@ -3,9 +3,9 @@ package selectors
 import (
 	"strings"
 
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/pkg/selectors/scopes_test.go b/src/pkg/selectors/scopes_test.go
index 4863e8206..242541185 100644
--- a/src/pkg/selectors/scopes_test.go
+++ b/src/pkg/selectors/scopes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/path"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/internal/path"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/src/pkg/selectors/selectors.go b/src/pkg/selectors/selectors.go
index c02ae213a..5643f4776 100644
--- a/src/pkg/selectors/selectors.go
+++ b/src/pkg/selectors/selectors.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/pkg/filters"
+	"github.com/alcionai/corso/src/pkg/filters"
 )
 
 type service int
diff --git a/src/pkg/storage/common.go b/src/pkg/storage/common.go
index 53ea2024e..fdd736a4f 100644
--- a/src/pkg/storage/common.go
+++ b/src/pkg/storage/common.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/credentials"
 )
 
 type CommonConfig struct {
diff --git a/src/pkg/storage/common_test.go b/src/pkg/storage/common_test.go
index a84f59c7b..5c8261685 100644
--- a/src/pkg/storage/common_test.go
+++ b/src/pkg/storage/common_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/pkg/credentials"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 type CommonCfgSuite struct {
diff --git a/src/pkg/storage/s3_test.go b/src/pkg/storage/s3_test.go
index 08f8ddc10..ebbb97efd 100644
--- a/src/pkg/storage/s3_test.go
+++ b/src/pkg/storage/s3_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/pkg/storage"
+	"github.com/alcionai/corso/src/pkg/storage"
 )
 
 type S3CfgSuite struct {
diff --git a/src/pkg/storage/storage.go b/src/pkg/storage/storage.go
index ede8d56a6..62436633f 100644
--- a/src/pkg/storage/storage.go
+++ b/src/pkg/storage/storage.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/src/internal/common"
 )
 
 type storageProvider int
diff --git a/src/pkg/store/backup.go b/src/pkg/store/backup.go
index d02bb1780..b6a586b74 100644
--- a/src/pkg/store/backup.go
+++ b/src/pkg/store/backup.go
@@ -6,9 +6,9 @@ import (
 	"github.com/kopia/kopia/repo/manifest"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // GetBackup gets a single backup by id.
diff --git a/src/pkg/store/backup_test.go b/src/pkg/store/backup_test.go
index bcfd76282..8bf10e44f 100644
--- a/src/pkg/store/backup_test.go
+++ b/src/pkg/store/backup_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
-	"github.com/alcionai/corso/pkg/store"
-	storeMock "github.com/alcionai/corso/pkg/store/mock"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/store"
+	storeMock "github.com/alcionai/corso/src/pkg/store/mock"
 )
 
 // ------------------------------------------------------------
diff --git a/src/pkg/store/mock/store_mock.go b/src/pkg/store/mock/store_mock.go
index f9737c129..eff7f9f51 100644
--- a/src/pkg/store/mock/store_mock.go
+++ b/src/pkg/store/mock/store_mock.go
@@ -7,9 +7,9 @@ import (
 	"github.com/kopia/kopia/repo/manifest"
 	"github.com/pkg/errors"
 
-	"github.com/alcionai/corso/internal/model"
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
+	"github.com/alcionai/corso/src/internal/model"
+	"github.com/alcionai/corso/src/pkg/backup"
+	"github.com/alcionai/corso/src/pkg/backup/details"
 )
 
 // ------------------------------------------------------------
diff --git a/src/pkg/store/store.go b/src/pkg/store/store.go
index f2a15fd44..a1c071818 100644
--- a/src/pkg/store/store.go
+++ b/src/pkg/store/store.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/kopia/kopia/repo/manifest"
 
-	"github.com/alcionai/corso/internal/kopia"
-	"github.com/alcionai/corso/internal/model"
+	"github.com/alcionai/corso/src/internal/kopia"
+	"github.com/alcionai/corso/src/internal/model"
 )
 
 var _ Storer = &kopia.ModelStore{}