move apis into rom/modules/main for shell compatibility

sys/apps/Files.lua

@@ -1,8 +1,8 @@
-local Config = require('config')
+local Config = require('opus.config')
-local Event  = require('event')
+local Event  = require('opus.event')
-local pastebin = require('http.pastebin')
+local pastebin = require('opus.http.pastebin')
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

sys/apps/Help.lua

@@ -1,5 +1,5 @@
-local UI    = require('ui')
+local UI    = require('opus.ui')
-local Util  = require('util')
+local Util  = require('opus.util')
 
 local colors = _G.colors
 local help   = _G.help

sys/apps/Lua.lua

@@ -1,9 +1,9 @@
 -- Lua may be called from outside of shell - inject a require
 _G.requireInjector(_ENV)
 
-local History    = require('history')
+local History    = require('opus.history')
-local UI         = require('ui')
+local UI         = require('opus.ui')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local os         = _G.os

sys/apps/Network.lua

@@ -1,8 +1,8 @@
-local Config = require('config')
+local Config = require('opus.config')
-local Event  = require('event')
+local Event  = require('opus.event')
-local Socket = require('socket')
+local Socket = require('opus.socket')
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local colors     = _G.colors
 local device     = _G.device

sys/apps/Overview.lua

@@ -1,12 +1,12 @@
-local class    = require('class')
+local class    = require('opus.class')
-local Config   = require('config')
+local Config   = require('opus.config')
-local Event    = require('event')
+local Event    = require('opus.event')
-local NFT      = require('nft')
+local NFT      = require('opus.nft')
-local Packages = require('packages')
+local Packages = require('opus.packages')
-local SHA      = require('crypto.sha2')
+local SHA      = require('opus.crypto.sha2')
-local Tween    = require('ui.tween')
+local Tween    = require('opus.ui.tween')
-local UI       = require('ui')
+local UI       = require('opus.ui')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local colors     = _G.colors
 local device     = _G.device

sys/apps/PackageManager.lua

@@ -1,7 +1,7 @@
-local Ansi     = require('ansi')
+local Ansi     = require('opus.ansi')
-local Packages = require('packages')
+local Packages = require('opus.packages')
-local UI       = require('ui')
+local UI       = require('opus.ui')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local colors   = _G.colors
 local term     = _G.term

sys/apps/System.lua

@@ -1,5 +1,5 @@
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local fs     = _G.fs
 local shell  = _ENV.shell

sys/apps/Tasks.lua

@@ -1,5 +1,5 @@
-local Event = require('event')
+local Event = require('opus.event')
-local UI    = require('ui')
+local UI    = require('opus.ui')
 
 local kernel     = _G.kernel
 local multishell = _ENV.multishell

sys/apps/Welcome.lua

@@ -1,7 +1,7 @@
-local Ansi     = require('ansi')
+local Ansi     = require('opus.ansi')
-local Security = require('security')
+local Security = require('opus.security')
-local SHA      = require('crypto.sha2')
+local SHA      = require('opus.crypto.sha2')
-local UI       = require('ui')
+local UI       = require('opus.ui')
 
 local colors   = _G.colors
 local os       = _G.os

sys/apps/autorun.lua

@@ -1,4 +1,4 @@
-local Packages = require('packages')
+local Packages = require('opus.packages')
 
 local colors     = _G.colors
 local fs         = _G.fs

sys/apps/cedit.lua

@@ -1,4 +1,4 @@
-local Config     = require('config')
+local Config     = require('opus.config')
 
 local multishell = _ENV.multishell
 local os         = _G.os

sys/apps/cshell.lua

@@ -1,4 +1,4 @@
-local Config     = require('config')
+local Config     = require('opus.config')
 
 local read  = _G.read
 local shell = _ENV.shell

sys/apps/netdaemon.lua

@@ -1,7 +1,7 @@
 _G.requireInjector(_ENV)
 
-local Event = require('event')
+local Event = require('opus.event')
-local Util  = require('util')
+local Util  = require('opus.util')
 
 local device     = _G.device
 local fs         = _G.fs

sys/apps/network/proxy.lua

@@ -1,6 +1,6 @@
-local Event  = require('event')
+local Event  = require('opus.event')
-local Socket = require('socket')
+local Socket = require('opus.socket')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local function getProxy(path)
 	local x = Util.split(path, '(.-)/')

