Move internal packages to an internal folder

For reference: https://go.dev/doc/go1.4#internalpackages

Makefile

@@ -3,7 +3,7 @@ DOCKER_IMAGE := miniflux/miniflux
 VERSION      := $(shell git describe --tags --abbrev=0)
 COMMIT       := $(shell git rev-parse --short HEAD)
 BUILD_DATE   := `date +%FT%T%z`
-LD_FLAGS     := "-s -w -X 'miniflux.app/v2/version.Version=$(VERSION)' -X 'miniflux.app/v2/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/version.BuildDate=$(BUILD_DATE)'"
+LD_FLAGS     := "-s -w -X 'miniflux.app/v2/internal/version.Version=$(VERSION)' -X 'miniflux.app/v2/internal/version.Commit=$(COMMIT)' -X 'miniflux.app/v2/internal/version.BuildDate=$(BUILD_DATE)'"
 PKG_LIST     := $(shell go list ./... | grep -v /vendor/)
 DB_URL       := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
 DEB_IMG_ARCH := amd64
@@ -122,7 +122,7 @@ integration-test:
 	./miniflux-test >/tmp/miniflux.log 2>&1 & echo "$$!" > "/tmp/miniflux.pid"
 	
 	while ! nc -z localhost 8080; do sleep 1; done
-	go test -v -tags=integration -count=1 miniflux.app/v2/tests
+	go test -v -tags=integration -count=1 miniflux.app/v2/internal/tests
 
 clean-integration-test:
 	@ kill -9 `cat /tmp/miniflux.pid`

client/README.md

@@ -1,7 +1,7 @@
 Miniflux API Client
 ===================
 
