require rework round 3

builder/apis/blocks.lua

@@ -1,6 +1,6 @@
 local class   = require('class')
 local Util    = require('util')
-local TableDB = require('tableDB')
+local TableDB = require('core.tableDB')
 local JSON    = require('json')
 
 -- see https://github.com/Khroki/MCEdit-Unified/blob/master/pymclevel/minecraft.yaml

builder/apis/builder.lua

@@ -1,6 +1,6 @@
 local Blocks    = require('builder.blocks')
 local class     = require('class')
-local Message   = require('message')
+local Message   = require('core.message')
 local Util      = require('util')
 
 local device     = _G.device

builder/apis/schematic.lua

@@ -1,6 +1,6 @@
 local class   = require('class')
 local Util    = require('util')
-local DEFLATE = require('deflatelua')
+local DEFLATE = require('builder.deflatelua')
 local Point   = require('point')
 
 local bit    = _G.bit

builder/apis/turtle.lua

@@ -1,9 +1,9 @@
-local Adapter   = require('inventoryAdapter')
+local Adapter   = require('core.inventoryAdapter')
 local Builder   = require('builder.builder')
 local class     = require('class')
 local Event     = require('event')
-local itemDB    = require('itemDB')
-local Message   = require('message')
+local itemDB    = require('core.itemDB')
+local Message   = require('core.message')
 local Point     = require('point')
 local UI        = require('ui')
 local Util      = require('util')

builder/base64dl.lua

@@ -1,4 +1,4 @@
-local Base64 = require('base64')
+local Base64 = require('builder.base64')
 
 local http  = _G.http
 local os    = _G.os

builder/builder.lua

@@ -2,12 +2,12 @@ if not _G.turtle and not _G.commands then
   error('Must be run on a turtle or a command computer')
 end
 
-local Adapter   = require('inventoryAdapter')
+local Adapter   = require('core.inventoryAdapter')
 local Event     = require('event')
 local GPS       = require('gps')
-local itemDB    = require('itemDB')
+local itemDB    = require('core.itemDB')
 local Schematic = require('builder.schematic')
-local TableDB   = require('tableDB')
+local TableDB   = require('core.tableDB')
 local UI        = require('ui')
 local Util      = require('util')
 

builder/supplier.lua

@@ -1,8 +1,8 @@
 local Event      = require('event')
-local MEProvider = require('meProvider')
-local Message    = require('message')
+local MEProvider = require('core.meProvider')
+local Message    = require('core.message')
 local Point      = require('point')
-local TableDB    = require('tableDB')
+local TableDB    = require('core.tableDB')
 local Util       = require('util')
 
 local device = _G.device
@@ -21,9 +21,9 @@ local turtle = _G.turtle
      pointing at the chest/interface
 ]]--
 
-local ChestProvider = require('chestProvider')
+local ChestProvider = require('core.chestProvider')
 if Util.getVersion() == 1.8 then
-  ChestProvider = require('chestProvider18')
+  ChestProvider = require('core.chestProvider18')
 end
 
 if not device.wireless_modem then