diff --git a/Makefile b/Makefile
index 116909a2..fa82d67c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ GOARCH ?= arm
 GOARM  ?= 7
 
 all:
-	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build gen_gdl90.go traffic.go ry835ai.go network.go
+	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go get -t -d -v ./...
+	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build main/{gen_gdl90,traffic,ry835ai,network}.go
 
 install:
 	cp -f gen_gdl90 /usr/bin/gen_gdl90
diff --git a/gen_gdl90.go b/main/gen_gdl90.go
similarity index 100%
rename from gen_gdl90.go
rename to main/gen_gdl90.go
diff --git a/network.go b/main/network.go
similarity index 100%
rename from network.go
rename to main/network.go
diff --git a/ry835ai.go b/main/ry835ai.go
similarity index 99%
rename from ry835ai.go
rename to main/ry835ai.go
index 9bb3e987..ab9297eb 100644
--- a/ry835ai.go
+++ b/main/ry835ai.go
@@ -13,7 +13,7 @@ import (
 	"github.com/kidoman/embd/sensor/bmp180"
 	"github.com/tarm/serial"
 
-	"./mpu6050"
+	"../mpu6050"
 )
 
 type SituationData struct {
diff --git a/traffic.go b/main/traffic.go
similarity index 100%
rename from traffic.go
rename to main/traffic.go
diff --git a/extract_metar.go b/test/extract_metar.go
similarity index 100%
rename from extract_metar.go
rename to test/extract_metar.go
diff --git a/sensortest.go b/test/sensortest.go
similarity index 98%
rename from sensortest.go
rename to test/sensortest.go
index 93efafd9..a778ee8c 100644
--- a/sensortest.go
+++ b/test/sensortest.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"./mpu6050"
+	"../mpu6050"
 	"fmt"
 	"github.com/kidoman/embd"
 	_ "github.com/kidoman/embd/host/all"