diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index 7060b360f..b29925c5f 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -1009,16 +1009,6 @@ void get_time_string(time_t *raw_time, char *buffer, int buffer_length, int type
 	/* expiration date/time for HTTP headers */
 	else if(type == HTTP_DATE_TIME)
 		snprintf(buffer, buffer_length, "%s, %02d %s %d %02d:%02d:%02d GMT", weekdays[tm_ptr->tm_wday], day, months[tm_ptr->tm_mon], year, hour, minute, second);
-    else if (type == EXPIRES_DATE_TIME)
-			snprintf(buffer,
-			         buffer_length,
-			         "%04d-%02d-%02dT%02d:%02d:%02d",
-			         tm_ptr->tm_year + 1900,
-			         tm_ptr->tm_mon + 1,
-			         tm_ptr->tm_mday,
-			         tm_ptr->tm_hour,
-			         tm_ptr->tm_min,
-			         tm_ptr->tm_sec);
 
     /* short time */
 	else
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 87%
rename from Dockerfile
rename to docker/Dockerfile
index c189f2b70..78331e22a 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,8 @@ FROM vim
 LABEL author="Isaac A. White <iwhite@nagios.com>"
 
 WORKDIR /var/www/html/
-COPY .vimrc /root/.vimrc
-COPY .vim /root/
+COPY ../.vimrc /root/.vimrc
+COPY ../.vim /root/
 
 # WORKDIR /var/www/html/plugins
 # RUN ./tools/setup && ./configure
diff --git a/Dockerfile-centos7 b/docker/Dockerfile-centos7
similarity index 100%
rename from Dockerfile-centos7
rename to docker/Dockerfile-centos7
diff --git a/docker-compose-centos7-vim.yml b/docker/docker-compose-centos7.yml
similarity index 100%
rename from docker-compose-centos7-vim.yml
rename to docker/docker-compose-centos7.yml
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to docker/docker-compose.yml
diff --git a/exec.bat b/docker/exec.bat
similarity index 100%
rename from exec.bat
rename to docker/exec.bat
diff --git a/docker/exec.sh b/docker/exec.sh
new file mode 100644
index 000000000..5e875c5c4
--- /dev/null
+++ b/docker/exec.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker exec -it ncen /bin/bash
+
diff --git a/docker/install.sh b/docker/install.sh
new file mode 100644
index 000000000..1d0e12a60
--- /dev/null
+++ b/docker/install.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+docker exec -w /var/www/html/ -it ncen ./configure
+docker exec -w /var/www/html/ -it ncen make all install
+./plugins.sh
+
+
diff --git a/docker/plugins.sh b/docker/plugins.sh
new file mode 100644
index 000000000..15720861a
--- /dev/null
+++ b/docker/plugins.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+docker exec -w /var/www/html/plugins -it ncen ./tools/setup
+docker exec -w /var/www/html/plugins -it ncen ./configure
+docker exec -w /var/www/html/plugins -it ncen make
+docker exec -w /var/www/html/plugins -it ncen make install
+
diff --git a/exec.sh b/exec.sh
deleted file mode 100755
index bb3695181..000000000
--- a/exec.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker exec -it nvim /bin/bash
-
diff --git a/install.sh b/install.sh
deleted file mode 100755
index bb940735f..000000000
--- a/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-docker exec -w /var/www/html/ -it nvim ./configure
-docker exec -w /var/www/html/ -it nvim make all install
-./plugins.sh
-
-
diff --git a/plugins b/plugins
index 4c3812a98..a2bc59728 160000
--- a/plugins
+++ b/plugins
@@ -1 +1 @@
-Subproject commit 4c3812a98b3c13f1a7bec99cedbb3db2c230626e
+Subproject commit a2bc597283ef4bc43e67ea7e40e763dc7ad7091b
diff --git a/plugins.sh b/plugins.sh
deleted file mode 100755
index fd65b289c..000000000
--- a/plugins.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-docker exec -w /var/www/html/plugins -it nvim ./tools/setup
-docker exec -w /var/www/html/plugins -it nvim ./configure
-docker exec -w /var/www/html/plugins -it nvim make 
-docker exec -w /var/www/html/plugins -it nvim make install
-