diff --git a/camlistored/.gitignore b/blobserver/go/.gitignore
similarity index 100%
rename from camlistored/.gitignore
rename to blobserver/go/.gitignore
diff --git a/camlistored/Makefile b/blobserver/go/Makefile
similarity index 100%
rename from camlistored/Makefile
rename to blobserver/go/Makefile
diff --git a/camlistored/README b/blobserver/go/README
similarity index 100%
rename from camlistored/README
rename to blobserver/go/README
diff --git a/camlistored/camlistored.go b/blobserver/go/camlistored.go
similarity index 100%
rename from camlistored/camlistored.go
rename to blobserver/go/camlistored.go
diff --git a/camlistored/test-put.pl b/blobserver/go/test-put.pl
similarity index 100%
rename from camlistored/test-put.pl
rename to blobserver/go/test-put.pl