1 files changed, 8 insertions, 11 deletions
diff --git a/src/mad-server.cpp b/src/mad-server.cpp
index a00f33d..ba42a89 100644
--- a/src/mad-server.cpp
+++ b/src/mad-server.cpp
@@ -18,30 +18,27 @@
  */
 
 #include "Core/ConfigManager.h"
-#include "Core/ThreadManager.h"
 #include "Common/ModuleManager.h"
+#include "Server/Application.h"
 #include "Server/ConnectionManager.h"
 
 using namespace Mad;
 
 
 int main() {
-  Core::ThreadManager::get()->init();
-  Server::ConnectionManager::get()->init();
+  Server::Application application;
 
-  Common::ModuleManager::get()->loadModule("FileLogger");
-  Common::ModuleManager::get()->loadModule("SystemBackendPosix");
-  Common::ModuleManager::get()->loadModule("SystemBackendProc");
+  application.getModuleManager()->loadModule("FileLogger");
+  application.getModuleManager()->loadModule("SystemBackendPosix");
+  application.getModuleManager()->loadModule("SystemBackendProc");
 
-  Common::ModuleManager::get()->loadModule("UserBackendMysql");
+  application.getModuleManager()->loadModule("UserBackendMysql");
 
-  Core::ConfigManager::get()->loadFile("mad-server.conf");
-  Core::ConfigManager::get()->finish();
+  application.getConfigManager()->loadFile("mad-server.conf");
+  application.getConfigManager()->finish();
 
   while(true)
     sleep(1000);
 
-  Core::Initializable::deinit();
-
   return 0;
 }