diff --git a/LICENSE b/LICENSE
index bc7bebf..cd74aad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016, ECIX
+Copyright (c) 2016, ECIX, DE-CIX
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Makefile b/Makefile
index fe864f3..3899a60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Ecix Birdseye Makefile
+# Birdseye Makefile
 #
 
 PROG=birdwatcher
@@ -44,8 +44,8 @@ endif
 
 dist: clean linux
 
-	mkdir -p $(DIST)opt/ecix/birdwatcher/bin
-	mkdir -p $(DIST)etc/ecix
+	mkdir -p $(DIST)opt/birdwatcher/birdwatcher/bin
+	mkdir -p $(DIST)etc/birdwatcher
 
 ifeq ($(SYSTEM_INIT), systemd)
 	# Installing systemd services
@@ -59,11 +59,11 @@ endif
 
 
 	# Copy config and startup script
-	cp etc/ecix/* DIST/etc/ecix/.
-	rm -f DIST/etc/ecix/*.local.*
+	cp etc/birdwatcher/* DIST/etc/birdwatcher/.
+	rm -f DIST/etc/birdwatcher/*.local.*
 
 	# Copy bin
-	cp $(PROG)-linux-$(ARCH) DIST/opt/ecix/birdwatcher/bin/.
+	cp $(PROG)-linux-$(ARCH) DIST/opt/birdwatcher/birdwatcher/bin/.
 
 
 release: linux
@@ -71,7 +71,7 @@ release: linux
 	mkdir -p ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
 	cp birdwatcher-linux-amd64 ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
 	rm -f ../birdseye-static/birdwatcher-builds/latest
-	cd ../birdseye-static/birdwatcher-builds && ln -s $(APP_VERSION) latest 
+	cd ../birdseye-static/birdwatcher-builds && ln -s $(APP_VERSION) latest
 
 
 rpm: dist
@@ -81,7 +81,7 @@ rpm: dist
 
 	# Create RPM from dist
 	fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(DIST) \
-		--config-files /etc/ecix/birdwatcher.conf \
+		--config-files /etc/birdwatcher/birdwatcher.conf \
 		opt/ etc/
 
 	mv $(RPM) $(LOCAL_RPMS)
@@ -95,7 +95,7 @@ remote_rpm: build_server dist
 	ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST)
 	scp -r $(DIST) $(BUILD_SERVER):$(REMOTE_DIST)
 	ssh $(BUILD_SERVER) -- fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(REMOTE_DIST) \
-		--config-files /etc/ecix/birdwatcher.conf \
+		--config-files /etc/birdwatcher/birdwatcher.conf \
 		opt/ etc/
 
 	# Get rpm from server
diff --git a/config_test.go b/config_test.go
index adf7376..4770030 100644
--- a/config_test.go
+++ b/config_test.go
@@ -7,9 +7,9 @@ import (
 func TestLoadConfigs(t *testing.T) {
 	t.Log("Loading configs")
 	res, err := LoadConfigs([]string{
-		"./etc/ecix/birdwatcher.conf",
-		"/etc/ecix/birdwatcher.conf",
-		"./etc/ecix/birdwatcher.local.conf",
+		"./etc/birdwatcher/birdwatcher.conf",
+		"/etc/birdwatcher/birdwatcher.conf",
+		"./etc/birdwatcher/birdwatcher.local.conf",
 	})
 
 	t.Log(res)
diff --git a/install/systemd/birdwatcher4.service b/install/systemd/birdwatcher4.service
index a4b6563..84d4288 100644
--- a/install/systemd/birdwatcher4.service
+++ b/install/systemd/birdwatcher4.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=BIRDwatcher IPv4 
+Description=BIRDwatcher IPv4
 Wants=network.target
 After=network.target
 
 [Service]
 Type=simple
-ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64
+ExecStart=/opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64
 
 [Install]
 WantedBy=multi-user.target
diff --git a/install/systemd/birdwatcher6.service b/install/systemd/birdwatcher6.service
index 940d53e..e605813 100644
--- a/install/systemd/birdwatcher6.service
+++ b/install/systemd/birdwatcher6.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=BIRDwatcher IPv6 
+Description=BIRDwatcher IPv6
 Wants=network.target
 After=network.target
 
 [Service]
 Type=simple
-ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6
+ExecStart=/opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 -6
 
 [Install]
 WantedBy=multi-user.target
diff --git a/install/upstart/init/bird4watcher.conf b/install/upstart/init/bird4watcher.conf
index a8834a6..5d0d55f 100644
--- a/install/upstart/init/bird4watcher.conf
+++ b/install/upstart/init/bird4watcher.conf
@@ -1,5 +1,5 @@
 
-# ECIX birdwatcher
+# birdwatcher
 
 description "birdwatcher ipv4"
 author "Matthias Hannig <mha@ecix.net>"
@@ -10,5 +10,4 @@ respawn limit 20 10
 start on starting birdwatcher
 stop on stopping birdwatcher
 
-exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 2>&1 | logger -i -t 'BIRD4 WATCHER'
-
+exec /opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 2>&1 | logger -i -t 'BIRD4 WATCHER'
diff --git a/install/upstart/init/bird6watcher.conf b/install/upstart/init/bird6watcher.conf
index 7cada64..f317b06 100644
--- a/install/upstart/init/bird6watcher.conf
+++ b/install/upstart/init/bird6watcher.conf
@@ -1,5 +1,5 @@
 
-# ECIX birdwatcher
+# birdwatcher
 
 description "birdwatcher ipv6"
 author "Matthias Hannig <mha@ecix.net>"
@@ -10,5 +10,4 @@ respawn limit 20 10
 start on starting birdwatcher
 stop on stopping birdwatcher
 
-exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6 2>&1 | logger -i -t 'BIRD6 WATCHER'
-
+exec /opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 -6 2>&1 | logger -i -t 'BIRD6 WATCHER'