diff --git a/devices/devices.go b/devices/devices.go
index 3163160..0211a41 100755
--- a/devices/devices.go
+++ b/devices/devices.go
@@ -4,22 +4,22 @@ import (
 	"bytes"
 	"embed"
 	"github.com/Minizbot2012/minxdr"
-	_ "github.com/OrbTools/OrbCommon/devices/structs"
+	"github.com/OrbTools/OrbCommon/devices/structs"
 	"io"
 	"io/fs"
 	"strings"
 )
 
-var DeviceTypes map[string]*DeviceDef
+var DeviceTypes map[string]*structs.DeviceDef
 
 //go:embed xdr/*
 var df embed.FS
 
 func init() {
-	DeviceTypes = make(map[string]*DeviceDef)
+	DeviceTypes = make(map[string]*structs.DeviceDef)
 	files, _ := fs.ReadDir(df, "xdr")
 	for _, file := range files {
-		dev := new(DeviceDef)
+		dev := new(structs.DeviceDef)
 		data, _ := df.ReadFile("xdr/" + file.Name())
 		_, err := minxdr.Unmarshal(bytes.NewReader(data), dev)
 		if err != nil {
@@ -30,8 +30,8 @@ func init() {
 }
 
 //LoadKeymap Load Orbmap KM structure
-func LoadKeymap(file io.ReadCloser) *KeyMap {
-	mapped := new(KeyMap)
+func LoadKeymap(file io.ReadCloser) *structs.KeyMap {
+	mapped := new(structs.KeyMap)
 	_, err := minxdr.Unmarshal(file, mapped)
 	if err != nil {
 		panic(err.Error())