sys/apps/network/samba.lua

@@ -1,5 +1,5 @@
-local Event  = require('event')
+local Event  = require('opus.event')
-local Socket = require('socket')
+local Socket = require('opus.socket')
 
 local fs = _G.fs
 

sys/apps/network/snmp.lua

@@ -1,7 +1,7 @@
-local Event  = require('event')
+local Event  = require('opus.event')
-local GPS    = require('gps')
+local GPS    = require('opus.gps')
-local Socket = require('socket')
+local Socket = require('opus.socket')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local device  = _G.device
 local kernel  = _G.kernel

sys/apps/network/telnet.lua

@@ -1,6 +1,6 @@
-local Event  = require('event')
+local Event  = require('opus.event')
-local Socket = require('socket')
+local Socket = require('opus.socket')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local kernel = _G.kernel
 local term   = _G.term

sys/apps/network/transport.lua

@@ -5,7 +5,7 @@
 	* background read buffering
 ]]--
 
-local Event = require('event')
+local Event = require('opus.event')
 
 local os = _G.os
 

sys/apps/network/trust.lua

@@ -1,8 +1,8 @@
-local Crypto   = require('crypto.chacha20')
+local Crypto   = require('opus.crypto.chacha20')
-local Event    = require('event')
+local Event    = require('opus.event')
-local Security = require('security')
+local Security = require('opus.security')
-local Socket   = require('socket')
+local Socket   = require('opus.socket')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local function trustConnection(socket)
 	local data = socket:read(2)

sys/apps/network/vnc.lua

@@ -1,6 +1,6 @@
-local Event  = require('event')
+local Event  = require('opus.event')
-local Socket = require('socket')
+local Socket = require('opus.socket')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local os       = _G.os
 local terminal = _G.device.terminal

sys/apps/package.lua

@@ -1,7 +1,7 @@
-local BulkGet  = require('bulkget')
+local BulkGet  = require('opus.bulkget')
-local Git      = require('git')
+local Git      = require('opus.git')
-local Packages = require('packages')
+local Packages = require('opus.packages')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local fs       = _G.fs
 local term     = _G.term

sys/apps/password.lua

@@ -1,6 +1,6 @@
-local Security = require('security')
+local Security = require('opus.security')
-local SHA      = require('crypto.sha2')
+local SHA      = require('opus.crypto.sha2')
-local Terminal = require('terminal')
+local Terminal = require('opus.terminal')
 
 local password = Terminal.readPassword('Enter new password: ')
 

sys/apps/pastebin.lua

@@ -11,7 +11,7 @@ if not http then
 	return
 end
 
-local pastebin = require('http.pastebin')
+local pastebin = require('opus.http.pastebin')
 
 local tArgs = { ... }
 local sCommand = tArgs[1]

sys/apps/shell.lua

@@ -13,8 +13,8 @@ sandboxEnv.shell = shell
 
 _G.requireInjector(_ENV)
 
-local trace = require('trace')
+local trace = require('opus.trace')
-local Util = require('util')
+local Util = require('opus.util')
 
 local DIR = (parentShell and parentShell.dir()) or ""
 local PATH = (parentShell and parentShell.path()) or ".:/rom/programs"
@@ -358,12 +358,12 @@ if #tArgs > 0 then
 	return run(env, ...)
 end
 
-local Config   = require('config')
+local Config   = require('opus.config')
-local Entry    = require('entry')
+local Entry    = require('opus.entry')
-local History  = require('history')
+local History  = require('opus.history')
-local Input    = require('input')
+local Input    = require('opus.input')
-local Sound    = require('sound')
+local Sound    = require('opus.sound')
-local Terminal = require('terminal')
+local Terminal = require('opus.terminal')
 
 local colors    = _G.colors
 local os        = _G.os

sys/apps/system/aliases.lua

@@ -1,5 +1,5 @@
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local kernel = _G.kernel
 

sys/apps/system/cloud.lua

@@ -1,6 +1,6 @@
-local Ansi   = require('ansi')
+local Ansi   = require('opus.ansi')
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local colors = _G.colors
 

sys/apps/system/kiosk.lua

