diff --git a/server/go/sigserver/.gitignore b/server/sigserver/.gitignore
similarity index 100%
rename from server/go/sigserver/.gitignore
rename to server/sigserver/.gitignore
diff --git a/server/go/sigserver/camsigd.go b/server/sigserver/camsigd.go
similarity index 100%
rename from server/go/sigserver/camsigd.go
rename to server/sigserver/camsigd.go
diff --git a/server/go/sigserver/client.pl b/server/sigserver/client.pl
similarity index 100%
rename from server/go/sigserver/client.pl
rename to server/sigserver/client.pl
diff --git a/server/go/sigserver/run.sh b/server/sigserver/run.sh
similarity index 100%
rename from server/go/sigserver/run.sh
rename to server/sigserver/run.sh
diff --git a/server/go/sigserver/sign.go b/server/sigserver/sign.go
similarity index 100%
rename from server/go/sigserver/sign.go
rename to server/sigserver/sign.go
diff --git a/server/go/sigserver/spec.txt b/server/sigserver/spec.txt
similarity index 100%
rename from server/go/sigserver/spec.txt
rename to server/sigserver/spec.txt
diff --git a/server/go/sigserver/test/00-start.t b/server/sigserver/test/00-start.t
similarity index 100%
rename from server/go/sigserver/test/00-start.t
rename to server/sigserver/test/00-start.t
diff --git a/server/go/sigserver/test/10-sign.t b/server/sigserver/test/10-sign.t
similarity index 100%
rename from server/go/sigserver/test/10-sign.t
rename to server/sigserver/test/10-sign.t
diff --git a/server/go/sigserver/test/CamsigdTest.pm b/server/sigserver/test/CamsigdTest.pm
similarity index 100%
rename from server/go/sigserver/test/CamsigdTest.pm
rename to server/sigserver/test/CamsigdTest.pm
diff --git a/server/go/sigserver/test/doc.tmp b/server/sigserver/test/doc.tmp
similarity index 100%
rename from server/go/sigserver/test/doc.tmp
rename to server/sigserver/test/doc.tmp
diff --git a/server/go/sigserver/test/pubkey-blobs/sha1-82e6f3494f698aa498d5906349c0aa0a183d89a6.camli b/server/sigserver/test/pubkey-blobs/sha1-82e6f3494f698aa498d5906349c0aa0a183d89a6.camli
similarity index 100%
rename from server/go/sigserver/test/pubkey-blobs/sha1-82e6f3494f698aa498d5906349c0aa0a183d89a6.camli
rename to server/sigserver/test/pubkey-blobs/sha1-82e6f3494f698aa498d5906349c0aa0a183d89a6.camli
diff --git a/server/go/sigserver/test/sig.tmp b/server/sigserver/test/sig.tmp
similarity index 100%
rename from server/go/sigserver/test/sig.tmp
rename to server/sigserver/test/sig.tmp
diff --git a/server/go/sigserver/test/test-keyring.gpg b/server/sigserver/test/test-keyring.gpg
similarity index 100%
rename from server/go/sigserver/test/test-keyring.gpg
rename to server/sigserver/test/test-keyring.gpg
diff --git a/server/go/sigserver/test/test-keyring2.gpg b/server/sigserver/test/test-keyring2.gpg
similarity index 100%
rename from server/go/sigserver/test/test-keyring2.gpg
rename to server/sigserver/test/test-keyring2.gpg
diff --git a/server/go/sigserver/test/test-secring.gpg b/server/sigserver/test/test-secring.gpg
similarity index 100%
rename from server/go/sigserver/test/test-secring.gpg
rename to server/sigserver/test/test-secring.gpg
diff --git a/server/go/sigserver/test/test-secring2.gpg b/server/sigserver/test/test-secring2.gpg
similarity index 100%
rename from server/go/sigserver/test/test-secring2.gpg
rename to server/sigserver/test/test-secring2.gpg
diff --git a/server/go/sigserver/test/test.json b/server/sigserver/test/test.json
similarity index 100%
rename from server/go/sigserver/test/test.json
rename to server/sigserver/test/test.json
diff --git a/server/go/sigserver/verify.go b/server/sigserver/verify.go
similarity index 100%
rename from server/go/sigserver/verify.go
rename to server/sigserver/verify.go