require rework round 3

milo/apis/craft2.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Util   = require('util')
 
 local fs     = _G.fs

milo/apis/init.lua

@@ -1,6 +1,6 @@
 local Config = require('config')
-local Craft  = require('craft2')
-local itemDB = require('itemDB')
+local Craft  = require('milo.craft2')
+local itemDB = require('core.itemDB')
 local Sound  = require('sound')
 local Util   = require('util')
 
@@ -147,7 +147,7 @@ function Milo:requestCrafting(item)
 	end
 end
 
--- queue up an action that relies on the crafting grid
+-- queue an action that interacts with storage
 function Milo:queueRequest(request, callback)
 	os.queueEvent('milo_queue')
 	table.insert(self.context.queue, {

milo/apis/massAdapter.lua

@@ -1,6 +1,6 @@
 local class   = require('class')
-local itemDB  = require('itemDB')
-local Mini    = require('miniAdapter')
+local itemDB  = require('core.itemDB')
+local Mini    = require('milo.miniAdapter')
 
 local os      = _G.os
 

milo/apis/miniAdapter.lua

@@ -1,5 +1,5 @@
 local class   = require('class')
-local itemDB  = require('itemDB')
+local itemDB  = require('core.itemDB')
 local Util    = require('util')
 
 local device = _G.device

milo/apis/storage.lua

@@ -1,8 +1,8 @@
-local Adapter = require('miniAdapter')
+local Adapter = require('milo.miniAdapter')
 local class   = require('class')
 local Config  = require('config')
 local Event   = require('event')
-local itemDB  = require('itemDB')
+local itemDB  = require('core.itemDB')
 local Util    = require('util')
 
 local device   = _G.device