diff --git a/webserver/CSR.py b/client-webserver/CSR.py
similarity index 100%
rename from webserver/CSR.py
rename to client-webserver/CSR.py
diff --git a/webserver/Makefile b/client-webserver/Makefile
similarity index 100%
rename from webserver/Makefile
rename to client-webserver/Makefile
diff --git a/webserver/README b/client-webserver/README
similarity index 100%
rename from webserver/README
rename to client-webserver/README
diff --git a/webserver/choc_cert_extensions.cnf b/client-webserver/choc_cert_extensions.cnf
similarity index 100%
rename from webserver/choc_cert_extensions.cnf
rename to client-webserver/choc_cert_extensions.cnf
diff --git a/webserver/chocolate.py b/client-webserver/chocolate.py
similarity index 100%
rename from webserver/chocolate.py
rename to client-webserver/chocolate.py
diff --git a/webserver/chocolate_protocol.proto b/client-webserver/chocolate_protocol.proto
similarity index 100%
rename from webserver/chocolate_protocol.proto
rename to client-webserver/chocolate_protocol.proto
diff --git a/webserver/client.py b/client-webserver/client.py
similarity index 100%
rename from webserver/client.py
rename to client-webserver/client.py
diff --git a/webserver/sni_challenge.py b/client-webserver/sni_challenge.py
similarity index 100%
rename from webserver/sni_challenge.py
rename to client-webserver/sni_challenge.py