diff --git a/.travis.yml b/.travis.yml
index ac066b9..2215717 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,4 +31,4 @@ script:
   - npm run jshint
   - npm run jscs
   - phpcs --standard=ruleset.xml --extensions=php --ignore=node_modules,bower_components,vendor -n -s .
-  - phpmd app text cleancode,codesize,controversial,design,naming,unusedcode
+  - phpmd src text cleancode,codesize,controversial,design,naming,unusedcode
diff --git a/composer.json b/composer.json
index 5ce018f..1028a69 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,13 @@
   },
   "autoload": {
     "psr-4": {
-      "Roots\\Sage\\": "app/lib/Sage/"
+      "Roots\\Sage\\": "src/lib/Sage/"
     },
     "files": [
-      "app/helpers.php",
-      "app/setup.php",
-      "app/filters.php",
-      "app/admin.php"
+      "src/helpers.php",
+      "src/setup.php",
+      "src/filters.php",
+      "src/admin.php"
     ]
   },
   "require": {
diff --git a/composer.lock b/composer.lock
index 70ca3ec..17854c8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "750e0d8e05f32cf6bb431d9406037c7a",
+    "hash": "7bb0b8d676ed7c711aca81f0c9e65355",
     "content-hash": "d0ce163b056002fe67c8e8036573e276",
     "packages": [
         {
diff --git a/gulpfile.js b/gulpfile.js
index c7df729..d14c36f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -244,7 +244,7 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
 // See: http://www.browsersync.io
 gulp.task('watch', function() {
   browserSync.init({
-    files: ['{app,templates}/**/*.php'],
+    files: ['{src,templates}/**/*.php'],
     proxy: config.devUrl,
     snippetOptions: {
       whitelist: ['/wp-admin/admin-ajax.php'],
diff --git a/app/admin.php b/src/admin.php
similarity index 100%
rename from app/admin.php
rename to src/admin.php
diff --git a/app/filters.php b/src/filters.php
similarity index 100%
rename from app/filters.php
rename to src/filters.php
diff --git a/app/helpers.php b/src/helpers.php
similarity index 100%
rename from app/helpers.php
rename to src/helpers.php
diff --git a/app/lib/Sage/Asset.php b/src/lib/Sage/Asset.php
similarity index 100%
rename from app/lib/Sage/Asset.php
rename to src/lib/Sage/Asset.php
diff --git a/app/lib/Sage/Assets/JsonManifest.php b/src/lib/Sage/Assets/JsonManifest.php
similarity index 100%
rename from app/lib/Sage/Assets/JsonManifest.php
rename to src/lib/Sage/Assets/JsonManifest.php
diff --git a/app/lib/Sage/Assets/ManifestInterface.php b/src/lib/Sage/Assets/ManifestInterface.php
similarity index 100%
rename from app/lib/Sage/Assets/ManifestInterface.php
rename to src/lib/Sage/Assets/ManifestInterface.php
diff --git a/app/lib/Sage/Template.php b/src/lib/Sage/Template.php
similarity index 100%
rename from app/lib/Sage/Template.php
rename to src/lib/Sage/Template.php
diff --git a/app/lib/Sage/Template/Wrapper.php b/src/lib/Sage/Template/Wrapper.php
similarity index 100%
rename from app/lib/Sage/Template/Wrapper.php
rename to src/lib/Sage/Template/Wrapper.php
diff --git a/app/lib/Sage/Template/WrapperInterface.php b/src/lib/Sage/Template/WrapperInterface.php
similarity index 100%
rename from app/lib/Sage/Template/WrapperInterface.php
rename to src/lib/Sage/Template/WrapperInterface.php
diff --git a/app/setup.php b/src/setup.php
similarity index 100%
rename from app/setup.php
rename to src/setup.php