diff --git a/server/go/camlistored/sync.go b/lib/go/camli/server/sync.go
similarity index 99%
rename from server/go/camlistored/sync.go
rename to lib/go/camli/server/sync.go
index 93b47f1df..4a5c51c8f 100644
--- a/server/go/camlistored/sync.go
+++ b/lib/go/camli/server/sync.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package server
 
 import (
 	"fmt"
diff --git a/server/go/appengine/camli/misc/countingreader.go b/server/go/appengine/camli/misc/countingreader.go
new file mode 120000
index 000000000..d59289e88
--- /dev/null
+++ b/server/go/appengine/camli/misc/countingreader.go
@@ -0,0 +1 @@
+../../../../../lib/go/camli/misc/countingreader.go
\ No newline at end of file