diff --git a/server/dns.go b/nameserver/dns.go
similarity index 100%
rename from server/dns.go
rename to nameserver/dns.go
diff --git a/server/http.go b/nameserver/http.go
similarity index 100%
rename from server/http.go
rename to nameserver/http.go
diff --git a/server/http_test.go b/nameserver/http_test.go
similarity index 100%
rename from server/http_test.go
rename to nameserver/http_test.go
diff --git a/server/if_utils.go b/nameserver/if_utils.go
similarity index 100%
rename from server/if_utils.go
rename to nameserver/if_utils.go
diff --git a/server/logging.go b/nameserver/logging.go
similarity index 100%
rename from server/logging.go
rename to nameserver/logging.go
diff --git a/server/mdns_client.go b/nameserver/mdns_client.go
similarity index 100%
rename from server/mdns_client.go
rename to nameserver/mdns_client.go
diff --git a/server/mdns_client_test.go b/nameserver/mdns_client_test.go
similarity index 100%
rename from server/mdns_client_test.go
rename to nameserver/mdns_client_test.go
diff --git a/server/mdns_server.go b/nameserver/mdns_server.go
similarity index 100%
rename from server/mdns_server.go
rename to nameserver/mdns_server.go
diff --git a/server/mdns_server_test.go b/nameserver/mdns_server_test.go
similarity index 100%
rename from server/mdns_server_test.go
rename to nameserver/mdns_server_test.go
diff --git a/server/server.go b/nameserver/server.go
similarity index 100%
rename from server/server.go
rename to nameserver/server.go
diff --git a/server/testing_utils.go b/nameserver/testing_utils.go
similarity index 100%
rename from server/testing_utils.go
rename to nameserver/testing_utils.go
diff --git a/server/updater.go b/nameserver/updater.go
similarity index 100%
rename from server/updater.go
rename to nameserver/updater.go
diff --git a/server/zone.go b/nameserver/zone.go
similarity index 100%
rename from server/zone.go
rename to nameserver/zone.go
diff --git a/server/zone_test.go b/nameserver/zone_test.go
similarity index 100%
rename from server/zone_test.go
rename to nameserver/zone_test.go
diff --git a/docker/Dockerfile b/weavedns/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to weavedns/Dockerfile
diff --git a/docker/Makefile b/weavedns/Makefile
similarity index 100%
rename from docker/Makefile
rename to weavedns/Makefile
diff --git a/main.go b/weavedns/main.go
similarity index 100%
rename from main.go
rename to weavedns/main.go