diff --git a/src/draw.lua b/src/draw.lua
new file mode 100644
index 0000000..f861ccf
--- /dev/null
+++ b/src/draw.lua
@@ -0,0 +1,44 @@
+local background
+local font
+local screen
+local status
+
+local C = Class:extend()
+
+function C:setup()
+  Terebi.initializeLoveDefaults()
+  screen = Terebi.newScreen(320, 240, 2)
+  background = lg.newImage('assets/background.png')
+  font = lg.newFont('assets/monogram_extended.ttf', 16)
+  font:setFilter('nearest', 'nearest', 1)
+  status = "Drag and drop your Cave Story folder here."
+end
+
+local function _print(text, x, y, align)
+  align = align or 'center'
+  lg.setFont(font)
+  local limit = 320 - (x * 2)
+  lg.setColor(0, 0, 0)
+  lg.printf(text, x + 1, y + 1, limit, align)
+  lg.setColor(1, 1, 1)
+  lg.printf(text, x, y, limit, align)
+end
+
+local function _draw()
+  lg.draw(background, 0, 0)
+  _print('Cave Story Randomizer [Open Mode] v' .. VERSION, 0, 10)
+  _print('by shru and duncathan', 0, 22)
+  _print('(@shruuu and @duncathan_salt)', 0, 34)
+  _print(status, 10, 65)
+  _print('Original randomizer:\r\nshru.itch.io/cave-story-randomizer', 10, 200, 'left')
+end
+
+function C:draw()
+  screen:draw(_draw)
+end
+
+function C:setStatus(text)
+  status = text
+end
+
+return C
\ No newline at end of file
diff --git a/src/log.lua b/src/log.lua
new file mode 100644
index 0000000..9acfc64
--- /dev/null
+++ b/src/log.lua
@@ -0,0 +1,26 @@
+local LOG_LEVEL, _logCounts, _logLines = 4, nil, nil
+local function _log(level, prefix, text, ...)
+  if LOG_LEVEL >= level then
+    local text = prefix .. text
+    print(text, ...)
+    table.insert(_logLines, text)
+  end
+  _logCounts[level] = _logCounts[level] + 1
+end
+function logError(...)   _log(1, 'ERROR: ',   ...) end
+function logWarning(...) _log(2, 'WARNING: ', ...) end
+function logNotice(...)  _log(3, 'NOTICE: ',  ...) end
+function logSpoiler(...) _log(4, 'SPOILER: ', ...) end
+function logInfo(...)    _log(5, 'INFO: ',    ...) end
+function logDebug(...)   _log(6, 'DEBUG: ',   ...) end
+function countLogWarningsAndErrors()
+  return _logCounts[2], _logCounts[1]
+end
+function getLogText()
+  return table.concat(_logLines, "\r\n")
+end
+function resetLog()
+  _logCounts = {0, 0, 0, 0, 0, 0}
+  _logLines = {}
+end
+resetLog()
\ No newline at end of file
diff --git a/src/main.lua b/src/main.lua
index 10bee9e..e1c9734 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -6,58 +6,25 @@ Class   = require 'lib.classic'
 _       = require 'lib.moses'
 Serpent = require 'lib.serpent'
 Terebi  = require 'lib.terebi'
+-- Luigi   = require 'lib.luigi.layout'
 
 lf = love.filesystem
 lg = love.graphics
 
 U = require 'util'
 
-
-local LOG_LEVEL, _logCounts, _logLines = 4, nil, nil
-local function _log(level, prefix, text, ...)
-  if LOG_LEVEL >= level then
-    local text = prefix .. text
-    print(text, ...)
-    table.insert(_logLines, text)
-  end
-  _logCounts[level] = _logCounts[level] + 1
-end
-function logError(...)   _log(1, 'ERROR: ',   ...) end
-function logWarning(...) _log(2, 'WARNING: ', ...) end
-function logNotice(...)  _log(3, 'NOTICE: ',  ...) end
-function logSpoiler(...) _log(4, 'SPOILER: ', ...) end
-function logInfo(...)    _log(5, 'INFO: ',    ...) end
-function logDebug(...)   _log(6, 'DEBUG: ',   ...) end
-function countLogWarningsAndErrors()
-  return _logCounts[2], _logCounts[1]
-end
-function getLogText()
-  return table.concat(_logLines, "\r\n")
-end
-function resetLog()
-  _logCounts = {0, 0, 0, 0, 0, 0}
-  _logLines = {}
-end
-resetLog()
+require 'log'
 
 local Randomizer = require 'randomizer'
-local background
-local font
-local screen
-local status
+local Screen = require 'draw'
 
 function love.load()
-  Terebi.initializeLoveDefaults()
-  screen = Terebi.newScreen(320, 240, 2)
-  background = lg.newImage('assets/background.png')
-  font = lg.newFont('assets/monogram_extended.ttf', 16)
-  font:setFilter('nearest', 'nearest', 1)
-  status = "Drag and drop your Cave Story folder here."
+  Screen:setup()
 end
 
 function love.directorydropped(path)
   local randomizer = Randomizer()
-  status = randomizer:randomize(path)
+  Screen:setStatus(randomizer:randomize(path))
 end
 
 function love.keypressed(key)
@@ -66,25 +33,6 @@ function love.keypressed(key)
   end
 end
 
-local function _print(text, x, y, align)
-  align = align or 'center'
-  lg.setFont(font)
-  local limit = 320 - (x * 2)
-  lg.setColor(0, 0, 0)
-  lg.printf(text, x + 1, y + 1, limit, align)
-  lg.setColor(1, 1, 1)
-  lg.printf(text, x, y, limit, align)
-end
-
-local function _draw()
-  lg.draw(background, 0, 0)
-  _print('Cave Story Randomizer [Open Mode] v' .. VERSION, 0, 10)
-  _print('by shru and duncathan', 0, 22)
-  _print('(@shruuu and @duncathan_salt)', 0, 34)
-  _print(status, 10, 65)
-  _print('Original randomizer:\r\nshru.itch.io/cave-story-randomizer', 10, 200, 'left')
-end
-
 function love.draw()
-  screen:draw(_draw)
+  Screen:draw()
 end