diff --git a/usr/local/sbin/easyengine b/bin/easyengine
similarity index 100%
rename from usr/local/sbin/easyengine
rename to bin/easyengine
diff --git a/usr/local/sbin/eeupdate b/bin/eeupdate
similarity index 100%
rename from usr/local/sbin/eeupdate
rename to bin/eeupdate
diff --git a/install.sh b/bin/install.sh
similarity index 100%
rename from install.sh
rename to bin/install.sh
diff --git a/etc/bash_completion.d/ee b/config/bash_completion.d/ee
similarity index 100%
rename from etc/bash_completion.d/ee
rename to config/bash_completion.d/ee
diff --git a/etc/easyengine/ee.conf b/config/easyengine/ee.conf
similarity index 100%
rename from etc/easyengine/ee.conf
rename to config/easyengine/ee.conf
diff --git a/etc/nginx/common/acl.conf b/config/nginx/common/acl.conf
similarity index 100%
rename from etc/nginx/common/acl.conf
rename to config/nginx/common/acl.conf
diff --git a/etc/nginx/common/locations.conf b/config/nginx/common/locations.conf
similarity index 100%
rename from etc/nginx/common/locations.conf
rename to config/nginx/common/locations.conf
diff --git a/etc/nginx/common/wpcommon.conf b/config/nginx/common/wpcommon.conf
similarity index 100%
rename from etc/nginx/common/wpcommon.conf
rename to config/nginx/common/wpcommon.conf
diff --git a/etc/nginx/conf.d/blockips.conf b/config/nginx/conf.d/blockips.conf
similarity index 100%
rename from etc/nginx/conf.d/blockips.conf
rename to config/nginx/conf.d/blockips.conf
diff --git a/etc/nginx/conf.d/fastcgi.conf b/config/nginx/conf.d/fastcgi.conf
similarity index 100%
rename from etc/nginx/conf.d/fastcgi.conf
rename to config/nginx/conf.d/fastcgi.conf
diff --git a/etc/nginx/conf.d/upstream.conf b/config/nginx/conf.d/upstream.conf
similarity index 100%
rename from etc/nginx/conf.d/upstream.conf
rename to config/nginx/conf.d/upstream.conf
diff --git a/man/ee.8 b/docs/man/ee.8
similarity index 100%
rename from man/ee.8
rename to docs/man/ee.8
diff --git a/usr/share/easyengine/nginx/22222 b/templates/nginx/22222
similarity index 100%
rename from usr/share/easyengine/nginx/22222
rename to templates/nginx/22222
diff --git a/usr/share/easyengine/nginx/html/basic.conf b/templates/nginx/html/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/html/basic.conf
rename to templates/nginx/html/basic.conf
diff --git a/usr/share/easyengine/nginx/mysql/basic.conf b/templates/nginx/mysql/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/mysql/basic.conf
rename to templates/nginx/mysql/basic.conf
diff --git a/usr/share/easyengine/nginx/php/basic.conf b/templates/nginx/php/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/php/basic.conf
rename to templates/nginx/php/basic.conf
diff --git a/usr/share/easyengine/nginx/wp/basic.conf b/templates/nginx/wp/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wp/basic.conf
rename to templates/nginx/wp/basic.conf
diff --git a/usr/share/easyengine/nginx/wp/w3tc.conf b/templates/nginx/wp/w3tc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wp/w3tc.conf
rename to templates/nginx/wp/w3tc.conf
diff --git a/usr/share/easyengine/nginx/wp/wpfc.conf b/templates/nginx/wp/wpfc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wp/wpfc.conf
rename to templates/nginx/wp/wpfc.conf
diff --git a/usr/share/easyengine/nginx/wp/wpsc.conf b/templates/nginx/wp/wpsc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wp/wpsc.conf
rename to templates/nginx/wp/wpsc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdir/basic.conf b/templates/nginx/wpsubdir/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdir/basic.conf
rename to templates/nginx/wpsubdir/basic.conf
diff --git a/usr/share/easyengine/nginx/wpsubdir/w3tc.conf b/templates/nginx/wpsubdir/w3tc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdir/w3tc.conf
rename to templates/nginx/wpsubdir/w3tc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdir/wpfc.conf b/templates/nginx/wpsubdir/wpfc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdir/wpfc.conf
rename to templates/nginx/wpsubdir/wpfc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdir/wpsc.conf b/templates/nginx/wpsubdir/wpsc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdir/wpsc.conf
rename to templates/nginx/wpsubdir/wpsc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdomain/basic.conf b/templates/nginx/wpsubdomain/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdomain/basic.conf
rename to templates/nginx/wpsubdomain/basic.conf
diff --git a/usr/share/easyengine/nginx/wpsubdomain/w3tc.conf b/templates/nginx/wpsubdomain/w3tc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdomain/w3tc.conf
rename to templates/nginx/wpsubdomain/w3tc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdomain/wpfc.conf b/templates/nginx/wpsubdomain/wpfc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdomain/wpfc.conf
rename to templates/nginx/wpsubdomain/wpfc.conf
diff --git a/usr/share/easyengine/nginx/wpsubdomain/wpsc.conf b/templates/nginx/wpsubdomain/wpsc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsubdomain/wpsc.conf
rename to templates/nginx/wpsubdomain/wpsc.conf