diff --git a/system/library/control/cs/rcon.php b/system/library/control/cs/rcon.php
index 6d2a17e..d08966b 100644
--- a/system/library/control/cs/rcon.php
+++ b/system/library/control/cs/rcon.php
@@ -2,16 +2,12 @@
 if (!DEFINED('EGP'))
     exit(header('Refresh: 0; URL=http://' . $_SERVER['SERVER_NAME'] . '/404'));
 
+use xPaw\SourceQuery\SourceQuery;
+
 class rcon
 {
     public static function cmd($server, $cmd = 'status')
     {
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/GoldSourceRcon.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         list($ip, $port) = explode(':', $server['address']);
diff --git a/system/library/control/cs/scan.php b/system/library/control/cs/scan.php
index 5ac0501..e8c6d9e 100644
--- a/system/library/control/cs/scan.php
+++ b/system/library/control/cs/scan.php
@@ -4,17 +4,14 @@ if (!DEFINED('EGP'))
 
 include(LIB . 'control/scans.php');
 
+use xPaw\SourceQuery\SourceQuery;
+
 class scan extends scans
 {
     public static function mon($id, $players_get = false)
     {
         global $cfg, $sql, $html, $mcache;
 
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         if ($players_get)
diff --git a/system/library/control/csgo/rcon.php b/system/library/control/csgo/rcon.php
index bca580b..af679c6 100644
--- a/system/library/control/csgo/rcon.php
+++ b/system/library/control/csgo/rcon.php
@@ -2,16 +2,12 @@
 if (!DEFINED('EGP'))
     exit(header('Refresh: 0; URL=http://' . $_SERVER['SERVER_NAME'] . '/404'));
 
+use xPaw\SourceQuery\SourceQuery;
+
 class rcon
 {
     public static function cmd($server, $cmd = 'status')
     {
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceRcon.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         list($ip, $port) = explode(':', $server['address']);
diff --git a/system/library/control/csgo/scan.php b/system/library/control/csgo/scan.php
index 48fd67b..1012ad7 100644
--- a/system/library/control/csgo/scan.php
+++ b/system/library/control/csgo/scan.php
@@ -4,17 +4,14 @@ if (!DEFINED('EGP'))
 
 include(LIB . 'control/scans.php');
 
+use xPaw\SourceQuery\SourceQuery;
+
 class scan extends scans
 {
     public static function mon($id, $players_get = false)
     {
         global $cfg, $sql, $html, $mcache;
 
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         if ($players_get)
diff --git a/system/library/control/css/rcon.php b/system/library/control/css/rcon.php
index 246d14f..26beea8 100644
--- a/system/library/control/css/rcon.php
+++ b/system/library/control/css/rcon.php
@@ -2,16 +2,12 @@
 if (!DEFINED('EGP'))
     exit(header('Refresh: 0; URL=http://' . $_SERVER['SERVER_NAME'] . '/404'));
 
+use xPaw\SourceQuery\SourceQuery;
+
 class rcon
 {
     public static function cmd($server, $cmd = 'status')
     {
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceRcon.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         list($ip, $port) = explode(':', $server['address']);
diff --git a/system/library/control/css/scan.php b/system/library/control/css/scan.php
index f9541ae..e368f70 100644
--- a/system/library/control/css/scan.php
+++ b/system/library/control/css/scan.php
@@ -4,17 +4,14 @@ if (!DEFINED('EGP'))
 
 include(LIB . 'control/scans.php');
 
+use xPaw\SourceQuery\SourceQuery;
+
 class scan extends scans
 {
     public static function mon($id, $players_get = false)
     {
         global $cfg, $sql, $html, $mcache;
 
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         if ($players_get)
diff --git a/system/library/control/cssold/rcon.php b/system/library/control/cssold/rcon.php
index bd7430b..30eb9db 100644
--- a/system/library/control/cssold/rcon.php
+++ b/system/library/control/cssold/rcon.php
@@ -2,16 +2,12 @@
 if (!DEFINED('EGP'))
     exit(header('Refresh: 0; URL=http://' . $_SERVER['SERVER_NAME'] . '/404'));
 
+use xPaw\SourceQuery\SourceQuery;
+
 class rcon
 {
     public static function cmd($server, $cmd = 'status')
     {
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceRcon.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         list($ip, $port) = explode(':', $server['address']);
diff --git a/system/library/control/cssold/scan.php b/system/library/control/cssold/scan.php
index f9541ae..e368f70 100644
--- a/system/library/control/cssold/scan.php
+++ b/system/library/control/cssold/scan.php
@@ -4,17 +4,14 @@ if (!DEFINED('EGP'))
 
 include(LIB . 'control/scans.php');
 
+use xPaw\SourceQuery\SourceQuery;
+
 class scan extends scans
 {
     public static function mon($id, $players_get = false)
     {
         global $cfg, $sql, $html, $mcache;
 
-        include(LIB . 'games/query/Buffer.php');
-        include(LIB . 'games/query/BaseSocket.php');
-        include(LIB . 'games/query/Socket.php');
-        include(LIB . 'games/query/SourceQuery.php');
-
         $sq = new SourceQuery();
 
         if ($players_get)