diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3a6f640
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+dist/
+vendor/
\ No newline at end of file
diff --git a/tunnelserver/Makefile b/tunnelserver/Makefile
new file mode 100644
index 0000000..05cc459
--- /dev/null
+++ b/tunnelserver/Makefile
@@ -0,0 +1,19 @@
+APP_NAME := tunnelserver
+BIN_DIR := ../dist/tunnelserver
+
+all: $(BIN_DIR) $(BIN_DIR)/$(APP_NAME) copy
+
+$(BIN_DIR):
+	mkdir -p $(BIN_DIR)
+
+$(BIN_DIR)/$(APP_NAME): main.go
+	go build -o $@ $<
+copy:
+	cp -r ./conf.json $(BIN_DIR)
+
+clean:
+	rm -f $(BIN_DIR)
+test:
+	go test -v ./...
+
+.PHONY: clean test
\ No newline at end of file
diff --git a/conf.json b/tunnelserver/conf.json
similarity index 100%
rename from conf.json
rename to tunnelserver/conf.json
diff --git a/main.go b/tunnelserver/main.go
similarity index 100%
rename from main.go
rename to tunnelserver/main.go