diff --git a/Vagrantfile b/Vagrantfile
index 5593075..3ebc4bc 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,7 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure("2") do |config|
   config.vm.box = "trusty32"
   config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box"
+  config.vm.provision "file", source: "~/.btconfig.json", destination: "~/.btconfig.json"
   config.vm.provision :shell, privileged: false, path: "bin/vagrant_up.sh"
   config.vm.network :forwarded_port, host: 3000, guest: 3000
-  config.vm.provision "file", source: "~/.btconfig.json", destination: "/etc/blocktogether/config.json"
 end
diff --git a/bin/init_config.sh b/bin/init_config.sh
index 4ee034a..cf31c13 100644
--- a/bin/init_config.sh
+++ b/bin/init_config.sh
@@ -8,3 +8,4 @@
 sudo install -o "$USER" -d /etc/blocktogether
 sudo install -o "$USER" -d /data/blocktogether
 cp -a /vagrant/config/* /etc/blocktogether/
+cp ~/.btconfig.json /etc/blocktogether/config.json
diff --git a/config/etc/logrotate.d/nginx b/config/etc/logrotate.d/nginx
new file mode 100644
index 0000000..9751d2a
--- /dev/null
+++ b/config/etc/logrotate.d/nginx
@@ -0,0 +1,12 @@
+/var/log/nginx/*.log {
+	daily
+	missingok
+	rotate 30
+	compress
+	delaycompress
+	create 0644 www-data adm
+	sharedscripts
+	postrotate
+		invoke-rc.d nginx rotate >/dev/null 2>&1
+	endscript
+}
diff --git a/config/nginx/sites-available/blocktogether.org b/config/etc/nginx/sites-available/blocktogether.org
similarity index 100%
rename from config/nginx/sites-available/blocktogether.org
rename to config/etc/nginx/sites-available/blocktogether.org
diff --git a/config/nginx/sites-available/localhost-status b/config/etc/nginx/sites-available/localhost-status
similarity index 100%
rename from config/nginx/sites-available/localhost-status
rename to config/etc/nginx/sites-available/localhost-status
diff --git a/config/etc/nginx/sites-enabled/blocktogether.org b/config/etc/nginx/sites-enabled/blocktogether.org
new file mode 120000
index 0000000..4e9d706
--- /dev/null
+++ b/config/etc/nginx/sites-enabled/blocktogether.org
@@ -0,0 +1 @@
+../sites-available/blocktogether.org
\ No newline at end of file
diff --git a/config/etc/nginx/sites-enabled/localhost-status b/config/etc/nginx/sites-enabled/localhost-status
new file mode 120000
index 0000000..6d30b36
--- /dev/null
+++ b/config/etc/nginx/sites-enabled/localhost-status
@@ -0,0 +1 @@
+../sites-available/localhost-status
\ No newline at end of file
diff --git a/config/production/upstart/blocktogether-instance.conf b/config/init/blocktogether-instance.conf
similarity index 100%
rename from config/production/upstart/blocktogether-instance.conf
rename to config/init/blocktogether-instance.conf
diff --git a/config/production/upstart/blocktogether.conf b/config/init/blocktogether.conf
similarity index 100%
rename from config/production/upstart/blocktogether.conf
rename to config/init/blocktogether.conf