diff --git a/moose b/moose
index ad48d3922a..e9f5f109e6 160000
--- a/moose
+++ b/moose
@@ -1 +1 @@
-Subproject commit ad48d3922ad92b90bc809a35310db6a9b8e67ad5
+Subproject commit e9f5f109e610453316f89158ccedd8f0f4747199
diff --git a/src/base/MoltresApp.C b/src/base/MoltresApp.C
index 1f2b9656b0..d54d5e3882 100644
--- a/src/base/MoltresApp.C
+++ b/src/base/MoltresApp.C
@@ -43,6 +43,7 @@ void
 MoltresApp::registerApps()
 {
   registerApp(MoltresApp);
+  ModulesApp::registerApps();
 }
 
 /**************************************************************************************************
diff --git a/src/main.C b/src/main.C
index fe9ceb0b2e..ca8abee91a 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,27 +1,11 @@
 #include "MoltresApp.h"
-#include "MooseInit.h"
-#include "Moose.h"
-#include "MooseApp.h"
-#include "AppFactory.h"
-
-// Create a performance log
-PerfLog Moose::perf_log("Moltres");
+#include "MooseMain.h"
 
 // Begin the main program.
 int
 main(int argc, char * argv[])
 {
-  // Initialize MPI, solvers and MOOSE
-  MooseInit init(argc, argv);
-
-  // Register this application's MooseApp and any it depends on
-  MoltresApp::registerApps();
-
-  // This creates dynamic memory that we're responsible for deleting
-  std::shared_ptr<MooseApp> app = AppFactory::createAppShared("MoltresApp", argc, argv);
-
-  // Execute the application
-  app->run();
+  Moose::main<MoltresApp>(argc, argv);
 
   return 0;
 }
diff --git a/unit/src/main.C b/unit/src/main.C
index ea5804c221..4d1e2076b3 100644
--- a/unit/src/main.C
+++ b/unit/src/main.C
@@ -20,8 +20,6 @@
 #include <fstream>
 #include <string>
 
-PerfLog Moose::perf_log("gtest");
-
 GTEST_API_ int
 main(int argc, char ** argv)
 {