diff --git a/Sexp.txt b/doc/Sexp.txt
similarity index 100%
rename from Sexp.txt
rename to doc/Sexp.txt
diff --git a/Makefile b/server/Makefile
similarity index 100%
rename from Makefile
rename to server/Makefile
diff --git a/cmsg_private.h b/server/cmsg_private.h
similarity index 100%
rename from cmsg_private.h
rename to server/cmsg_private.h
diff --git a/dataq.c b/server/dataq.c
similarity index 100%
rename from dataq.c
rename to server/dataq.c
diff --git a/dataq.h b/server/dataq.h
similarity index 100%
rename from dataq.h
rename to server/dataq.h
diff --git a/direct.c b/server/direct.c
similarity index 100%
rename from direct.c
rename to server/direct.c
diff --git a/direct.h b/server/direct.h
similarity index 100%
rename from direct.h
rename to server/direct.h
diff --git a/fanout.c b/server/fanout.c
similarity index 100%
rename from fanout.c
rename to server/fanout.c
diff --git a/fanout.h b/server/fanout.h
similarity index 100%
rename from fanout.h
rename to server/fanout.h
diff --git a/harness.c b/server/harness.c
similarity index 100%
rename from harness.c
rename to server/harness.c
diff --git a/harness.h b/server/harness.h
similarity index 100%
rename from harness.h
rename to server/harness.h
diff --git a/hashtable.c b/server/hashtable.c
similarity index 100%
rename from hashtable.c
rename to server/hashtable.c
diff --git a/hashtable.h b/server/hashtable.h
similarity index 100%
rename from hashtable.h
rename to server/hashtable.h
diff --git a/main.c b/server/main.c
similarity index 100%
rename from main.c
rename to server/main.c
diff --git a/meta.c b/server/meta.c
similarity index 100%
rename from meta.c
rename to server/meta.c
diff --git a/meta.h b/server/meta.h
similarity index 100%
rename from meta.h
rename to server/meta.h
diff --git a/net.c b/server/net.c
similarity index 100%
rename from net.c
rename to server/net.c
diff --git a/net.h b/server/net.h
similarity index 100%
rename from net.h
rename to server/net.h
diff --git a/node.c b/server/node.c
similarity index 100%
rename from node.c
rename to server/node.c
diff --git a/node.h b/server/node.h
similarity index 100%
rename from node.h
rename to server/node.h
diff --git a/queue.c b/server/queue.c
similarity index 100%
rename from queue.c
rename to server/queue.c
diff --git a/queue.h b/server/queue.h
similarity index 100%
rename from queue.h
rename to server/queue.h
diff --git a/ref.h b/server/ref.h
similarity index 100%
rename from ref.h
rename to server/ref.h
diff --git a/relay.c b/server/relay.c
similarity index 100%
rename from relay.c
rename to server/relay.c
diff --git a/relay.h b/server/relay.h
similarity index 100%
rename from relay.h
rename to server/relay.h
diff --git a/sexp.c b/server/sexp.c
similarity index 100%
rename from sexp.c
rename to server/sexp.c
diff --git a/sexp.h b/server/sexp.h
similarity index 100%
rename from sexp.h
rename to server/sexp.h
diff --git a/sexpio.c b/server/sexpio.c
similarity index 100%
rename from sexpio.c
rename to server/sexpio.c
diff --git a/sexpio.h b/server/sexpio.h
similarity index 100%
rename from sexpio.h
rename to server/sexpio.h
diff --git a/subscription.c b/server/subscription.c
similarity index 100%
rename from subscription.c
rename to server/subscription.c
diff --git a/subscription.h b/server/subscription.h
similarity index 100%
rename from subscription.h
rename to server/subscription.h
diff --git a/test1.c b/server/test1.c
similarity index 100%
rename from test1.c
rename to server/test1.c
diff --git a/test1_latency.c b/server/test1_latency.c
similarity index 100%
rename from test1_latency.c
rename to server/test1_latency.c
diff --git a/test3.c b/server/test3.c
similarity index 100%
rename from test3.c
rename to server/test3.c
diff --git a/test3_latency.c b/server/test3_latency.c
similarity index 100%
rename from test3_latency.c
rename to server/test3_latency.c
diff --git a/util.c b/server/util.c
similarity index 100%
rename from util.c
rename to server/util.c