diff --git a/src/nginxconfig/generators/drupal.conf.js b/src/nginxconfig/generators/conf/drupal.conf.js
similarity index 100%
rename from src/nginxconfig/generators/drupal.conf.js
rename to src/nginxconfig/generators/conf/drupal.conf.js
diff --git a/src/nginxconfig/generators/general.conf.js b/src/nginxconfig/generators/conf/general.conf.js
similarity index 98%
rename from src/nginxconfig/generators/general.conf.js
rename to src/nginxconfig/generators/conf/general.conf.js
index 3047fac..ad6c9c1 100644
--- a/src/nginxconfig/generators/general.conf.js
+++ b/src/nginxconfig/generators/conf/general.conf.js
@@ -1,4 +1,4 @@
-import { gzipTypes, extensions } from '../util/types_extensions';
+import { gzipTypes, extensions } from '../../util/types_extensions';
 
 export default (domains, global) => {
     const config = {};
diff --git a/src/nginxconfig/generators/letsencrypt.conf.js b/src/nginxconfig/generators/conf/letsencrypt.conf.js
similarity index 100%
rename from src/nginxconfig/generators/letsencrypt.conf.js
rename to src/nginxconfig/generators/conf/letsencrypt.conf.js
diff --git a/src/nginxconfig/generators/magento.conf.js b/src/nginxconfig/generators/conf/magento.conf.js
similarity index 100%
rename from src/nginxconfig/generators/magento.conf.js
rename to src/nginxconfig/generators/conf/magento.conf.js
diff --git a/src/nginxconfig/generators/nginx.conf.js b/src/nginxconfig/generators/conf/nginx.conf.js
similarity index 98%
rename from src/nginxconfig/generators/nginx.conf.js
rename to src/nginxconfig/generators/conf/nginx.conf.js
index f1ab609..d17281f 100644
--- a/src/nginxconfig/generators/nginx.conf.js
+++ b/src/nginxconfig/generators/conf/nginx.conf.js
@@ -1,4 +1,4 @@
-import sslProfiles from '../util/ssl_profiles';
+import sslProfiles from '../../util/ssl_profiles';
 
 export default (domains, global) => {
     const config = {};
diff --git a/src/nginxconfig/generators/php_fastcgi.conf.js b/src/nginxconfig/generators/conf/php_fastcgi.conf.js
similarity index 100%
rename from src/nginxconfig/generators/php_fastcgi.conf.js
rename to src/nginxconfig/generators/conf/php_fastcgi.conf.js
diff --git a/src/nginxconfig/generators/proxy.conf.js b/src/nginxconfig/generators/conf/proxy.conf.js
similarity index 100%
rename from src/nginxconfig/generators/proxy.conf.js
rename to src/nginxconfig/generators/conf/proxy.conf.js
diff --git a/src/nginxconfig/generators/python_uwsgi.conf.js b/src/nginxconfig/generators/conf/python_uwsgi.conf.js
similarity index 100%
rename from src/nginxconfig/generators/python_uwsgi.conf.js
rename to src/nginxconfig/generators/conf/python_uwsgi.conf.js
diff --git a/src/nginxconfig/generators/security.conf.js b/src/nginxconfig/generators/conf/security.conf.js
similarity index 96%
rename from src/nginxconfig/generators/security.conf.js
rename to src/nginxconfig/generators/conf/security.conf.js
index 3afd5df..47b57ec 100644
--- a/src/nginxconfig/generators/security.conf.js
+++ b/src/nginxconfig/generators/conf/security.conf.js
@@ -1,4 +1,4 @@
-import commonHsts from '../util/common_hsts';
+import commonHsts from '../../util/common_hsts';
 
 export default (domains, global) => {
     const config = [];
diff --git a/src/nginxconfig/generators/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
similarity index 98%
rename from src/nginxconfig/generators/website.conf.js
rename to src/nginxconfig/generators/conf/website.conf.js
index 35b34e3..2cefdc9 100644
--- a/src/nginxconfig/generators/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -1,7 +1,7 @@
-import { getSslCertificate, getSslCertificateKey } from '../util/get_ssl_certificate';
-import { getAccessLogDomainPath, getErrorLogDomainPath } from '../util/get_log_paths';
-import { extensions, gzipTypes } from '../util/types_extensions';
-import commonHsts from '../util/common_hsts';
+import { getSslCertificate, getSslCertificateKey } from '../../util/get_ssl_certificate';
+import { getAccessLogDomainPath, getErrorLogDomainPath } from '../../util/get_log_paths';
+import { extensions, gzipTypes } from '../../util/types_extensions';
+import commonHsts from '../../util/common_hsts';
 import securityConf from './security.conf';
 import pythonConf from './python_uwsgi.conf';
 import proxyConf from './proxy.conf';
diff --git a/src/nginxconfig/generators/wordpress.conf.js b/src/nginxconfig/generators/conf/wordpress.conf.js
similarity index 100%
rename from src/nginxconfig/generators/wordpress.conf.js
rename to src/nginxconfig/generators/conf/wordpress.conf.js
diff --git a/src/nginxconfig/generators/index.js b/src/nginxconfig/generators/index.js
index f822042..548eed4 100644
--- a/src/nginxconfig/generators/index.js
+++ b/src/nginxconfig/generators/index.js
@@ -1,5 +1,5 @@
 import toConf from './to_conf';
-import nginxConf from './nginx.conf';
+import nginxConf from './conf/nginx.conf';
 
 // Convert the data to nginx conf and do some magic to comments
 const toConfig = entriesOrObject => toConf(entriesOrObject)