diff --git a/lusty-0.5-0.rockspec b/lusty-0.6-0.rockspec
similarity index 68%
rename from lusty-0.5-0.rockspec
rename to lusty-0.6-0.rockspec
index f06d7ac..43c6942 100644
--- a/lusty-0.5-0.rockspec
+++ b/lusty-0.6-0.rockspec
@@ -1,8 +1,8 @@
 package = "lusty"
-version = "0.5-0"
+version = "0.6-0"
 source = {
-  url = "https://github.com/Olivine-Labs/lusty/archive/v0.5.tar.gz",
-  dir = "lusty-0.5"
+  url = "https://github.com/Olivine-Labs/lusty/archive/v0.6.tar.gz",
+  dir = "lusty-0.6"
 }
 description = {
   summary = "Lua web framework.",
@@ -20,7 +20,7 @@ dependencies = {
 build = {
   type = "builtin",
   modules = {
-    ["lusty.init"] = "src/init.lua",
-    ["lusty.util"] = "src/util.lua"
+    ["lusty.init"] = "lusty/init.lua",
+    ["lusty.util"] = "lusty/util.lua"
   }
 }
diff --git a/src/init.lua b/lusty/init.lua
similarity index 100%
rename from src/init.lua
rename to lusty/init.lua
diff --git a/src/util.lua b/lusty/util.lua
similarity index 92%
rename from src/util.lua
rename to lusty/util.lua
index 1869083..ef34606 100644
--- a/src/util.lua
+++ b/lusty/util.lua
@@ -30,7 +30,7 @@ local function inline(name, env)
 
     if #keys > 0 then
       file, err = loadstring(
-        'local _env=select(1, ...)\nlocal '..table.concat(keys, ',')..
+        'local _env=select(2, ...)\nlocal '..table.concat(keys, ',')..
         "=_env."..table.concat(keys, ",_env.")..
         '\n'..code
       )
@@ -40,7 +40,7 @@ local function inline(name, env)
     if not file then error(err) end
     loaded[name] = file
   end
-  return file(env)
+  return file(name, env)
 end
 
 local function clearCache()
diff --git a/spec/core_spec.lua b/spec/core_spec.lua
index aa39ede..fb2327b 100644
--- a/spec/core_spec.lua
+++ b/spec/core_spec.lua
@@ -1,22 +1,24 @@
-package.path = './spec/?.lua;../src/?.lua;'..package.path
-
 describe("Lusty core test", function()
   it("fires different pages", function()
-    local lusty = require 'init'()
-    lusty:subscribe({'request','a'}, 'dummy.test-handler-a', {})
-    lusty:subscribe({'request','b'}, 'dummy.test-handler-b', {})
+    local lusty = require 'lusty.init'()
+    lusty:subscribe({'request','a'}, 'spec.dummy.test-handler-a', {})
+    lusty:subscribe({'request','b'}, 'spec.dummy.test-handler-b', {})
     table.insert(lusty.publishers, {'request'})
 
-    local request = require 'dummy.request'
-    local response = require 'dummy.response'
+    local request = require 'spec.dummy.request'
+    local response = require 'spec.dummy.response'
     request.url = "a"
 
-    local context = lusty:request(request, response)
+    local context = { request = request, response = response }
+    context.suffix = {'a'}
+    lusty:request(context)
+    if context.errors then error(context.errors) end
     assert.are.equal("a", context.output)
 
     request.url = "b"
-
-    local context = lusty:request(request, response)
+    context.suffix = {'b'}
+    lusty:request(context)
+    if context.errors then error(context.errors) end
     assert.are.equal("b", context.output)
   end)
 end)
diff --git a/spec/inline_spec.lua b/spec/inline_spec.lua
index 0795173..8c8d117 100644
--- a/spec/inline_spec.lua
+++ b/spec/inline_spec.lua
@@ -1,7 +1,5 @@
-package.path = 'src/?.lua;'..package.path
-
 describe('verify that inline handles environments properly', function()
-  local util = require 'util'
+  local util = require 'lusty.util'
 
   after_each(function()
     util.clearCache()