Repository: scala-steward-org/scala-steward
Pull request #1723 (2020-11-08 14:18:27)

Move bitbucket{,server}, github, gitlab packages into vcs
The main purpose of these packages is to implement `VCSApiAlg` which lives under `vcs` so I think it makes more sense also have them under `vcs`. This should make it easier to navigate between related or similar code.


Patch:
diff --git a/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala
index 5cb816c1..5714baaf 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala
@@ -19,12 +19,12 @@ package org.scalasteward.core.vcs
 import io.chrisdavenport.log4cats.Logger
 import org.scalasteward.core.application.Config
 import org.scalasteward.core.application.SupportedVCS.{Bitbucket, BitbucketServer, GitHub, Gitlab}
-import org.scalasteward.core.bitbucket.http4s.Http4sBitbucketApiAlg
-import org.scalasteward.core.bitbucketserver.http4s.Http4sBitbucketServerApiAlg
-import org.scalasteward.core.github.http4s.Http4sGitHubApiAlg
-import org.scalasteward.core.gitlab.http4s.Http4sGitLabApiAlg
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow}
+import org.scalasteward.core.vcs.bitbucket.http4s.Http4sBitbucketApiAlg
+import org.scalasteward.core.vcs.bitbucketserver.http4s.Http4sBitbucketServerApiAlg
 import org.scalasteward.core.vcs.data.AuthenticatedUser
+import org.scalasteward.core.vcs.github.http4s.Http4sGitHubApiAlg
+import org.scalasteward.core.vcs.gitlab.http4s.Http4sGitLabApiAlg
 
 final class VCSSelection[F[_]](implicit
     client: HttpJsonClient[F],
@@ -33,13 +33,13 @@ final class VCSSelection[F[_]](implicit
     F: MonadThrow[F]
 ) {
   private def github(config: Config): Http4sGitHubApiAlg[F] = {
-    import org.scalasteward.core.github.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.github.http4s.authentication.addCredentials
 
     new Http4sGitHubApiAlg[F](config.vcsApiHost, _ => addCredentials(user))
   }
 
   private def gitlab(config: Config): Http4sGitLabApiAlg[F] = {
-    import org.scalasteward.core.gitlab.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.gitlab.http4s.authentication.addCredentials
     new Http4sGitLabApiAlg[F](
       config.vcsApiHost,
       user,
@@ -50,13 +50,13 @@ final class VCSSelection[F[_]](implicit
   }
 
   private def bitbucket(config: Config): Http4sBitbucketApiAlg[F] = {
-    import org.scalasteward.core.bitbucket.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
 
     new Http4sBitbucketApiAlg(config.vcsApiHost, user, _ => addCredentials(user), config.doNotFork)
   }
 
   private def bitbucketServer(config: Config): Http4sBitbucketServerApiAlg[F] = {
-    import org.scalasteward.core.bitbucket.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
 
     new Http4sBitbucketServerApiAlg[F](
       config.vcsApiHost,
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/Url.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/Url.scala
similarity index 96%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/Url.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/Url.scala
index b612a721..206d0b65 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/Url.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket
+package org.scalasteward.core.vcs.bitbucket
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/CreatePullRequestRequest.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/CreatePullRequestRequest.scala
similarity index 96%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/CreatePullRequestRequest.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/CreatePullRequestRequest.scala
index 451a03a5..363500ca 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/CreatePullRequestRequest.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/CreatePullRequestRequest.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.{Encoder, Json}
 import org.scalasteward.core.git.Branch
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlg.scala
similarity index 95%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlg.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlg.scala
index 671c25c2..9592beb1 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlg.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlg.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.syntax.all._
 import org.http4s.{Request, Status, Uri}
-import org.scalasteward.core.bitbucket.Url
-import org.scalasteward.core.bitbucket.http4s.json._
 import org.scalasteward.core.git.Branch
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
+import org.scalasteward.core.vcs.bitbucket.Url
+import org.scalasteward.core.vcs.bitbucket.http4s.json._
 import org.scalasteward.core.vcs.data._
 
 class Http4sBitbucketApiAlg[F[_]](
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Page.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Page.scala
similarity index 94%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Page.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Page.scala
index c1a96013..2b851964 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Page.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Page.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Decoder
 
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/RepositoryResponse.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/RepositoryResponse.scala
similarity index 98%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/RepositoryResponse.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/RepositoryResponse.scala
index 965d6bf2..4238fdf7 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/RepositoryResponse.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/RepositoryResponse.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.syntax.all._
 import io.circe.{ACursor, Decoder, DecodingFailure, Json}
diff --git a/modules/core/src/main/scala/org/scalasteward/core/github/http4s/authentication.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/authentication.scala
similarity index 95%
rename from modules/core/src/main/scala/org/scalasteward/core/github/http4s/authentication.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/authentication.scala
index a7d6081d..abdbefb2 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/github/http4s/authentication.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.Applicative
 import cats.syntax.all._
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/json.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/json.scala
similarity index 97%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/json.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/json.scala
index c975db46..aee4567a 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/json.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/json.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Decoder
 import org.http4s.Uri
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
similarity index 97%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
index 36633ebc..a3eb52dc 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucketserver.http4s
+package org.scalasteward.core.vcs.bitbucketserver.http4s
 
 import cats.syntax.all._
 import org.http4s.{Request, Uri}
-import org.scalasteward.core.bitbucketserver.http4s.Json.{Reviewer, User}
 import org.scalasteward.core.git.Branch
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow}
 import org.scalasteward.core.vcs.VCSApiAlg
+import org.scalasteward.core.vcs.bitbucketserver.http4s.Json.{Reviewer, User}
 import org.scalasteward.core.vcs.data.PullRequestState.Open
 import org.scalasteward.core.vcs.data._
 
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Json.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Json.scala
similarity index 98%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Json.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Json.scala
index d82ea3ce..d89491e5 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucketserver/http4s/Json.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucketserver/http4s/Json.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucketserver.http4s
+package org.scalasteward.core.vcs.bitbucketserver.http4s
 
 import cats.data.NonEmptyList
 import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
diff --git a/modules/core/src/main/scala/org/scalasteward/core/github/Url.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/Url.scala
similarity index 96%
rename from modules/core/src/main/scala/org/scalasteward/core/github/Url.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/github/Url.scala
index 286742b0..9a5181e7 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/github/Url.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github
+package org.scalasteward.core.vcs.github
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch
diff --git a/modules/core/src/main/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlg.scala
similarity index 95%
rename from modules/core/src/main/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlg.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlg.scala
index 06f928b2..66edbdf5 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlg.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlg.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import org.http4s.{Request, Uri}
 import org.scalasteward.core.git.Branch
-import org.scalasteward.core.github._
 import org.scalasteward.core.util.HttpJsonClient
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data._
+import org.scalasteward.core.vcs.github._
 
 final class Http4sGitHubApiAlg[F[_]](
     gitHubApiHost: Uri,
diff --git a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/authentication.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/authentication.scala
similarity index 95%
rename from modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/authentication.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/authentication.scala
index e01fc776..f7fc3f6c 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/authentication.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/github/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.Applicative
 import cats.syntax.all._
diff --git a/modules/core/src/main/scala/org/scalasteward/core/gitlab/Url.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/Url.scala
similarity index 97%
rename from modules/core/src/main/scala/org/scalasteward/core/gitlab/Url.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/Url.scala
index e6cab79f..a613ace2 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/gitlab/Url.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab
+package org.scalasteward.core.vcs.gitlab
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch
diff --git a/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlg.scala
similarity index 98%
rename from modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlg.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlg.scala
index bdd3942e..07788d23 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlg.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlg.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.syntax.all._
 import io.chrisdavenport.log4cats.Logger
@@ -23,11 +23,11 @@ import io.circe.generic.semiauto._
 import io.circe.syntax._
 import org.http4s.{Request, Status, Uri}
 import org.scalasteward.core.git.{Branch, Sha1}
-import org.scalasteward.core.gitlab._
 import org.scalasteward.core.util.uri.uriDecoder
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data._
+import org.scalasteward.core.vcs.gitlab._
 
 final private[http4s] case class ForkPayload(id: String, namespace: String)
 final private[http4s] case class MergeRequestPayload(
diff --git a/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/authentication.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/authentication.scala
similarity index 95%
rename from modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/authentication.scala
rename to modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/authentication.scala
index 1b8d67d4..bf1d6a58 100644
--- a/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/authentication.scala
+++ b/modules/core/src/main/scala/org/scalasteward/core/vcs/gitlab/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.Applicative
 import cats.syntax.all._


Test patch:
diff --git a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala
similarity index 99%
rename from modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala
index 8ce2c449..1b792f56 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.effect.IO
 import io.circe.literal._
diff --git a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/JsonCodecTest.scala
similarity index 92%
rename from modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/JsonCodecTest.scala
index dcd17bd6..b709253d 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/bitbucket/http4s/JsonCodecTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Json
 import org.scalasteward.core.vcs.data.PullRequestState
diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/UrlTest.scala
similarity index 96%
rename from modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/github/UrlTest.scala
index 3f82cb3a..e71b0a6f 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/UrlTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github
+package org.scalasteward.core.vcs.github
 
 import org.http4s.syntax.literals._
 import org.scalasteward.core.git.Branch
diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlgTest.scala
similarity index 98%
rename from modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlgTest.scala
index cb017127..59504930 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/Http4sGitHubApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.effect.IO
 import io.circe.literal._
diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/authenticationTest.scala
similarity index 93%
rename from modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/authenticationTest.scala
index fe662b71..e420b3d6 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/github/http4s/authenticationTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.Id
 import org.http4s.headers.{Accept, Authorization}
diff --git a/modules/core/src/test/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlgTest.scala
similarity index 99%
rename from modules/core/src/test/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlgTest.scala
rename to modules/core/src/test/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlgTest.scala
index 774c05ca..0d11409a 100644
--- a/modules/core/src/test/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlgTest.scala
+++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/gitlab/http4s/Http4sGitlabApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.effect.IO
 import io.circe.literal._