changes.diff

diff --git a/.gitignore b/.gitignore
index 3565e0d..4014c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ src/_data
 src/_works
 src/about.md
 src/index.md
+src/assets
 public
diff --git a/Gemfile.lock b/Gemfile.lock
index 42b6729..c8f1f9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     cacert (0.3.0)
     colorator (1.1.0)
     concurrent-ruby (1.0.4)
-    dato (0.3.5)
+    dato (0.3.9)
       activesupport (>= 4.2.7)
       addressable
       cacert
@@ -22,19 +22,20 @@ GEM
       faraday_middleware (>= 0.9.0)
       fastimage
       imgix (>= 0.3.1)
+      listen
       pusher-client
       thor
       toml
       video_embed
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.1.1)
+    dotenv (2.2.0)
     downloadr (0.0.41)
       addressable (~> 2.3)
       rest-client (~> 1.7)
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.1)
+    faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.0.1)
       addressable (~> 2)
@@ -42,7 +43,7 @@ GEM
     forwardable-extended (2.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
+    i18n (0.8.0)
     imgix (1.1.0)
       addressable
     jekyll (3.3.1)
@@ -60,7 +61,7 @@ GEM
       sass (~> 3.4)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    json (2.0.2)
+    json (2.0.3)
     kramdown (1.13.1)
     liquid (3.0.6)
     listen (3.0.8)
@@ -79,7 +80,7 @@ GEM
       blankslate (~> 2.0)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
@@ -103,7 +104,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     video_embed (0.1.0)
-    websocket (1.2.3)
+    websocket (1.2.4)
 
 PLATFORMS
   ruby
diff --git a/package.json b/package.json
index f04952b..0df4c0f 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,12 @@
     "build:jekyll": "JEKYLL_ENV=production bundle exec jekyll build",
     "build:assets": "NODE_ENV=production webpack -p --config webpack.prod.config.js",
     "build:datocms": "dato dump",
-    "build": "npm run build:datocms && npm run build:jekyll && npm run build:assets",
+    "build": "yarn build:datocms && yarn build:jekyll && yarn build:assets",
     "start:assets": "NODE_ENV=development webpack --watch --config webpack.dev.config.js",
     "start:jekyll": "bundle exec jekyll server --incremental",
     "start:livereload": "livereload public -p 5678 -d",
-    "start:datocms": "dato dump",
-    "start": "concurrently -p \"[{name}]\" -c \"blue,red,green,yellow\" -k -n jekyll,webpack,livereload,datocms \"npm run start:jekyll\" \"npm run start:assets\" \"npm run start:livereload\" \"npm run start:datocms\""
+    "start:datocms": "dato dump --watch",
+    "start": "dato check && concurrently -p \"[{name}]\" -c \"blue,red,green,yellow\" -k -n jekyll,webpack,livereload,datocms \"yarn start:jekyll\" \"yarn start:assets\" \"yarn start:livereload\" \"yarn start:datocms\""
   },
   "dependencies": {
     "imagesloaded": "^4.1.1",
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index f5fd40f..1660392 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -8,7 +8,7 @@ module.exports = {
     root: __dirname + '/assets/js',
   },
   output: {
-    path: __dirname + '/public/assets',
+    path: __dirname + '/src/assets',
     filename: '[name].js',
     publicPath: '/assets',
   },