@@ -1,4 +1,4 @@
-local UI = require('ui')
+local UI = require('opus.ui')
 
 local colors     = _G.colors
 local peripheral = _G.peripheral

sys/apps/system/label.lua

@@ -1,5 +1,5 @@
-local UI   = require('ui')
+local UI   = require('opus.ui')
-local Util = require('util')
+local Util = require('opus.util')
 
 local fs   = _G.fs
 local os   = _G.os

sys/apps/system/launcher.lua

@@ -1,5 +1,5 @@
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local colors = _G.colors
 local fs     = _G.fs

sys/apps/system/network.lua

@@ -1,6 +1,6 @@
-local Ansi   = require('ansi')
+local Ansi   = require('opus.ansi')
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local device = _G.device
 

sys/apps/system/password.lua

@@ -1,6 +1,6 @@
-local Security = require('security')
+local Security = require('opus.security')
-local SHA      = require('crypto.sha2')
+local SHA      = require('opus.crypto.sha2')
-local UI       = require('ui')
+local UI       = require('opus.ui')
 
 local colors   = _G.colors
 

sys/apps/system/path.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local tab = UI.Tab {
 	tabTitle = 'Path',

sys/apps/system/requires.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local tab = UI.Tab {
 	tabTitle = 'Requires',

sys/apps/system/settings.lua

@@ -1,4 +1,4 @@
-local UI = require('ui')
+local UI = require('opus.ui')
 
 local settings = _G.settings
 

sys/apps/system/shell.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
+local Config = require('opus.config')
-local UI     = require('ui')
+local UI     = require('opus.ui')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local os     = _G.os

sys/apps/telnet.lua

@@ -1,7 +1,7 @@
-local Event    = require('event')
+local Event    = require('opus.event')
-local Socket   = require('socket')
+local Socket   = require('opus.socket')
-local Terminal = require('terminal')
+local Terminal = require('opus.terminal')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local multishell = _ENV.multishell
 local os         = _G.os

sys/apps/trust.lua

@@ -1,8 +1,8 @@
-local Crypto   = require('crypto.chacha20')
+local Crypto   = require('opus.crypto.chacha20')
-local Security = require('security')
+local Security = require('opus.security')
-local SHA      = require('crypto.sha2')
+local SHA      = require('opus.crypto.sha2')
-local Socket   = require('socket')
+local Socket   = require('opus.socket')
-local Terminal = require('terminal')
+local Terminal = require('opus.terminal')
 
 local os = _G.os
 

sys/apps/vnc.lua

@@ -1,7 +1,7 @@
-local Event      = require('event')
+local Event      = require('opus.event')
-local Socket     = require('socket')
+local Socket     = require('opus.socket')
-local Terminal   = require('terminal')
+local Terminal   = require('opus.terminal')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local multishell = _ENV.multishell

sys/autorun/clipboard.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local kernel    = _G.kernel
 local keyboard  = _G.device.keyboard

sys/autorun/hotkeys.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local kernel     = _G.kernel
 local keyboard   = _G.device.keyboard

sys/autorun/welcome.lua

@@ -1,5 +1,5 @@
-local Config = require('config')
+local Config = require('opus.config')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local fs     = _G.fs
 local os     = _G.os

sys/boot/opus.boot

@@ -44,19 +44,19 @@ local function runUrl(file, ...)
 end
 
 -- Install require shim
-if fs.exists('sys/apis/injector.lua') then
+if fs.exists('sys/modules/opus/injector.lua') then
-	_G.requireInjector = run('sys/apis/injector.lua')
+	_G.requireInjector = run('sys/modules/opus/injector.lua')
 else
 	-- not local, run the file system directly from git
 	if package and package.path then
-		package.path = package.path .. ';' .. BASE .. '/sys/apis'
+		package.path = package.path .. ';' .. BASE .. '/sys/modules/opus'
 	else
 		sandboxEnv.package = {
-			path = BASE .. '/sys/apis'
+			path = BASE .. '/sys/modules/opus'
 		}
 	end
 
-	_G.requireInjector = runUrl('sys/apis/injector.lua')
+	_G.requireInjector = runUrl('sys/modules/opus/injector.lua')
 
 	runUrl('sys/init/2.vfs.lua')
 

sys/init/1.device.lua

@@ -1,6 +1,6 @@
 _G.requireInjector(_ENV)
 
-local Peripheral = require('peripheral')
+local Peripheral = require('opus.peripheral')
 
 _G.device = Peripheral.getList()
 
@@ -24,8 +24,8 @@ _G.device.mouse = {
 	state   = { },
 }
 
-local Input      = require('input')
+local Input      = require('opus.input')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local device   = _G.device
 local kernel   = _G.kernel

sys/init/2.vfs.lua

@@ -3,7 +3,7 @@ if fs.native then
 end
 
 _G.requireInjector(_ENV)
-local Util = require('util')
+local Util = require('opus.util')
 
 -- TODO: support getDrive for virtual nodes
 
@@ -256,7 +256,7 @@ end
 local function getfstype(fstype)
 	local vfs = fstypes[fstype]
 	if not vfs then
-		vfs = require('fs.' .. fstype)
+		vfs = require('opus.fs.' .. fstype)
 		fs.registerType(fstype, vfs)
 	end
 	return vfs

sys/init/3.modules.lua

@@ -1,4 +1,4 @@
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local device     = _G.device
 local kernel     = _G.kernel

sys/init/4.user.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local fs    = _G.fs
 local shell = _ENV.shell
@@ -43,7 +43,7 @@ end
 
 shell.setPath(table.concat(path, ':'))
 
-_G.LUA_PATH = config.lua_path
+--_G.LUA_PATH = config.lua_path
-_G.settings.set('mbs.shell.require_path', config.lua_path)
+--_G.settings.set('mbs.shell.require_path', config.lua_path)
 
 fs.loadTab('usr/config/fstab')

sys/init/5.network.lua

@@ -1,6 +1,6 @@
 _G.requireInjector(_ENV)
 
-local Config = require('config')
+local Config = require('opus.config')
 
 local device     = _G.device
 local kernel     = _G.kernel

sys/init/6.packages.lua

@@ -1,5 +1,5 @@
-local Packages = require('packages')
+local Packages = require('opus.packages')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local fs    = _G.fs
 local help  = _G.help
@@ -22,7 +22,7 @@ for name in pairs(Packages:installed()) do
 	table.insert(appPaths, 1, packageDir)
 	local apiPath = fs.combine(packageDir, 'apis')
 	if fs.exists(apiPath) then
-		fs.mount(fs.combine('sys/apis', name), 'linkfs', apiPath)
+		fs.mount(fs.combine('rom/modules/main', name), 'linkfs', apiPath)
 	end
 
 	local helpPath = '/' .. fs.combine(packageDir, 'help')
@@ -33,3 +33,5 @@ end
 
 help.setPath(table.concat(helpPaths, ':'))
 shell.setPath(table.concat(appPaths, ':'))
+
+fs.mount('rom/modules/main/opus', 'linkfs', 'sys/modules/opus')

sys/init/6.tl3.lua

@@ -2,10 +2,10 @@ if not _G.turtle then
 	return
 end
 
-local Pathing      = require('pathfind')
+local Pathing      = require('opus.pathfind')
-local Point        = require('point')
+local Point        = require('opus.point')
-local synchronized = require('sync').sync
+local synchronized = require('opus.sync').sync
-local Util         = require('util')
+local Util         = require('opus.util')
 
 local os         = _G.os
 local peripheral = _G.peripheral

sys/init/7.multishell.lua

@@ -1,8 +1,8 @@
 _G.requireInjector(_ENV)
 
-local Config   = require('config')
+local Config   = require('opus.config')
-local trace    = require('trace')
+local trace    = require('opus.trace')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

sys/kernel.lua

@@ -1,7 +1,7 @@
 _G.requireInjector(_ENV)
 
-local Terminal = require('terminal')
+local Terminal = require('opus.terminal')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 _G.kernel = {
 	UID = 0,

sys/modules/opus/bulkget.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local parallel = _G.parallel
 

sys/modules/opus/config.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local fs    = _G.fs
 local shell = _ENV.shell

sys/modules/opus/crypto/chacha20.lua

@@ -1,8 +1,8 @@
 -- Chacha20 cipher in ComputerCraft
 -- By Anavrins
 
-local sha2 = require('crypto.sha2')
+local sha2 = require('opus.crypto.sha2')
-local util = require('util')
+local util = require('opus.util')
 
 local ROUNDS = 20 -- Adjust this for speed tradeoff
 

sys/modules/opus/crypto/ecc/elliptic.lua

@@ -21,7 +21,7 @@
 -- Completeness? Yes: The curve is an Edwards Curve with non-square d and square a, so the curve is complete.
 -- Indistinguishability? No: The curve does not support indistinguishability maps.
 
-local fp = require('crypto.ecc.fp')
+local fp = require('opus.crypto.ecc.fp')
 local eq = fp.eq
 local mul = fp.mul
 local sqr = fp.sqr

sys/modules/opus/crypto/ecc/init.lua

@@ -1,6 +1,6 @@
-local fq       = require('crypto.ecc.fq')
+local fq       = require('opus.crypto.ecc.fq')
-local elliptic = require('crypto.ecc.elliptic')
+local elliptic = require('opus.crypto.ecc.elliptic')
-local sha256   = require('crypto.sha2')
+local sha256   = require('opus.crypto.sha2')
 
 local os = _G.os
 

sys/modules/opus/entry.lua

@@ -1,4 +1,4 @@
-local class = require('class')
+local class = require('opus.class')
 
 local os = _G.os
 

sys/modules/opus/fs/gitfs.lua

@@ -1,4 +1,4 @@
-local git = require('git')
+local git = require('opus.git')
 
 local fs = _G.fs
 

sys/modules/opus/fs/netfs.lua

@@ -1,5 +1,5 @@
-local Socket       = require('socket')
+local Socket       = require('opus.socket')
-local synchronized = require('sync').sync
+local synchronized = require('opus.sync').sync
 
 local fs = _G.fs
 

sys/modules/opus/fs/ramfs.lua

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

sys/modules/opus/fs/urlfs.lua

@@ -1,5 +1,5 @@
 --local rttp = require('rttp')
-local Util = require('util')
+local Util = require('opus.util')
 
 local fs = _G.fs
 

sys/modules/opus/git.lua

@@ -1,5 +1,5 @@
-local json = require('json')
+local json = require('opus.json')
-local Util = require('util')
+local Util = require('opus.util')
 
 local TREE_URL = 'https://api.github.com/repos/%s/%s/git/trees/%s?recursive=1'
 local FILE_URL = 'https://raw.githubusercontent.com/%s/%s/%s/%s'

sys/modules/opus/history.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local History    = { }
 local History_mt = { __index = History }

sys/modules/opus/injector.lua

@@ -8,21 +8,27 @@ local function split(str, pattern)
 	return t
 end
 
+local hasMain
 local luaPaths = package and package.path and split(package.path, '(.-);') or { }
 for i = 1, #luaPaths do
 	if luaPaths[i] == '?' or luaPaths[i] == '?.lua' then
 		luaPaths[i] = nil
+	elseif string.find(luaPaths[i], '/rom/modules/main') then
+		hasMain = true
 	end
 end
 
 table.insert(luaPaths, 1, '?.lua')
 table.insert(luaPaths, 2, '?/init.lua')
-table.insert(luaPaths, 3, '/usr/apis/?.lua')
+table.insert(luaPaths, 3, '/usr/modules/?.lua')
-table.insert(luaPaths, 4, '/usr/apis/?/init.lua')
+table.insert(luaPaths, 4, '/usr/modules/?/init.lua')
-table.insert(luaPaths, 5, '/sys/apis/?.lua')
+table.insert(luaPaths, 5, '/sys/modules/?.lua')
-table.insert(luaPaths, 6, '/sys/apis/?/init.lua')
+table.insert(luaPaths, 6, '/sys/modules/?/init.lua')
 
 local DEFAULT_PATH   = table.concat(luaPaths, ';')
+if not hasMain then
+	DEFAULT_PATH = DEFAULT_PATH .. ';/rom/modules/main/?;/rom/modules/main/?.lua;/rom/modules/main/?/init.lua'
+end
 
 local fs     = _G.fs
 local http   = _G.http

sys/modules/opus/input.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local keyboard = _G.device and _G.device.keyboard
 local keys     = _G.keys
@@ -203,4 +203,4 @@ function input:test()
 	end
 end
 
-return input
+return input

sys/modules/opus/map.lua

@@ -1,5 +1,5 @@
 -- convience functions for tables with key/value pairs
-local Util = require('util')
+local Util = require('opus.util')
 
 local Map = { }
 

sys/modules/opus/nft.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local NFT = { }
 

sys/modules/opus/packages.lua

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

sys/modules/opus/pathfind.lua

@@ -1,7 +1,7 @@
-local Grid       = require('jumper.grid')
+local Grid       = require('opus.jumper.grid')
-local Pathfinder = require('jumper.pathfinder')
+local Pathfinder = require('opus.jumper.pathfinder')
-local Point      = require('point')
+local Point      = require('opus.point')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local turtle = _G.turtle
 

sys/modules/opus/peripheral.lua

@@ -1,4 +1,4 @@
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local Peripheral = Util.shallowCopy(_G.peripheral)
 
@@ -123,4 +123,4 @@ function Peripheral.get(args)
 	end
 end
 
-return Peripheral
+return Peripheral

sys/modules/opus/point.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local Point = { }
 

sys/modules/opus/security.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
+local Config = require('opus.config')
-local Util   = require('util')
+local Util   = require('opus.util')
-local ECC    = require('crypto.ecc')
+local ECC    = require('opus.crypto.ecc')
 
 local Security = { }
 

sys/modules/opus/socket.lua

@@ -1,6 +1,6 @@
-local Crypto   = require('crypto.chacha20')
+local Crypto   = require('opus.crypto.chacha20')
-local Security = require('security')
+local Security = require('opus.security')
-local Util     = require('util')
+local Util     = require('opus.util')
 
 local device    = _G.device
 local os        = _G.os

sys/modules/opus/terminal.lua

@@ -1,4 +1,4 @@
-local Canvas = require('ui.canvas')
+local Canvas = require('opus.ui.canvas')
 
 local colors = _G.colors
 local term   = _G.term

sys/modules/opus/ui.lua

@@ -1,9 +1,9 @@
-local Canvas     = require('ui.canvas')
+local Canvas     = require('opus.ui.canvas')
-local class      = require('class')
+local class      = require('opus.class')
-local Event      = require('event')
+local Event      = require('opus.event')
-local Input      = require('input')
+local Input      = require('opus.input')
-local Transition = require('ui.transition')
+local Transition = require('opus.ui.transition')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local _rep       = string.rep
 local _sub       = string.sub
@@ -1168,7 +1168,7 @@ end
 
 local function loadComponents()
 	local function load(name)
-		local s, m = Util.run(_ENV, 'sys/apis/ui/components/' .. name .. '.lua')
+		local s, m = Util.run(_ENV, 'sys/modules/opus/ui/components/' .. name .. '.lua')
 		if not s then
 			error(m)
 		end
@@ -1181,7 +1181,7 @@ local function loadComponents()
 		return UI[name]
 	end
 
-	local components = fs.list('sys/apis/ui/components')
+	local components = fs.list('sys/modules/opus/ui/components')
 	for _, f in pairs(components) do
 		local name = f:match('(.+)%.')
 

sys/modules/opus/ui/canvas.lua

@@ -1,6 +1,6 @@
-local class  = require('class')
+local class  = require('opus.class')
-local Region = require('ui.region')
+local Region = require('opus.ui.region')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local _rep   = string.rep
 local _sub   = string.sub

sys/modules/opus/ui/components/ActiveLayer.lua

@@ -1,5 +1,5 @@
-local class = require('class')
+local class = require('opus.class')
-local UI    = require('ui')
+local UI    = require('opus.ui')
 
 UI.ActiveLayer = class(UI.Window)
 UI.ActiveLayer.defaults = {

sys/modules/opus/ui/components/Button.lua

@@ -1,6 +1,6 @@
-local class = require('class')
+local class = require('opus.class')
-local UI    = require('ui')
+local UI    = require('opus.ui')
-local Util  = require('util')
+local Util  = require('opus.util')
 
 local colors = _G.colors
 

sys/modules/opus/ui/components/Checkbox.lua

@@ -1,5 +1,5 @@
-local class = require('class')
+local class = require('opus.class')
-local UI    = require('ui')
+local UI    = require('opus.ui')
 
 local colors = _G.colors