diff --git a/files/etc/nginx/conf.d/all.conf b/files/etc/nginx/conf.d/all.conf
index 56de44d..8423b82 100644
--- a/files/etc/nginx/conf.d/all.conf
+++ b/files/etc/nginx/conf.d/all.conf
@@ -2,4 +2,3 @@ include conf.d/opti.conf;
 include conf.d/ssl.conf;
 include conf.d/gzip.conf;
 include conf.d/realip.conf;
-#include conf.d/geoip2.conf;
diff --git a/files/etc/nginx/conf.d/default_site b/files/etc/nginx/conf.d/default_site
deleted file mode 100644
index 650e5e0..0000000
--- a/files/etc/nginx/conf.d/default_site
+++ /dev/null
@@ -1,21 +0,0 @@
-server {
-	include conf.d/listen_http_default.conf;
-	server_name _;
-
-	include conf.d/ssl_checker.conf;
-
-	location / {
-		return 301 https://$host$request_uri;
-	}
-}
-
-server {
-	include conf.d/listen_https_default.conf;
-	server_name _;
-
-	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-
-	return 404;
-}
-
diff --git a/files/etc/nginx/conf.d/fastcgi_params b/files/etc/nginx/conf.d/fastcgi_params
deleted file mode 100644
index 54a287e..0000000
--- a/files/etc/nginx/conf.d/fastcgi_params
+++ /dev/null
@@ -1,28 +0,0 @@
-
-fastcgi_param  QUERY_STRING         $query_string;
-fastcgi_param  REQUEST_METHOD       $request_method;
-fastcgi_param  CONTENT_TYPE         $content_type;
-fastcgi_param  CONTENT_LENGTH       $content_length;
-
-fastcgi_param  SCRIPT_NAME          $fastcgi_script_name;
-fastcgi_param  REQUEST_URI          $request_uri;
-fastcgi_param  DOCUMENT_URI         $document_uri;
-fastcgi_param  DOCUMENT_ROOT        $document_root;
-fastcgi_param  SERVER_PROTOCOL      $server_protocol;
-fastcgi_param  HTTPS                $fcgi_https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE    CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE      nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR          $remote_addr;
-fastcgi_param  REMOTE_PORT          $remote_port;
-fastcgi_param  SERVER_ADDR          $server_addr;
-fastcgi_param  SERVER_PORT          $server_port;
-fastcgi_param  SERVER_NAME          $server_name;
-
-fastcgi_param  HTTP_MM_COUNTRY_CODE $geoip2_data_country_code;
-fastcgi_param  HTTP_MM_COUNTRY_NAME $geoip2_data_country_name;
-fastcgi_param  HTTP_MM_CITY_NAME    $geoip2_data_city_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;
diff --git a/files/etc/nginx/conf.d/geoip2.conf b/files/etc/nginx/conf.d/geoip2.conf
deleted file mode 100644
index 0047c49..0000000
--- a/files/etc/nginx/conf.d/geoip2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-geoip2 /usr/share/GeoIP/GeoLite2-Country.mmdb {
-	auto_reload 5m;
-	$geoip2_metadata_country_build metadata build_epoch;
-	$geoip2_data_country_code default=US source=$remote_addr country iso_code;
-	$geoip2_data_country_name country names en;
-}
-
-geoip2 /usr/share/GeoIP/GeoLite2-City.mmdb {
-	$geoip2_data_city_name default=London city names en;
-}
-
diff --git a/files/etc/nginx/conf.d/listen_both.conf b/files/etc/nginx/conf.d/listen_both.conf
deleted file mode 100644
index 33769aa..0000000
--- a/files/etc/nginx/conf.d/listen_both.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-include conf.d/listen_http.conf;
-include conf.d/listen_https.conf;
diff --git a/files/etc/nginx/conf.d/listen_both_default.conf b/files/etc/nginx/conf.d/listen_both_default.conf
deleted file mode 100644
index 10bd3ba..0000000
--- a/files/etc/nginx/conf.d/listen_both_default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-include conf.d/listen_http_default.conf;
-include conf.d/listen_https_default.conf;
diff --git a/files/etc/nginx/conf.d/listen_http.conf b/files/etc/nginx/conf.d/listen_http.conf
index 76cb18d..d148154 100644
--- a/files/etc/nginx/conf.d/listen_http.conf
+++ b/files/etc/nginx/conf.d/listen_http.conf
@@ -1,2 +1,2 @@
 listen 80;
-listen [::]:80;
+listen [::]:80 ipv6only=on;
diff --git a/files/etc/nginx/conf.d/listen_http_default.conf b/files/etc/nginx/conf.d/listen_http_default.conf
deleted file mode 100644
index d148154..0000000
--- a/files/etc/nginx/conf.d/listen_http_default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-listen 80;
-listen [::]:80 ipv6only=on;
diff --git a/files/etc/nginx/conf.d/listen_https.conf b/files/etc/nginx/conf.d/listen_https.conf
index f3915ff..1bb7d92 100644
--- a/files/etc/nginx/conf.d/listen_https.conf
+++ b/files/etc/nginx/conf.d/listen_https.conf
@@ -1,4 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
+listen [::]:443 ssl ipv6only=on http2;
 
 add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; ";
diff --git a/files/etc/nginx/conf.d/listen_https_default.conf b/files/etc/nginx/conf.d/listen_https_default.conf
deleted file mode 100644
index 1bb7d92..0000000
--- a/files/etc/nginx/conf.d/listen_https_default.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-listen 443 ssl http2;
-listen [::]:443 ssl ipv6only=on http2;
-
-add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; ";
diff --git a/files/etc/nginx/conf.d/php.conf b/files/etc/nginx/conf.d/php.conf
deleted file mode 100644
index 549f49b..0000000
--- a/files/etc/nginx/conf.d/php.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-location ~ \.php$ {
-        try_files $uri =404;
-	include conf.d/fastcgi_params;
-	fastcgi_pass unix:/run/php/php7.0-fpm.sock;
-	fastcgi_intercept_errors on;
-	fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-	fastcgi_param SERVER_NAME $host;
-}
-
diff --git a/files/etc/nginx/conf.d/ssl_checker.conf b/files/etc/nginx/conf.d/ssl_checker.conf
deleted file mode 100644
index 27a085b..0000000
--- a/files/etc/nginx/conf.d/ssl_checker.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ^~ /.well-known/acme-challenge/ {
-  root /var/www/;
-  allow all;
-}
-
-
diff --git a/files/etc/nginx/nginx.conf b/files/etc/nginx/nginx.conf
index e918f56..99d6196 100644
--- a/files/etc/nginx/nginx.conf
+++ b/files/etc/nginx/nginx.conf
@@ -20,7 +20,30 @@ http {
     access_log /var/log/nginx/access.log main;
     error_log /var/log/nginx/error.log;
 
-    include conf.d/default_site;
+    server {
+        include conf.d/listen_http.conf
+        server_name _;
+
+        location ^~ /.well-known/acme-challenge/ {
+        root /var/www/;
+        allow all;
+        }
+
+        location / {
+            return 301 https://$host$request_uri;
+        }
+    }
+
+    server {
+        include conf.d/listen_https.conf
+        server_name _;
+
+        ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
+        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+
+        return 404;
+    }
+
     include sites/*;
 }
 
diff --git a/files/etc/nginx/conf.d/proxy_params b/files/etc/nginx/proxy_params
similarity index 100%
rename from files/etc/nginx/conf.d/proxy_params
rename to files/etc/nginx/proxy_params