diff --git a/modules/firstrun.lua b/modules/firstrun.lua
new file mode 100644
index 00000000..d2abd53f
--- /dev/null
+++ b/modules/firstrun.lua
@@ -0,0 +1,77 @@
+pfUI:RegisterModule("firstrun", function ()
+  pfUI.firstrun = CreateFrame("Frame", "pfFirstRunWizard", UIParent)
+  pfUI.firstrun.steps = {}
+  pfUI.firstrun.next = nil
+
+  pfUI.firstrun:RegisterEvent("PLAYER_ENTERING_WORLD")
+  pfUI.firstrun:SetScript("OnEvent", function() pfUI.firstrun:NextStep() end)
+
+  function pfUI.firstrun:AddStep(name, yfunc, nfunc, descr, cmpnt)
+    if not name then return end
+
+    local step = {}
+    step.name = name
+    step.yfunc = yfunc or nil
+    step.nfunc = nfunc or nil
+    step.descr = descr or nil
+    step.cmpnt = cmpnt or nil
+
+    table.insert(pfUI.firstrun.steps, step)
+  end
+
+  pfUI.firstrun:AddStep("cvars", function() pfUI.SetupCVars() end, nil, "|cff33ffccBlizzard: \"Interface Options\"|r\n\n"..
+  "Do you want me to setup the recommended blizzard UI settings?\n"..
+  "This will enable settings that can be found in the Interface section of your client.\n"..
+  "Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set.\n")
+
+  function pfUI.firstrun:NextStep()
+    if pfUI_init and next(pfUI_init) == nil then
+      local yes = function()
+        this:GetParent():Hide()
+        pfUI_init["welcome"] = true
+        pfUI.firstrun:NextStep()
+      end
+
+      local no = function()
+        this:GetParent():Hide()
+      end
+
+      pfUI.api:CreateQuestionDialog("Welcome to |cff33ffccpf|cffffffffUI|r!\n\n"..
+      "I'm the first run wizzard that will guide you through some basic configuration.\n"..
+      "You'll now be prompted for several questions. To get a default installation,\n"..
+      "you might want to click \"Yes\" everywhere. A few settings are client settings\n"..
+      "(e.g chat questions) so if you don't want to lose your chat configurations, you\n"..
+      "should be careful with your choices.\n\n"..
+      "Visit |cff33ffcchttp://shagu.org|r to check for the latest version.", yes, no)
+      return
+    end
+
+    for _, step in pairs(pfUI.firstrun.steps) do
+      local name = step.name
+
+      if not pfUI_init[name] then
+        local function yes()
+          pfUI_init[name] = true
+          if step.yfunc then step.yfunc() end
+          this:GetParent():Hide()
+          pfUI.firstrun:NextStep()
+        end
+
+        local function no()
+          pfUI_init[name] = true
+          if step.nfunc then step.nfunc() end
+          this:GetParent():Hide()
+          pfUI.firstrun:NextStep()
+        end
+
+        if step.cmpnt and step.cmpnt == "edit" then
+          pfUI.api:CreateQuestionDialog(step.descr, yes, no, true)
+        else
+          pfUI.api:CreateQuestionDialog(step.descr, yes, no, false)
+        end
+
+        return
+      end
+    end
+  end
+end)
diff --git a/pfUI.lua b/pfUI.lua
index 4ebdd612..debcfd06 100644
--- a/pfUI.lua
+++ b/pfUI.lua
@@ -148,82 +148,6 @@ function pfUI.SetupCVars()
   UIParentLoadAddOn("Blizzard_CombatText")
 end
 
-pfUI.firstrun = CreateFrame("Frame", "pfFirstRunWizard", UIParent)
-pfUI.firstrun.steps = {}
-pfUI.firstrun.next = nil
-
-pfUI.firstrun:RegisterEvent("PLAYER_ENTERING_WORLD")
-pfUI.firstrun:SetScript("OnEvent", function() pfUI.firstrun:NextStep() end)
-
-function pfUI.firstrun:AddStep(name, yfunc, nfunc, descr, cmpnt)
-  if not name then return end
-
-  local step = {}
-  step.name = name
-  step.yfunc = yfunc or nil
-  step.nfunc = nfunc or nil
-  step.descr = descr or nil
-  step.cmpnt = cmpnt or nil
-
-  table.insert(pfUI.firstrun.steps, step)
-end
-
-pfUI.firstrun:AddStep("cvars", function() pfUI.SetupCVars() end, nil, "|cff33ffccBlizzard: \"Interface Options\"|r\n\n"..
-"Do you want me to setup the recommended blizzard UI settings?\n"..
-"This will enable settings that can be found in the Interface section of your client.\n"..
-"Options like Buff Durations, Instant Quest Text, Auto Selfcast and others will be set.\n")
-
-function pfUI.firstrun:NextStep()
-  if pfUI_init and next(pfUI_init) == nil then
-    local yes = function()
-      this:GetParent():Hide()
-      pfUI_init["welcome"] = true
-      pfUI.firstrun:NextStep()
-    end
-
-    local no = function()
-      this:GetParent():Hide()
-    end
-
-    pfUI.api:CreateQuestionDialog("Welcome to |cff33ffccpf|cffffffffUI|r!\n\n"..
-    "I'm the first run wizzard that will guide you through some basic configuration.\n"..
-    "You'll now be prompted for several questions. To get a default installation,\n"..
-    "you might want to click \"Yes\" everywhere. A few settings are client settings\n"..
-    "(e.g chat questions) so if you don't want to lose your chat configurations, you\n"..
-    "should be careful with your choices.\n\n"..
-    "Visit |cff33ffcchttp://shagu.org|r to check for the latest version.", yes, no)
-    return
-  end
-
-  for _, step in pairs(pfUI.firstrun.steps) do
-    local name = step.name
-
-    if not pfUI_init[name] then
-      local function yes()
-        pfUI_init[name] = true
-        if step.yfunc then step.yfunc() end
-        this:GetParent():Hide()
-        pfUI.firstrun:NextStep()
-      end
-
-      local function no()
-        pfUI_init[name] = true
-        if step.nfunc then step.nfunc() end
-        this:GetParent():Hide()
-        pfUI.firstrun:NextStep()
-      end
-
-      if step.cmpnt and step.cmpnt == "edit" then
-        pfUI.api:CreateQuestionDialog(step.descr, yes, no, true)
-      else
-        pfUI.api:CreateQuestionDialog(step.descr, yes, no, false)
-      end
-
-      return
-    end
-  end
-end
-
 pfUI.info = CreateFrame("Button", "pfInfoBox", UIParent)
 pfUI.info:Hide()
 
diff --git a/pfUI.toc b/pfUI.toc
index 7706042a..08c4f17a 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -24,6 +24,7 @@ env\fonts.lua
 
 # modules
 modules\config.lua
+modules\firstrun.lua
 modules\gui.lua
 modules\pixelperfect.lua
 modules\hoverbind.lua