diff --git a/.gitignore b/.gitignore
index fbdf47762325cce5f40d42f978427339078783a0..45d34cea672771a290c307a67c48a411b51835fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 /config.inc.php
-/www/.htaccess
+/public/.htaccess
 /.project
 /.settings
-/www/wdn
+/public/wdn
 /.buildpath
 /node_modules
 /vendor/composer
diff --git a/Gruntfile.js b/Gruntfile.js
index 5bac5db8ed5453b2c7ee37e36f1367140d7d0690..ed9c457fb7c6aab3deecf7dfd8b8d8c2231648c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,6 @@
 module.exports = function (grunt) {
 	var lessDir = 'less';
-	var cssDir = 'www/css';
+	var cssDir = 'public/css';
 
 	var cssFiles = [
 		'main'
diff --git a/README.md b/README.md
index 680a33256e053f39b4eec09f9d829cb4724242e3..a36120e68929494973223f1f8e5031c032f2e788 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 3. Install Inkscape on the VM `sudo yum --disablerepo=repoforgeextras install inkscape` 
 4. Install ImageMagick on the VM. `yum install -y ImageMagick ImageMagick-devel`
 5. Create a config file for yourself. In the root, `cp config.sample.php config.inc.php` and edit as necessary.
-6. Create a htaccess file for yourself. In the root, `cp www/sample.htaccess www/.htaccess` and edit as necessary.
+6. Create a htaccess file for yourself. In the root, `cp public/sample.htaccess public/.htaccess` and edit as necessary.
 7. You will need a database. Run the script `create_database.sql`, found in `/db`, on your SQL DB. 
 8. This creates several users, including the approvers. You will likely want to create a user for yourself in the users table with role `admin`.
 9. The server should now be running at `localhost:8009`.
diff --git a/www/css/main.css b/public/css/main.css
similarity index 100%
rename from www/css/main.css
rename to public/css/main.css
diff --git a/www/images/acronym_example.png b/public/images/acronym_example.png
similarity index 100%
rename from www/images/acronym_example.png
rename to public/images/acronym_example.png
diff --git a/www/images/acronym_subject_example.png b/public/images/acronym_subject_example.png
similarity index 100%
rename from www/images/acronym_subject_example.png
rename to public/images/acronym_subject_example.png
diff --git a/www/images/acronym_subject_vert_example.png b/public/images/acronym_subject_vert_example.png
similarity index 100%
rename from www/images/acronym_subject_vert_example.png
rename to public/images/acronym_subject_vert_example.png
diff --git a/www/images/acronym_vert_example.png b/public/images/acronym_vert_example.png
similarity index 100%
rename from www/images/acronym_vert_example.png
rename to public/images/acronym_vert_example.png
diff --git a/www/images/extension_example.png b/public/images/extension_example.png
similarity index 100%
rename from www/images/extension_example.png
rename to public/images/extension_example.png
diff --git a/www/images/extension_vert_example.png b/public/images/extension_vert_example.png
similarity index 100%
rename from www/images/extension_vert_example.png
rename to public/images/extension_vert_example.png
diff --git a/www/images/org_only_example.png b/public/images/org_only_example.png
similarity index 100%
rename from www/images/org_only_example.png
rename to public/images/org_only_example.png
diff --git a/www/images/org_only_vert_example.png b/public/images/org_only_vert_example.png
similarity index 100%
rename from www/images/org_only_vert_example.png
rename to public/images/org_only_vert_example.png
diff --git a/www/images/org_subject_1-2_example.png b/public/images/org_subject_1-2_example.png
similarity index 100%
rename from www/images/org_subject_1-2_example.png
rename to public/images/org_subject_1-2_example.png
diff --git a/www/images/org_subject_1-2_vert_example.png b/public/images/org_subject_1-2_vert_example.png
similarity index 100%
rename from www/images/org_subject_1-2_vert_example.png
rename to public/images/org_subject_1-2_vert_example.png
diff --git a/www/images/org_subject_2-1_example.png b/public/images/org_subject_2-1_example.png
similarity index 100%
rename from www/images/org_subject_2-1_example.png
rename to public/images/org_subject_2-1_example.png
diff --git a/www/images/org_subject_2-1_vert_example.png b/public/images/org_subject_2-1_vert_example.png
similarity index 100%
rename from www/images/org_subject_2-1_vert_example.png
rename to public/images/org_subject_2-1_vert_example.png
diff --git a/www/images/org_subject_2-2_example.png b/public/images/org_subject_2-2_example.png
similarity index 100%
rename from www/images/org_subject_2-2_example.png
rename to public/images/org_subject_2-2_example.png
diff --git a/www/images/org_subject_2-2_vert_example.png b/public/images/org_subject_2-2_vert_example.png
similarity index 100%
rename from www/images/org_subject_2-2_vert_example.png
rename to public/images/org_subject_2-2_vert_example.png
diff --git a/www/images/org_subject_example.png b/public/images/org_subject_example.png
similarity index 100%
rename from www/images/org_subject_example.png
rename to public/images/org_subject_example.png
diff --git a/www/images/org_subject_vert_example.png b/public/images/org_subject_vert_example.png
similarity index 100%
rename from www/images/org_subject_vert_example.png
rename to public/images/org_subject_vert_example.png
diff --git a/www/images/org_two_line_example.png b/public/images/org_two_line_example.png
similarity index 100%
rename from www/images/org_two_line_example.png
rename to public/images/org_two_line_example.png
diff --git a/www/images/org_two_line_vert_example.png b/public/images/org_two_line_vert_example.png
similarity index 100%
rename from www/images/org_two_line_vert_example.png
rename to public/images/org_two_line_vert_example.png
diff --git a/www/images/spinner.svg b/public/images/spinner.svg
similarity index 100%
rename from www/images/spinner.svg
rename to public/images/spinner.svg
diff --git a/www/images/test.pdf b/public/images/test.pdf
similarity index 100%
rename from www/images/test.pdf
rename to public/images/test.pdf
diff --git a/www/images/test.png b/public/images/test.png
similarity index 100%
rename from www/images/test.png
rename to public/images/test.png
diff --git a/www/images/test.svg b/public/images/test.svg
similarity index 100%
rename from www/images/test.svg
rename to public/images/test.svg
diff --git a/www/index.php b/public/index.php
similarity index 100%
rename from www/index.php
rename to public/index.php
diff --git a/www/sample.htaccess b/public/sample.htaccess
similarity index 100%
rename from www/sample.htaccess
rename to public/sample.htaccess
diff --git a/www/videos/factory_milling.mp4 b/public/videos/factory_milling.mp4
similarity index 100%
rename from www/videos/factory_milling.mp4
rename to public/videos/factory_milling.mp4
diff --git a/src/Views/main_template.php b/src/Views/main_template.php
index b978723abbf4a04648cb9d3f44623ff8c1da523c..ab2f8964b5b8e9ac673b566705ac2d24b6c68337 100644
--- a/src/Views/main_template.php
+++ b/src/Views/main_template.php
@@ -5,7 +5,7 @@ $page = Templates::factory('Fixed', Templates::VERSION_4_1);
 
 # this should be the server root, that is, the public directory of where static files come from.
 # the templates library will stick /wdn/templates_4.1 on there for you
-$wdn_include_path = \Core::ROOT . '/www';
+$wdn_include_path = \Core::ROOT . '/public';
 if (file_exists($wdn_include_path)) {
     $page->setLocalIncludePath($wdn_include_path);
 }