diff --git a/examples/parser_tests.nom b/examples/parser_tests.nom
index 81608b7..47cb893 100644
--- a/examples/parser_tests.nom
+++ b/examples/parser_tests.nom
@@ -1,4 +1,4 @@
-run file "core.nom"
+run file "lib/core.nom"
 
 test: say "foo" ..yields ".."
     |Call [say %]:
diff --git a/examples/sample_code.nom b/examples/sample_code.nom
index 4f4d2dd..4aa8cde 100644
--- a/examples/sample_code.nom
+++ b/examples/sample_code.nom
@@ -3,7 +3,7 @@
     start with a #.. and
     continue until dedent
 
-run file "core.nom"
+run file "lib/core.nom"
 
 say "foo"
 
diff --git a/examples/sample_game.nom b/examples/sample_game.nom
index e366243..e393747 100644
--- a/examples/sample_game.nom
+++ b/examples/sample_game.nom
@@ -1,4 +1,4 @@
-run file "core.nom"
+run file "lib/core.nom"
 run file "lib/secrets.nom"
 run file "lib/plurals.nom"
 
diff --git a/core.nom b/lib/core.nom
similarity index 100%
rename from core.nom
rename to lib/core.nom
diff --git a/nomsu.lua b/nomsu.lua
index 6a4793d..3267fc9 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -576,7 +576,7 @@ do
       elseif "Var" == _exp_0 then
         add("vars[" .. tostring(utils.repr(tree.value, true)) .. "]")
       else
-        error("Unknown/unimplemented thingy: " .. tostring(tree.type))
+        self:error("Unknown/unimplemented thingy: " .. tostring(tree.type))
       end
       buffer = table.concat(buffer, "\n")
       return buffer, return_value