-[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/client)](https://pkg.go.dev/miniflux.app/client)
+[![PkgGoDev](https://pkg.go.dev/badge/miniflux.app/v2/client)](https://pkg.go.dev/miniflux.app/v2/client)
 
 Client library for Miniflux REST API.
 
@@ -9,7 +9,7 @@ Installation
 ------------
 
 ```bash
-go get -u miniflux.app/client
+go get -u miniflux.app/v2/client
 ```
 
 Example

api/api.go → internal/api/api.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	"net/http"
 
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/worker"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/worker"
 
 	"github.com/gorilla/mux"
 )

api/category.go → internal/api/category.go

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	json_parser "encoding/json"
 	"net/http"
 	"time"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/validator"
 )
 
 func (h *handler) createCategory(w http.ResponseWriter, r *http.Request) {

api/entry.go → internal/api/entry.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	json_parser "encoding/json"
@@ -11,16 +11,16 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/integration"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/proxy"
-	"miniflux.app/v2/reader/processor"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/url"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxy"
+	"miniflux.app/v2/internal/reader/processor"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/url"
+	"miniflux.app/v2/internal/validator"
 )
 
 func (h *handler) getEntryFromBuilder(w http.ResponseWriter, r *http.Request, b *storage.EntryQueryBuilder) {

api/feed.go → internal/api/feed.go

@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	json_parser "encoding/json"
 	"net/http"
 	"time"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/model"
-	feedHandler "miniflux.app/v2/reader/handler"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	feedHandler "miniflux.app/v2/internal/reader/handler"
+	"miniflux.app/v2/internal/validator"
 )
 
 func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) {

api/icon.go → internal/api/icon.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	"net/http"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
 )
 
 func (h *handler) feedIcon(w http.ResponseWriter, r *http.Request) {

api/middleware.go → internal/api/middleware.go

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	"context"
 	"net/http"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/storage"
 )
 
 type middleware struct {

api/opml.go → internal/api/opml.go

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	"net/http"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/http/response/xml"
-	"miniflux.app/v2/reader/opml"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/http/response/xml"
+	"miniflux.app/v2/internal/reader/opml"
 )
 
 func (h *handler) exportFeeds(w http.ResponseWriter, r *http.Request) {

api/payload.go → internal/api/payload.go

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
-	"miniflux.app/v2/model"
+	"miniflux.app/v2/internal/model"
 )
 
 type feedIconResponse struct {

api/subscription.go → internal/api/subscription.go

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	json_parser "encoding/json"
 	"net/http"
 
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/reader/subscription"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/reader/subscription"
+	"miniflux.app/v2/internal/validator"
 )
 
 func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) {

api/user.go → internal/api/user.go

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package api // import "miniflux.app/v2/api"
+package api // import "miniflux.app/v2/internal/api"
 
 import (
 	json_parser "encoding/json"
 	"errors"
 	"net/http"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/validator"
 )
 
 func (h *handler) currentUser(w http.ResponseWriter, r *http.Request) {

cli/ask_credentials.go → internal/cli/ask_credentials.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"bufio"

cli/cleanup_tasks.go → internal/cli/cleanup_tasks.go

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/metric"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/metric"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/storage"
 )
 
 func runCleanupTasks(store *storage.Storage) {

cli/cli.go → internal/cli/cli.go

@@ -1,19 +1,19 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"flag"
 	"fmt"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/database"
-	"miniflux.app/v2/locale"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/ui/static"
-	"miniflux.app/v2/version"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/database"
+	"miniflux.app/v2/internal/locale"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/ui/static"
+	"miniflux.app/v2/internal/version"
 )
 
 const (

cli/create_admin.go → internal/cli/create_admin.go

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/validator"
 )
 
 func createAdmin(store *storage.Storage) {

cli/daemon.go → internal/cli/daemon.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"context"
@@ -11,13 +11,13 @@ import (
 	"syscall"
 	"time"
 
-	"miniflux.app/v2/config"
-	httpd "miniflux.app/v2/http/server"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/metric"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/systemd"
-	"miniflux.app/v2/worker"
+	"miniflux.app/v2/internal/config"
+	httpd "miniflux.app/v2/internal/http/server"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/metric"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/systemd"
+	"miniflux.app/v2/internal/worker"
 )
 
 func startDaemon(store *storage.Storage) {

cli/flush_sessions.go → internal/cli/flush_sessions.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/storage"
 )
 
 func flushSessions(store *storage.Storage) {

cli/health_check.go → internal/cli/health_check.go

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"net/http"
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/logger"
 )
 
 func doHealthCheck(healthCheckEndpoint string) {

cli/info.go → internal/cli/info.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"fmt"
 	"runtime"
 
-	"miniflux.app/v2/version"
+	"miniflux.app/v2/internal/version"
 )
 
 func info() {

cli/refresh_feeds.go → internal/cli/refresh_feeds.go

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"sync"
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
-	feedHandler "miniflux.app/v2/reader/handler"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
+	feedHandler "miniflux.app/v2/internal/reader/handler"
+	"miniflux.app/v2/internal/storage"
 )
 
 func refreshFeeds(store *storage.Storage) {

cli/reset_password.go → internal/cli/reset_password.go

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/validator"
 )
 
 func resetPassword(store *storage.Storage) {

cli/scheduler.go → internal/cli/scheduler.go

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cli // import "miniflux.app/v2/cli"
+package cli // import "miniflux.app/v2/internal/cli"
 
 import (
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/worker"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/worker"
 )
 
 func runScheduler(store *storage.Storage, pool *worker.Pool) {

config/config.go → internal/config/config.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package config // import "miniflux.app/v2/config"
+package config // import "miniflux.app/v2/internal/config"
 
 // Opts holds parsed configuration options.
 var Opts *Options

config/config_test.go → internal/config/config_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package config // import "miniflux.app/v2/config"
+package config // import "miniflux.app/v2/internal/config"
 
 import (
 	"os"

config/options.go → internal/config/options.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package config // import "miniflux.app/v2/config"
+package config // import "miniflux.app/v2/internal/config"
 
 import (
 	"crypto/rand"
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/version"
+	"miniflux.app/v2/internal/version"
 )
 
 const (

config/parser.go → internal/config/parser.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package config // import "miniflux.app/v2/config"
+package config // import "miniflux.app/v2/internal/config"
 
 import (
 	"bufio"

config/parser_test.go → internal/config/parser_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package config // import "miniflux.app/v2/config"
+package config // import "miniflux.app/v2/internal/config"
 
 import (
 	"testing"

crypto/crypto.go → internal/crypto/crypto.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package crypto // import "miniflux.app/v2/crypto"
+package crypto // import "miniflux.app/v2/internal/crypto"
 
 import (
 	"crypto/rand"

database/database.go → internal/database/database.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package database // import "miniflux.app/v2/database"
+package database // import "miniflux.app/v2/internal/database"
 
 import (
 	"database/sql"

database/migrations.go → internal/database/migrations.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package database // import "miniflux.app/v2/database"
+package database // import "miniflux.app/v2/internal/database"
 
 import (
 	"database/sql"

errors/errors.go → internal/errors/errors.go

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package errors // import "miniflux.app/v2/errors"
+package errors // import "miniflux.app/v2/internal/errors"
 
 import (
 	"fmt"
 
-	"miniflux.app/v2/locale"
+	"miniflux.app/v2/internal/locale"
 )
 
 // LocalizedError represents an error than could be translated to another language.

fever/handler.go → internal/fever/handler.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package fever // import "miniflux.app/v2/fever"
+package fever // import "miniflux.app/v2/internal/fever"
 
 import (
 	"net/http"
@@ -9,13 +9,13 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/integration"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/proxy"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxy"
+	"miniflux.app/v2/internal/storage"
 
 	"github.com/gorilla/mux"
 )

fever/middleware.go → internal/fever/middleware.go

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package fever // import "miniflux.app/v2/fever"
+package fever // import "miniflux.app/v2/internal/fever"
 
 import (
 	"context"
 	"net/http"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/storage"
 )
 
 type middleware struct {

fever/response.go → internal/fever/response.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package fever // import "miniflux.app/v2/fever"
+package fever // import "miniflux.app/v2/internal/fever"
 
 import (
 	"time"

googlereader/handler.go → internal/googlereader/handler.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package googlereader // import "miniflux.app/v2/googlereader"
+package googlereader // import "miniflux.app/v2/internal/googlereader"
 
 import (
 	"errors"
@@ -13,19 +13,19 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/http/route"
-	"miniflux.app/v2/integration"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/proxy"
-	mff "miniflux.app/v2/reader/handler"
-	mfs "miniflux.app/v2/reader/subscription"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/url"
-	"miniflux.app/v2/validator"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/http/route"
+	"miniflux.app/v2/internal/integration"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/proxy"
+	mff "miniflux.app/v2/internal/reader/handler"
+	mfs "miniflux.app/v2/internal/reader/subscription"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/url"
+	"miniflux.app/v2/internal/validator"
 )
 
 type handler struct {

googlereader/middleware.go → internal/googlereader/middleware.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package googlereader // import "miniflux.app/v2/googlereader"
+package googlereader // import "miniflux.app/v2/internal/googlereader"
 
 import (
 	"context"
@@ -11,12 +11,12 @@ import (
 	"net/http"
 	"strings"
 
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/http/response"
-	"miniflux.app/v2/http/response/json"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
-	"miniflux.app/v2/storage"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/http/response"
+	"miniflux.app/v2/internal/http/response/json"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
+	"miniflux.app/v2/internal/storage"
 )
 
 type middleware struct {

googlereader/response.go → internal/googlereader/response.go

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package googlereader // import "miniflux.app/v2/googlereader"
+package googlereader // import "miniflux.app/v2/internal/googlereader"
 
 import (
 	"fmt"
 	"net/http"
 
-	"miniflux.app/v2/http/response"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/http/response"
+	"miniflux.app/v2/internal/logger"
 )
 
 type login struct {

http/client/client.go → internal/http/client/client.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/v2/http/client"
+package client // import "miniflux.app/v2/internal/http/client"
 
 import (
 	"bytes"
@@ -16,10 +16,10 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/errors"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/timer"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/errors"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/timer"
 )
 
 const (

http/client/client_test.go → internal/http/client/client_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/v2/http/client"
+package client // import "miniflux.app/v2/internal/http/client"
 
 import (
 	"fmt"

http/client/response.go → internal/http/client/response.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/v2/http/client"
+package client // import "miniflux.app/v2/internal/http/client"
 
 import (
 	"bytes"

http/client/response_test.go → internal/http/client/response_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package client // import "miniflux.app/v2/http/client"
+package client // import "miniflux.app/v2/internal/http/client"
 
 import (
 	"bytes"

http/cookie/cookie.go → internal/http/cookie/cookie.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package cookie // import "miniflux.app/v2/http/cookie"
+package cookie // import "miniflux.app/v2/internal/http/cookie"
 
 import (
 	"net/http"

http/request/client_ip.go → internal/http/request/client_ip.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"net"

http/request/client_ip_test.go → internal/http/request/client_ip_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"net/http"

http/request/context.go → internal/http/request/context.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import "net/http"
 

http/request/context_test.go → internal/http/request/context_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"context"

http/request/cookie.go → internal/http/request/cookie.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import "net/http"
 

http/request/cookie_test.go → internal/http/request/cookie_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"net/http"

http/request/params.go → internal/http/request/params.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"net/http"

http/request/params_test.go → internal/http/request/params_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package request // import "miniflux.app/v2/http/request"
+package request // import "miniflux.app/v2/internal/http/request"
 
 import (
 	"net/http"

http/response/builder.go → internal/http/response/builder.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package response // import "miniflux.app/v2/http/response"
+package response // import "miniflux.app/v2/internal/http/response"
 
 import (
 	"compress/flate"
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/logger"
 )
 
 const compressionThreshold = 1024

http/response/builder_test.go → internal/http/response/builder_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package response // import "miniflux.app/v2/http/response"
+package response // import "miniflux.app/v2/internal/http/response"
 
 import (
 	"errors"

http/response/html/html.go → internal/http/response/html/html.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package html // import "miniflux.app/v2/http/response/html"
+package html // import "miniflux.app/v2/internal/http/response/html"
 
 import (
 	"net/http"
 
-	"miniflux.app/v2/http/response"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/http/response"
+	"miniflux.app/v2/internal/logger"
 )
 
 // OK creates a new HTML response with a 200 status code.

http/response/html/html_test.go → internal/http/response/html/html_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package html // import "miniflux.app/v2/http/response/html"
+package html // import "miniflux.app/v2/internal/http/response/html"
 
 import (
 	"errors"

http/response/json/json.go → internal/http/response/json/json.go

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package json // import "miniflux.app/v2/http/response/json"
+package json // import "miniflux.app/v2/internal/http/response/json"
 
 import (
 	"encoding/json"
 	"errors"
 	"net/http"
 
-	"miniflux.app/v2/http/response"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/http/response"
+	"miniflux.app/v2/internal/logger"
 )
 
 const contentTypeHeader = `application/json`

http/response/json/json_test.go → internal/http/response/json/json_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package json // import "miniflux.app/v2/http/response/json"
+package json // import "miniflux.app/v2/internal/http/response/json"
 
 import (
 	"errors"

http/response/xml/xml.go → internal/http/response/xml/xml.go

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package xml // import "miniflux.app/v2/http/response/xml"
+package xml // import "miniflux.app/v2/internal/http/response/xml"
 
 import (
 	"net/http"
 
-	"miniflux.app/v2/http/response"
+	"miniflux.app/v2/internal/http/response"
 )
 
 // OK writes a standard XML response with a status 200 OK.

http/response/xml/xml_test.go → internal/http/response/xml/xml_test.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package xml // import "miniflux.app/v2/http/response/xml"
+package xml // import "miniflux.app/v2/internal/http/response/xml"
 
 import (
 	"net/http"

http/route/route.go → internal/http/route/route.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package route // import "miniflux.app/v2/http/route"
+package route // import "miniflux.app/v2/internal/http/route"
 
 import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/logger"
 )
 
 // Path returns the defined route based on given arguments.

http/server/httpd.go → internal/http/server/httpd.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package httpd // import "miniflux.app/v2/http/server"
+package httpd // import "miniflux.app/v2/internal/http/server"
 
 import (
 	"crypto/tls"
@@ -12,16 +12,16 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/api"
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/fever"
-	"miniflux.app/v2/googlereader"
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/storage"
-	"miniflux.app/v2/ui"
-	"miniflux.app/v2/version"
-	"miniflux.app/v2/worker"
+	"miniflux.app/v2/internal/api"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/fever"
+	"miniflux.app/v2/internal/googlereader"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/storage"
+	"miniflux.app/v2/internal/ui"
+	"miniflux.app/v2/internal/version"
+	"miniflux.app/v2/internal/worker"
 
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"

http/server/middleware.go → internal/http/server/middleware.go

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package httpd // import "miniflux.app/v2/http/server"
+package httpd // import "miniflux.app/v2/internal/http/server"
 
 import (
 	"context"
 	"net/http"
 
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/http/request"
-	"miniflux.app/v2/logger"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/http/request"
+	"miniflux.app/v2/internal/logger"
 )
 
 func middleware(next http.Handler) http.Handler {

integration/apprise/apprise.go → internal/integration/apprise/apprise.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"miniflux.app/v2/http/client"
-	"miniflux.app/v2/model"
+	"miniflux.app/v2/internal/http/client"
+	"miniflux.app/v2/internal/model"
 )
 
 // Client represents a Apprise client.

integration/espial/espial.go → internal/integration/espial/espial.go

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package espial // import "miniflux.app/v2/integration/espial"
+package espial // import "miniflux.app/v2/internal/integration/espial"
 
 import (
 	"fmt"
 	"net/url"
 	"path"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Document structure of an Espial document

integration/instapaper/instapaper.go → internal/integration/instapaper/instapaper.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package instapaper // import "miniflux.app/v2/integration/instapaper"
+package instapaper // import "miniflux.app/v2/internal/integration/instapaper"
 
 import (
 	"fmt"
 	"net/url"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Client represents an Instapaper client.

integration/integration.go → internal/integration/integration.go

@@ -1,24 +1,24 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package integration // import "miniflux.app/v2/integration"
+package integration // import "miniflux.app/v2/internal/integration"
 
 import (
-	"miniflux.app/v2/config"
-	"miniflux.app/v2/integration/apprise"
-	"miniflux.app/v2/integration/espial"
-	"miniflux.app/v2/integration/instapaper"
-	"miniflux.app/v2/integration/linkding"
-	"miniflux.app/v2/integration/matrixbot"
-	"miniflux.app/v2/integration/notion"
-	"miniflux.app/v2/integration/nunuxkeeper"
-	"miniflux.app/v2/integration/pinboard"
-	"miniflux.app/v2/integration/pocket"
-	"miniflux.app/v2/integration/readwise"
-	"miniflux.app/v2/integration/telegrambot"
-	"miniflux.app/v2/integration/wallabag"
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
+	"miniflux.app/v2/internal/config"
+	"miniflux.app/v2/internal/integration/apprise"
+	"miniflux.app/v2/internal/integration/espial"
+	"miniflux.app/v2/internal/integration/instapaper"
+	"miniflux.app/v2/internal/integration/linkding"
+	"miniflux.app/v2/internal/integration/matrixbot"
+	"miniflux.app/v2/internal/integration/notion"
+	"miniflux.app/v2/internal/integration/nunuxkeeper"
+	"miniflux.app/v2/internal/integration/pinboard"
+	"miniflux.app/v2/internal/integration/pocket"
+	"miniflux.app/v2/internal/integration/readwise"
+	"miniflux.app/v2/internal/integration/telegrambot"
+	"miniflux.app/v2/internal/integration/wallabag"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
 )
 
 // SendEntry sends the entry to third-party providers when the user click on "Save".

integration/linkding/linkding.go → internal/integration/linkding/linkding.go

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package linkding // import "miniflux.app/v2/integration/linkding"
+package linkding // import "miniflux.app/v2/internal/integration/linkding"
 
 import (
 	"fmt"
 	"net/url"
 	"strings"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Document structure of a Linkding document

integration/matrixbot/matrixbot.go → internal/integration/matrixbot/matrixbot.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package matrixbot // import "miniflux.app/v2/integration/matrixbot"
+package matrixbot // import "miniflux.app/v2/internal/integration/matrixbot"
 
 import (
 	"fmt"
 
-	"miniflux.app/v2/logger"
-	"miniflux.app/v2/model"
+	"miniflux.app/v2/internal/logger"
+	"miniflux.app/v2/internal/model"
 
 	"github.com/matrix-org/gomatrix"
 )

integration/notion/notion.go → internal/integration/notion/notion.go

@@ -6,7 +6,7 @@ package notion
 import (
 	"fmt"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Client represents a Notion client.

integration/nunuxkeeper/nunuxkeeper.go → internal/integration/nunuxkeeper/nunuxkeeper.go

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package nunuxkeeper // import "miniflux.app/v2/integration/nunuxkeeper"
+package nunuxkeeper // import "miniflux.app/v2/internal/integration/nunuxkeeper"
 
 import (
 	"fmt"
 	"net/url"
 	"path"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Document structure of a Nununx Keeper document

integration/pinboard/pinboard.go → internal/integration/pinboard/pinboard.go

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package pinboard // import "miniflux.app/v2/integration/pinboard"
+package pinboard // import "miniflux.app/v2/internal/integration/pinboard"
 
 import (
 	"fmt"
 	"net/url"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Client represents a Pinboard client.

integration/pocket/connector.go → internal/integration/pocket/connector.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package pocket // import "miniflux.app/v2/integration/pocket"
+package pocket // import "miniflux.app/v2/internal/integration/pocket"
 
 import (
 	"errors"
@@ -9,7 +9,7 @@ import (
 	"io"
 	"net/url"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Connector manages the authorization flow with Pocket to get a personal access token.

integration/pocket/pocket.go → internal/integration/pocket/pocket.go

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package pocket // import "miniflux.app/v2/integration/pocket"
+package pocket // import "miniflux.app/v2/internal/integration/pocket"
 
 import (
 	"fmt"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Client represents a Pocket client.

integration/readwise/readwise.go → internal/integration/readwise/readwise.go

@@ -3,13 +3,13 @@
 
 // Readwise Reader API documentation: https://readwise.io/reader_api
 
-package readwise // import "miniflux.app/v2/integration/readwise"
+package readwise // import "miniflux.app/v2/internal/integration/readwise"
 
 import (
 	"fmt"
 	"net/url"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Document structure of a Readwise Reader document

integration/telegrambot/telegrambot.go → internal/integration/telegrambot/telegrambot.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package telegrambot // import "miniflux.app/v2/integration/telegrambot"
+package telegrambot // import "miniflux.app/v2/internal/integration/telegrambot"
 
 import (
 	"bytes"
@@ -10,7 +10,7 @@ import (
 	"strconv"
 
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
-	"miniflux.app/v2/model"
+	"miniflux.app/v2/internal/model"
 )
 
 // PushEntry pushes entry to telegram chat using integration settings provided

integration/wallabag/wallabag.go → internal/integration/wallabag/wallabag.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package wallabag // import "miniflux.app/v2/integration/wallabag"
+package wallabag // import "miniflux.app/v2/internal/integration/wallabag"
 
 import (
 	"encoding/json"
@@ -9,7 +9,7 @@ import (
 	"io"
 	"net/url"
 
-	"miniflux.app/v2/http/client"
+	"miniflux.app/v2/internal/http/client"
 )
 
 // Client represents a Wallabag client.

locale/catalog.go → internal/locale/catalog.go

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package locale // import "miniflux.app/v2/locale"
+package locale // import "miniflux.app/v2/internal/locale"
 
 import (
 	"embed"