diff --git a/ca/README b/server-ca/README
similarity index 100%
rename from ca/README
rename to server-ca/README
diff --git a/ca/demoCA/7f587c91.0 b/server-ca/demoCA/7f587c91.0
similarity index 100%
rename from ca/demoCA/7f587c91.0
rename to server-ca/demoCA/7f587c91.0
diff --git a/ca/demoCA/README b/server-ca/demoCA/README
similarity index 100%
rename from ca/demoCA/README
rename to server-ca/demoCA/README
diff --git a/ca/demoCA/ca-privkey.pem b/server-ca/demoCA/ca-privkey.pem
similarity index 100%
rename from ca/demoCA/ca-privkey.pem
rename to server-ca/demoCA/ca-privkey.pem
diff --git a/ca/demoCA/cacert.pem b/server-ca/demoCA/cacert.pem
similarity index 100%
rename from ca/demoCA/cacert.pem
rename to server-ca/demoCA/cacert.pem
diff --git a/ca/demoCA/certs/.emptyfile b/server-ca/demoCA/certs/.emptyfile
similarity index 100%
rename from ca/demoCA/certs/.emptyfile
rename to server-ca/demoCA/certs/.emptyfile
diff --git a/ca/demoCA/crl/.emptyfile b/server-ca/demoCA/crl/.emptyfile
similarity index 100%
rename from ca/demoCA/crl/.emptyfile
rename to server-ca/demoCA/crl/.emptyfile
diff --git a/ca/demoCA/examp.ly-cert.pem b/server-ca/demoCA/examp.ly-cert.pem
similarity index 100%
rename from ca/demoCA/examp.ly-cert.pem
rename to server-ca/demoCA/examp.ly-cert.pem
diff --git a/ca/demoCA/examp.ly-key.pem b/server-ca/demoCA/examp.ly-key.pem
similarity index 100%
rename from ca/demoCA/examp.ly-key.pem
rename to server-ca/demoCA/examp.ly-key.pem
diff --git a/ca/demoCA/index.txt b/server-ca/demoCA/index.txt
similarity index 100%
rename from ca/demoCA/index.txt
rename to server-ca/demoCA/index.txt
diff --git a/ca/demoCA/private/.emptyfile b/server-ca/demoCA/private/.emptyfile
similarity index 100%
rename from ca/demoCA/private/.emptyfile
rename to server-ca/demoCA/private/.emptyfile
diff --git a/ca/demoCA/serial b/server-ca/demoCA/serial
similarity index 100%
rename from ca/demoCA/serial
rename to server-ca/demoCA/serial
diff --git a/ca/sni_challenge/make.sh b/server-ca/sni_challenge/make.sh
similarity index 100%
rename from ca/sni_challenge/make.sh
rename to server-ca/sni_challenge/make.sh
diff --git a/ca/sni_challenge/sni_support.c b/server-ca/sni_challenge/sni_support.c
similarity index 100%
rename from ca/sni_challenge/sni_support.c
rename to server-ca/sni_challenge/sni_support.c
diff --git a/ca/sni_challenge/sni_support.h b/server-ca/sni_challenge/sni_support.h
similarity index 100%
rename from ca/sni_challenge/sni_support.h
rename to server-ca/sni_challenge/sni_support.h
diff --git a/ca/sni_challenge/sni_support.i b/server-ca/sni_challenge/sni_support.i
similarity index 100%
rename from ca/sni_challenge/sni_support.i
rename to server-ca/sni_challenge/sni_support.i
diff --git a/ca/sni_challenge/testing.key b/server-ca/sni_challenge/testing.key
similarity index 100%
rename from ca/sni_challenge/testing.key
rename to server-ca/sni_challenge/testing.key
diff --git a/ca/sni_challenge/verify_sni_challenge.py b/server-ca/sni_challenge/verify_sni_challenge.py
similarity index 100%
rename from ca/sni_challenge/verify_sni_challenge.py
rename to server-ca/sni_challenge/verify_sni_challenge.py