diff --git a/devices/orbweaver/orbweaver.go b/devices/orbweaver/orbweaver.go
index 6c2d747..95743b8 100644
--- a/devices/orbweaver/orbweaver.go
+++ b/devices/orbweaver/orbweaver.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/OrbTools/OrbCommon/common/gui"
+	"github.com/OrbTools/OrbCommon/gui"
 )
 
 //BINDING Map of Default Keys
diff --git a/common/gui/guibuilder.go b/gui/gui.go
similarity index 100%
rename from common/gui/guibuilder.go
rename to gui/gui.go
diff --git a/common/hid/hid.go b/hid/hid.go
similarity index 100%
rename from common/hid/hid.go
rename to hid/hid.go