diff --git a/cmd/root.go b/cmd/root.go
index 854fe7f..bbf9ee0 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -22,7 +22,7 @@ import (
 	"github.com/pterodactyl/wings/config"
 	"github.com/pterodactyl/wings/environment"
 	"github.com/pterodactyl/wings/loggers/cli"
-	"github.com/pterodactyl/wings/panelapi"
+	"github.com/pterodactyl/wings/remote"
 	"github.com/pterodactyl/wings/router"
 	"github.com/pterodactyl/wings/server"
 	"github.com/pterodactyl/wings/sftp"
@@ -190,11 +190,11 @@ func rootCmdRun(cmd *cobra.Command, _ []string) {
 		}).Info("configured system user successfully")
 	}
 
-	panelClient := panelapi.CreateClient(
+	panelClient := remote.CreateClient(
 		config.Get().PanelLocation,
 		config.Get().AuthenticationTokenId,
 		config.Get().AuthenticationToken,
-		panelapi.WithTimeout(time.Second*time.Duration(config.Get().RemoteQuery.Timeout)),
+		remote.WithTimeout(time.Second*time.Duration(config.Get().RemoteQuery.Timeout)),
 	)
 	_ = panelClient
 
diff --git a/server/loader.go b/server/loader.go
index b22b93f..63baded 100644
--- a/server/loader.go
+++ b/server/loader.go
@@ -16,7 +16,7 @@ import (
 	"github.com/pterodactyl/wings/config"
 	"github.com/pterodactyl/wings/environment"
 	"github.com/pterodactyl/wings/environment/docker"
-	"github.com/pterodactyl/wings/panelapi"
+	"github.com/pterodactyl/wings/remote"
 	"github.com/pterodactyl/wings/server/filesystem"
 )
 
@@ -30,7 +30,7 @@ func (m *manager) Initialize(serversPerPage int) error {
 	log.Info("fetching list of servers from API")
 	assignedServers, err := m.panelClient.GetServers(context.TODO(), serversPerPage)
 	if err != nil {
-		if !panelapi.IsRequestError(err) {
+		if !remote.IsRequestError(err) {
 			return err
 		}
 
diff --git a/server/manager.go b/server/manager.go
index 4d4fe60..2ab36cb 100644
--- a/server/manager.go
+++ b/server/manager.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/pterodactyl/wings/panelapi"
+	"github.com/pterodactyl/wings/remote"
 )
 
 type Manager interface {
@@ -16,11 +16,11 @@ type Manager interface {
 type manager struct {
 	servers Collection
 
-	panelClient panelapi.Client
+	panelClient remote.Client
 }
 
 // NewManager creates a new server manager.
-func NewManager(panelClient panelapi.Client) Manager {
+func NewManager(panelClient remote.Client) Manager {
 	return &manager{panelClient: panelClient}
 }