diff --git a/src/common/acl.c b/src/server/acl.c
similarity index 100%
rename from src/common/acl.c
rename to src/server/acl.c
diff --git a/src/common/acl.h b/src/server/acl.h
similarity index 100%
rename from src/common/acl.h
rename to src/server/acl.h
diff --git a/src/common/client.c b/src/server/client.c
similarity index 100%
rename from src/common/client.c
rename to src/server/client.c
diff --git a/src/common/client.h b/src/server/client.h
similarity index 100%
rename from src/common/client.h
rename to src/server/client.h
diff --git a/src/common/control.c b/src/server/control.c
similarity index 100%
rename from src/common/control.c
rename to src/server/control.c
diff --git a/src/common/control.h b/src/server/control.h
similarity index 100%
rename from src/common/control.h
rename to src/server/control.h
diff --git a/src/common/flexnbd.c b/src/server/flexnbd.c
similarity index 100%
rename from src/common/flexnbd.c
rename to src/server/flexnbd.c
diff --git a/src/common/flexnbd.h b/src/server/flexnbd.h
similarity index 100%
rename from src/common/flexnbd.h
rename to src/server/flexnbd.h
diff --git a/src/common/flexthread.c b/src/server/flexthread.c
similarity index 100%
rename from src/common/flexthread.c
rename to src/server/flexthread.c
diff --git a/src/common/flexthread.h b/src/server/flexthread.h
similarity index 100%
rename from src/common/flexthread.h
rename to src/server/flexthread.h
diff --git a/src/common/mbox.c b/src/server/mbox.c
similarity index 100%
rename from src/common/mbox.c
rename to src/server/mbox.c
diff --git a/src/common/mbox.h b/src/server/mbox.h
similarity index 100%
rename from src/common/mbox.h
rename to src/server/mbox.h
diff --git a/src/common/mirror.c b/src/server/mirror.c
similarity index 100%
rename from src/common/mirror.c
rename to src/server/mirror.c
diff --git a/src/common/mirror.h b/src/server/mirror.h
similarity index 100%
rename from src/common/mirror.h
rename to src/server/mirror.h
diff --git a/src/common/mode.c b/src/server/mode.c
similarity index 100%
rename from src/common/mode.c
rename to src/server/mode.c
diff --git a/src/common/serve.c b/src/server/serve.c
similarity index 100%
rename from src/common/serve.c
rename to src/server/serve.c
diff --git a/src/common/serve.h b/src/server/serve.h
similarity index 100%
rename from src/common/serve.h
rename to src/server/serve.h
diff --git a/src/common/status.c b/src/server/status.c
similarity index 100%
rename from src/common/status.c
rename to src/server/status.c
diff --git a/src/common/status.h b/src/server/status.h
similarity index 100%
rename from src/common/status.h
rename to src/server/status.h