diff --git a/sigserver/.gitignore b/server/go/sigserver/.gitignore
similarity index 100%
rename from sigserver/.gitignore
rename to server/go/sigserver/.gitignore
diff --git a/sigserver/Makefile b/server/go/sigserver/Makefile
similarity index 100%
rename from sigserver/Makefile
rename to server/go/sigserver/Makefile
diff --git a/sigserver/camsigd.go b/server/go/sigserver/camsigd.go
similarity index 100%
rename from sigserver/camsigd.go
rename to server/go/sigserver/camsigd.go
diff --git a/sigserver/run.sh b/server/go/sigserver/run.sh
similarity index 100%
rename from sigserver/run.sh
rename to server/go/sigserver/run.sh
diff --git a/sigserver/spec.txt b/server/go/sigserver/spec.txt
similarity index 100%
rename from sigserver/spec.txt
rename to server/go/sigserver/spec.txt
diff --git a/sigserver/test/00-start.t b/server/go/sigserver/test/00-start.t
similarity index 100%
rename from sigserver/test/00-start.t
rename to server/go/sigserver/test/00-start.t
diff --git a/sigserver/test/CamsigdTest.pm b/server/go/sigserver/test/CamsigdTest.pm
similarity index 100%
rename from sigserver/test/CamsigdTest.pm
rename to server/go/sigserver/test/CamsigdTest.pm
diff --git a/sigserver/test/test-keyring.gpg b/server/go/sigserver/test/test-keyring.gpg
similarity index 100%
rename from sigserver/test/test-keyring.gpg
rename to server/go/sigserver/test/test-keyring.gpg
diff --git a/sigserver/test/test-secring.gpg b/server/go/sigserver/test/test-secring.gpg
similarity index 100%
rename from sigserver/test/test-secring.gpg
rename to server/go/sigserver/test/test-secring.gpg