diff --git a/client-webserver/README b/client-webserver/README
index 67953f7cb..728e3c3a1 100644
--- a/client-webserver/README
+++ b/client-webserver/README
@@ -2,23 +2,6 @@ In this directory are tools that will run on webservers for sysadmins to
 automatically obtain their certs
 
 
-Set CHOCOLATESERVER environment variable for "make deploy" and client.py!
-
-
-chocolate.py - server-side, requires web.py (python-webpy),
-        PyCrypto (python-crypto) 2.3 (not 2.1!!), redis, python-redis,
-        python-protobuf, python-nss
-	probably wants to run under a web server like lighttpd with fastcgi
+Set CHOCOLATESERVER environment variable for client.py!
 
 client.py - experimental tool for making requests and parsing replies
-
-chocolate_protocol.proto - protocol definition; needs protobuf-compiler
-
-sni_challenge -
-	Assumes Apache server with name based virtual hosts is running 
-	(for intended address).
-	Call perform_sni_cert_challenge(address, r, nonce) to do the whole 
-	challenge.
-	Example code is given in main method
-	Right now requires full path specification of CSR/KEY in the Global 
-	Variables (how should this be specified?)
diff --git a/client-webserver/CSR.py b/server-ca/CSR.py
similarity index 100%
rename from client-webserver/CSR.py
rename to server-ca/CSR.py
diff --git a/client-webserver/Makefile b/server-ca/Makefile
similarity index 86%
rename from client-webserver/Makefile
rename to server-ca/Makefile
index d7501a446..91343eef4 100644
--- a/client-webserver/Makefile
+++ b/server-ca/Makefile
@@ -3,6 +3,7 @@ deploy: chocolate_protocol_pb2.py chocolate.py CSR.py pkcs10.py daemon.py
 
 chocolate_protocol_pb2.py: chocolate_protocol.proto
 	protoc chocolate_protocol.proto --python_out=.
+	cp -p chocolate_protocol_pb2.py ../client-webserver/
 
 clean:
 	rm -f *.pyc
diff --git a/server-ca/README b/server-ca/README
index 425ea402a..57b0adf0a 100644
--- a/server-ca/README
+++ b/server-ca/README
@@ -1,2 +1,22 @@
 In this directory is a reference CA implementation of the Chocolate protocol,
 DV and signing mechanism.
+
+Set CHOCOLATESERVER environment variable for "make deploy"!
+
+
+chocolate.py - server-side, requires web.py (python-webpy),
+        PyCrypto (python-crypto) 2.3 (not 2.1!!), redis, python-redis,
+        python-protobuf, python-nss
+	probably wants to run under a web server like lighttpd with fastcgi
+
+
+chocolate_protocol.proto - protocol definition; needs protobuf-compiler
+
+sni_challenge -
+	Assumes Apache server with name based virtual hosts is running 
+	(for intended address).
+	Call perform_sni_cert_challenge(address, r, nonce) to do the whole 
+	challenge.
+	Example code is given in main method
+	Right now requires full path specification of CSR/KEY in the Global 
+	Variables (how should this be specified?)
diff --git a/client-webserver/REDIS b/server-ca/REDIS
similarity index 100%
rename from client-webserver/REDIS
rename to server-ca/REDIS
diff --git a/client-webserver/chocolate.py b/server-ca/chocolate.py
similarity index 100%
rename from client-webserver/chocolate.py
rename to server-ca/chocolate.py
diff --git a/client-webserver/chocolate_protocol.proto b/server-ca/chocolate_protocol.proto
similarity index 100%
rename from client-webserver/chocolate_protocol.proto
rename to server-ca/chocolate_protocol.proto
diff --git a/client-webserver/daemon.py b/server-ca/daemon.py
similarity index 100%
rename from client-webserver/daemon.py
rename to server-ca/daemon.py
diff --git a/client-webserver/pkcs10.py b/server-ca/pkcs10.py
similarity index 100%
rename from client-webserver/pkcs10.py
rename to server-ca/pkcs10.py