4 files changed, 10 insertions, 13 deletions
diff --git a/heimdal-controller.lua b/heimdal-controller.lua
index d602010..e80eded 100644
--- a/heimdal-controller.lua
+++ b/heimdal-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 default_action = "status"
 
 function status(self)
@@ -10,7 +7,7 @@ function status(self)
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Heimdal Config", "Configuration Set")
+	return self.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Heimdal Config", "Configuration Set")
 end
 
 function klist(self)
@@ -18,7 +15,7 @@ function klist(self)
 end
 
 function kinit(self)
-	return controllerfunctions.handle_form(self, self.model.get_kinit, self.model.set_kinit, self.clientdata, "Submit", "Obtain Kerberos Ticket")
+	return self.handle_form(self, self.model.get_kinit, self.model.set_kinit, self.clientdata, "Submit", "Obtain Kerberos Ticket")
 end
 
 function kdestroy(self)
diff --git a/heimdal-kinit-html.lsp b/heimdal-kinit-html.lsp
index 3863b6f..643e7fd 100644
--- a/heimdal-kinit-html.lsp
+++ b/heimdal-kinit-html.lsp
@@ -1,10 +1,10 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	form.value.password.type = "password"
-	displayform(form)
+	htmlviewfunctions.displayform(form)
 %>
diff --git a/heimdal-klist-html.lsp b/heimdal-klist-html.lsp
index 6e72951..d098a0b 100644
--- a/heimdal-klist-html.lsp
+++ b/heimdal-klist-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"kdestroy"}, session) %>
-<% displaycommandresults({"kinit"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"kdestroy"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"kinit"}, session, true) %>
 
 <H1><%= data.label %></H1>
 <DL>
diff --git a/heimdal-model.lua b/heimdal-model.lua
index 9845c10..57876fa 100644
--- a/heimdal-model.lua
+++ b/heimdal-model.lua
@@ -1,10 +1,10 @@
 module(..., package.seeall)
 
 -- Load libraries
-require("processinfo")
 require("modelfunctions")
-require("fs")
-require("format")
+processinfo = require("acf.processinfo")
+fs = require("acf.fs")
+format = require("acf.format")
 
 -- Set variables
 local configfile = "/etc/krb5.conf"