diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 275395d..0000000
--- a/.yarnrc
+++ /dev/null
@@ -1 +0,0 @@
---modules-folder content/node_modules
diff --git a/Gemfile.lock b/Gemfile.lock
index aec5824..b0101ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
     lumberjack (1.0.13)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
-    nanoc (4.10.0)
+    nanoc (4.10.1)
       addressable (~> 2.5)
       cri (~> 2.15)
       ddmemoize (~> 1.0)
diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss
index d88e159..706199c 100644
--- a/content/assets/stylesheets/main.scss
+++ b/content/assets/stylesheets/main.scss
@@ -1,7 +1,7 @@
 @import "includes/variables";
 
-@import "../../node_modules/bulma/bulma";
-@import "../../node_modules/bulma-divider/divider";
+@import "../../../node_modules/bulma/bulma";
+@import "../../../node_modules/bulma-divider/divider";
 
 .nav-right {
   flex: none;
diff --git a/data/bestuur.yaml b/data/bestuur.yaml
index f51413d..108ef62 100644
--- a/data/bestuur.yaml
+++ b/data/bestuur.yaml
@@ -1,3 +1,4 @@
+---
 91-92:
   - rol: Voorzitter
     naam: Willems Vincent
diff --git a/lib/datasources/data.rb b/lib/datasources/data.rb
deleted file mode 100644
index 9d70c50..0000000
--- a/lib/datasources/data.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class DataDataSource < Nanoc::DataSource
-  identifier :data
-
-  def items
-    item = new_item(
-      '',
-      # TODO: Fix creating a wrapper object
-      # Right now circumventing a bug which requires k,v pairs
-      # instead of lists. Else the associated attributes are
-      # indexed by an integer instead of a string/symbol
-      { data: YAML.load_file('data/bestuur.yaml') },
-      Nanoc::Identifier.new('/data/bestuur')
-    )
-
-    [item]
-  end
-end
diff --git a/lib/helpers/data.rb b/lib/helpers/data.rb
index a174c40..971afbd 100644
--- a/lib/helpers/data.rb
+++ b/lib/helpers/data.rb
@@ -1,5 +1,5 @@
 module DataHelper
   def data_from(identifier)
-    @items["/data/#{identifier}"].attributes[:data]
+    @items["/data/#{identifier}.yaml"].attributes
   end
 end
diff --git a/nanoc.yaml b/nanoc.yaml
index 2d00158..ec3703d 100644
--- a/nanoc.yaml
+++ b/nanoc.yaml
@@ -75,7 +75,15 @@ data_sources:
     # be “legacy”, primarily used by older Nanoc sites.
     identifier_type: full
   -
-    type: data
+    type: filesystem
+    items_root: /data
+    content_dir: data
+    layouts_dir: null
+  -
+    type: filesystem
+    items_root: /node_modules
+    content_dir: node_modules
+    layouts_dir: null
 
 # Configuration for the “check” command, which run unit tests on the site.
 checks: