diff --git a/.gitignore b/.gitignore
index 13adf9f8..b17188ff 100755
--- a/.gitignore
+++ b/.gitignore
@@ -268,4 +268,5 @@ Data Folder
 .vscode/settings.json
 
 .idea
-cmake-build-debug
\ No newline at end of file
+cmake-build-debug
+libcathook.so
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cd8b26d..d7786ea3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,72 @@
 # UNFINISHED - DO NOT USE.
 
-cmake_minimum_required ( VERSION 3.0 )
-project ( cathook )
+cmake_minimum_required(VERSION 3.0)
+project(cathook VERSION 0.0.1 DESCRIPTION "Free Source Engine Trainer")
 
-set (SOURCESDK "source-sdk-2013-headers")
+find_library(SDL2 REQUIRED)
 
-include_directories ( . include ucccccp SYSTEM ${SOURCESDK} ${SOURCESDK}/public ${SOURCESDK}/mathlib ${SOURCESDK}/common ${SOURCESDK}/public/tier0 ${SOURCESDK}/public/tier1)
+add_library(cathook SHARED "")
 
+set_target_properties(cathook PROPERTIES COMPILE_FLAGS "-m32 -msse -msse2 -msse3" LINK_FLAGS "-m32")
 
+target_compile_definitions(cathook PRIVATE
+        GAME=tf2
+        ENABLE_VISUALS=1
+        ENABLE_IPC=1
+        ENABLE_NULL_GRAPHICS=0
+        TEXTMODE_STDIN=0
+        TEXTMODE_VAC=0
+        DATA_PATH="/opt/cathook/data"
+        NO_LTO=0
+        _GLIBCXX_USE_CXX11_ABI=0
+        _POSIX=1
+        FREETYPE_GL_USE_VAO=1
+        RAD_TELEMETRY_DISABLED=1
+        LINUX=1
+        USE_SDL=1
+        _LINUX=1
+        POSIX=1
+        GNUC=1
+        NO_MALLOC_OVERRIDE=1)
 
-add_subdirectory (src)
\ No newline at end of file
+target_include_directories(cathook PRIVATE
+        "source-sdk-2013-headers/mp/src/mathlib"
+        "source-sdk-2013-headers/mp/src/public"
+        "source-sdk-2013-headers/mp/src/common"
+        "source-sdk-2013-headers/mp/src/public/tier0"
+        "source-sdk-2013-headers/mp/src/public/tier1"
+        "source-sdk-2013-headers/mp/src/tier1"
+        "source-sdk-2013-headers/mp/src")
+
+target_include_directories(cathook PRIVATE
+        "simple-ipc/src/include"
+        "libglez/include"
+        "libxoverlay/include"
+        "ucccccp"
+        "${SDL2_INCLUDE_DIRS}")
+
+add_subdirectory(include)
+add_subdirectory(src)
+
+add_library(libc SHARED IMPORTED)
+set_target_properties(libc PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libc.so.6")
+
+add_library(freetype SHARED IMPORTED)
+set_target_properties(freetype PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libfreetype.so")
+
+add_library(glew SHARED IMPORTED)
+set_target_properties(glew PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libGLEW.so")
+
+add_library(sdl2 SHARED IMPORTED)
+set_target_properties(sdl2 PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libSDL2-2.0.so.0")
+
+add_library(stdcpp SHARED IMPORTED)
+set_target_properties(stdcpp PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libstdc++.so.6")
+
+add_library(tier0 SHARED IMPORTED)
+set_target_properties(tier0 PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libtier0.so")
+
+add_library(vstdlib SHARED IMPORTED)
+set_target_properties(vstdlib PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libvstdlib.so")
+
+target_link_libraries(cathook libc freetype glew sdl2 stdcpp tier0 vstdlib)
\ No newline at end of file
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 00000000..94e670d2
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,68 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/angles.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/averager.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/backpacktf.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/base64.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CDumper.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/chatlog.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/chatstack.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/common.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/conditions.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/crits.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/e8call.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/entitycache.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/entityhitboxcache.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/enums.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/fidgetspinner.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/gameinfo.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/globals.h"
+        "${CMAKE_CURRENT_LIST_DIR}/hack.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/headshake.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/helpers.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hitrate.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hooks.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hoovy.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/https_request.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/init.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/interfaces.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ipc.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/itemtypes.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/json.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/localplayer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/logging.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/macros.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/netmessage.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/netvars.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/offsets.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/playerlist.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/playerresource.h"
+        "${CMAKE_CURRENT_LIST_DIR}/prediction.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/profiler.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/projlogging.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sconvars.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sdk.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sharedobj.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/targethelper.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/textfile.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/textmode.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/tfmm.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/timer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/trace.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ucccccp_cmds.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/usercmd.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/velocity.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/vfunc.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/votelogger.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/xorstring.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
+
+add_subdirectory(classinfo)
+add_subdirectory(copypasted)
+add_subdirectory(hacks)
+add_subdirectory(hooks)
+add_subdirectory(menu)
+add_subdirectory(reclasses)
+add_subdirectory(sdk)
+add_subdirectory(visual)
\ No newline at end of file
diff --git a/include/classinfo/CMakeLists.txt b/include/classinfo/CMakeLists.txt
new file mode 100644
index 00000000..48c6748b
--- /dev/null
+++ b/include/classinfo/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/classinfo.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/dump.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/common.hpp b/include/common.hpp
index 1da083d7..991c8f78 100755
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -114,7 +114,7 @@
 
 #if ENABLE_GUI
 #include "gui/GUI.hpp"
-#include "menu/GUI.h"
+#include "GUI.h"
 #endif
 
 #include <hacks/hacklist.hpp>
diff --git a/include/copypasted/CMakeLists.txt b/include/copypasted/CMakeLists.txt
new file mode 100644
index 00000000..20d1b4b2
--- /dev/null
+++ b/include/copypasted/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CSignature.h"
+        "${CMAKE_CURRENT_LIST_DIR}/Netvar.h")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/gui/GUI.hpp b/include/gui/GUI.hpp
deleted file mode 100755
index eda8ec13..00000000
--- a/include/gui/GUI.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * GUI.hpp
- *
- *  Created on: Nov 14, 2017
- *      Author: nullifiedcat
- */
-
-#pragma once
-
-#include "cmdui/cmdui.hpp"
-
-namespace gui
-{
-
-void init();
-void update();
-void draw();
-}
diff --git a/include/gui/cmdui/cmdui.hpp b/include/gui/cmdui/cmdui.hpp
deleted file mode 100755
index 7cf87dbc..00000000
--- a/include/gui/cmdui/cmdui.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * cmdui.hpp
- *
- *  Created on: Nov 17, 2017
- *      Author: nullifiedcat
- */
-
-#pragma once
-
-namespace gui
-{
-namespace cmdui
-{
-
-void init();
-void update();
-void draw();
-}
-}
diff --git a/include/hacks/CMakeLists.txt b/include/hacks/CMakeLists.txt
new file mode 100644
index 00000000..d00a113d
--- /dev/null
+++ b/include/hacks/CMakeLists.txt
@@ -0,0 +1,38 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/Achievement.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Aimbot.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Announcer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiAim.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiBackstab.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiCheat.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiDisguise.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoBackstab.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoDeadringer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoDetonator.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoHeal.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoJoin.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoReflect.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoSticky.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoTaunt.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Bunnyhop.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CatBot.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ESP.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/FollowBot.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hacklist.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/HealArrows.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/KillSay.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Killstreak.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/LagExploit.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Misc.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Noisemaker.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Radar.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/SkinChanger.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Spam.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/SpyAlert.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Trigger.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/UberSpam.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Walkbot.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
+
+add_subdirectory(ac)
\ No newline at end of file
diff --git a/include/hacks/FollowBot.hpp b/include/hacks/FollowBot.hpp
index 1ec3e0ca..a222ca8e 100644
--- a/include/hacks/FollowBot.hpp
+++ b/include/hacks/FollowBot.hpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "common.hpp";
+#include "common.hpp"
 
 namespace hacks
 {
diff --git a/include/hacks/ac/CMakeLists.txt b/include/hacks/ac/CMakeLists.txt
new file mode 100644
index 00000000..a751ec7c
--- /dev/null
+++ b/include/hacks/ac/CMakeLists.txt
@@ -0,0 +1,6 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/aimbot.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/antiaim.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/bhop.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/hooks/CMakeLists.txt b/include/hooks/CMakeLists.txt
new file mode 100644
index 00000000..1b023837
--- /dev/null
+++ b/include/hooks/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CreateMove.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hookedmethods.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/others.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PaintTraverse.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/menu/CMakeLists.txt b/include/menu/CMakeLists.txt
new file mode 100644
index 00000000..b0965dc1
--- /dev/null
+++ b/include/menu/CMakeLists.txt
@@ -0,0 +1,13 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseContainer.h"
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseWidget.h"
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseWindow.h"
+        "${CMAKE_CURRENT_LIST_DIR}/compatlayer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTextLabel.h"
+        "${CMAKE_CURRENT_LIST_DIR}/guicommon.h"
+        "${CMAKE_CURRENT_LIST_DIR}/GUI.h"
+        "${CMAKE_CURRENT_LIST_DIR}/IWidget.h")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
+
+add_subdirectory(ncc)
\ No newline at end of file
diff --git a/include/menu/ncc/CMakeLists.txt b/include/menu/ncc/CMakeLists.txt
new file mode 100644
index 00000000..a35af28b
--- /dev/null
+++ b/include/menu/ncc/CMakeLists.txt
@@ -0,0 +1,13 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/Item.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemSublist.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemTitle.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemVariable.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/List.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Menu.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PlayerListEntry.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PlayerList.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Root.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Tooltip.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/reclasses/CMakeLists.txt b/include/reclasses/CMakeLists.txt
new file mode 100644
index 00000000..39381075
--- /dev/null
+++ b/include/reclasses/CMakeLists.txt
@@ -0,0 +1,17 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/C_BaseCombatWeapon.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_BaseEntity.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_BasePlayer.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_MannVsMachineStats.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFGCClientSystem.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFInventoryManager.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFPartyClient.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFParty.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFPlayerShared.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_TFWeaponBaseGun.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_TFWeaponBase.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/C_TFWeaponBaseMelee.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ITFGroupMatchCriteria.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/reclasses.hpp")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/sdk/CMakeLists.txt b/include/sdk/CMakeLists.txt
new file mode 100644
index 00000000..554a9b21
--- /dev/null
+++ b/include/sdk/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CGameRules.h"
+        "${CMAKE_CURRENT_LIST_DIR}/HUD.h"
+        "${CMAKE_CURRENT_LIST_DIR}/igamemovement.h"
+        "${CMAKE_CURRENT_LIST_DIR}/iinput.h"
+        "${CMAKE_CURRENT_LIST_DIR}/imaterialsystemfixed.h"
+        "${CMAKE_CURRENT_LIST_DIR}/in_buttons.h"
+        "${CMAKE_CURRENT_LIST_DIR}/ScreenSpaceEffects.h")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/include/sdk/imaterialsystemfixed.h b/include/sdk/imaterialsystemfixed.h
index 6f4a22b0..efe74928 100755
--- a/include/sdk/imaterialsystemfixed.h
+++ b/include/sdk/imaterialsystemfixed.h
@@ -13,11 +13,6 @@
 #pragma once
 #endif
 
-#define OVERBRIGHT 2.0f
-#define OO_OVERBRIGHT (1.0f / 2.0f)
-#define GAMMA 2.2f
-#define TEXGAMMA 2.2f
-
 #include "tier1/interface.h"
 #include "tier1/refcount.h"
 #include "mathlib/vector.h"
diff --git a/include/visual/CMakeLists.txt b/include/visual/CMakeLists.txt
new file mode 100644
index 00000000..e8aceffc
--- /dev/null
+++ b/include/visual/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/atlas.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/colors.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawex.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawing.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawmgr.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/EffectChams.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/EffectGlow.hpp"
+        "${CMAKE_CURRENT_LIST_DIR}/glez.h"
+        "${CMAKE_CURRENT_LIST_DIR}/xoverlay.h")
+
+target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
\ No newline at end of file
diff --git a/makefile b/makefile.old
similarity index 100%
rename from makefile
rename to makefile.old
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755
new mode 100644
index aed8123d..888cdb49
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1 +1,52 @@
-aux_source_directory (. SOURCES)
\ No newline at end of file
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/angles.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/backpacktf.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/chatlog.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/chatstack.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/conditions.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/crits.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/entitycache.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/entityhitboxcache.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/entry.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/fidgetspinner.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/globals.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hack.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/headshake.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/helpers.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hitrate.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hooks.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/hoovy.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/https_request.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/init.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/interfaces.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ipc.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/itemtypes.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/localplayer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/logging.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/netmessage.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/netvars.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/playerlist.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/playerresource.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/prediction.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/profiler.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/projlogging.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sconvars.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sharedobj.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/targethelper.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/textfile.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/textmode.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/tfmm.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/trace.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ucccccp_cmds.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/velocity.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp")
+
+add_subdirectory(classinfo)
+add_subdirectory(copypasted)
+add_subdirectory(hacks)
+add_subdirectory(hooks)
+add_subdirectory(menu)
+add_subdirectory(reclasses)
+add_subdirectory(sdk)
+add_subdirectory(visual)
\ No newline at end of file
diff --git a/src/classinfo/CMakeLists.txt b/src/classinfo/CMakeLists.txt
new file mode 100644
index 00000000..5d82ad42
--- /dev/null
+++ b/src/classinfo/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/classinfo.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/dump.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/dynamic.gen.cpp")
\ No newline at end of file
diff --git a/src/copypasted/CMakeLists.txt b/src/copypasted/CMakeLists.txt
new file mode 100644
index 00000000..101f70e8
--- /dev/null
+++ b/src/copypasted/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CSignature.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Netvar.cpp")
\ No newline at end of file
diff --git a/src/gui/GUI.cpp b/src/gui/GUI.cpp
deleted file mode 100755
index 19c5eb1d..00000000
--- a/src/gui/GUI.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * GUI.cpp
- *
- *  Created on: Nov 17, 2017
- *      Author: nullifiedcat
- */
-
-#include "common.hpp"
-
-namespace gui
-{
-
-void init()
-{
-    cmdui::init();
-}
-
-void update()
-{
-    cmdui::update();
-}
-
-void draw()
-{
-    cmdui::draw();
-}
-}
diff --git a/src/gui/cmdui/cmdui.cpp b/src/gui/cmdui/cmdui.cpp
deleted file mode 100755
index d66c58b2..00000000
--- a/src/gui/cmdui/cmdui.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * cmdui.cpp
- *
- *  Created on: Nov 17, 2017
- *      Author: nullifiedcat
- */
-
-#include "common.hpp"
-
-namespace gui
-{
-namespace cmdui
-{
-
-bool active = false;
-
-void init()
-{
-}
-
-void update()
-{
-}
-
-void draw()
-{
-}
-}
-}
diff --git a/src/hacks/CMakeLists.txt b/src/hacks/CMakeLists.txt
new file mode 100644
index 00000000..ab30a10d
--- /dev/null
+++ b/src/hacks/CMakeLists.txt
@@ -0,0 +1,36 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/Achievement.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Aimbot.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Announcer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiAim.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiBackstab.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiCheat.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AntiDisguise.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoBackstab.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoDeadringer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoDetonator.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoEquip.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoHeal.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoJoin.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoReflect.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoSticky.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/AutoTaunt.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Bunnyhop.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CatBot.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ESP.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/FollowBot.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/HealArrows.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/KillSay.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Killstreak.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/LagExploit.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Misc.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Noisemaker.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Radar.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/SkinChanger.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Spam.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/SpyAlert.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Trigger.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/UberSpam.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Walkbot.cpp")
+
+add_subdirectory(ac)
\ No newline at end of file
diff --git a/src/hacks/ac/CMakeLists.txt b/src/hacks/ac/CMakeLists.txt
new file mode 100644
index 00000000..a41b8f5c
--- /dev/null
+++ b/src/hacks/ac/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/aimbot.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/antiaim.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/bhop.cpp")
\ No newline at end of file
diff --git a/src/hooks/CMakeLists.txt b/src/hooks/CMakeLists.txt
new file mode 100644
index 00000000..13adec8b
--- /dev/null
+++ b/src/hooks/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CreateMove.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/nographics.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/others.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Paint.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PaintTraverse.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/sdl.cpp")
\ No newline at end of file
diff --git a/src/hooks/PaintTraverse.cpp b/src/hooks/PaintTraverse.cpp
index 2aad10e3..fd0a17ff 100644
--- a/src/hooks/PaintTraverse.cpp
+++ b/src/hooks/PaintTraverse.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "hack.hpp"
+#include "GUI.h"
 
 CatVar clean_screenshots(CV_SWITCH, "clean_screenshots", "1",
                          "Clean screenshots",
diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp
index df9fb98d..ce7d7df4 100644
--- a/src/hooks/others.cpp
+++ b/src/hooks/others.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "ucccccp/ucccccp.hpp"
+#include "ucccccp.hpp"
 #include "hack.hpp"
 #include "hitrate.hpp"
 #include "chatlog.hpp"
diff --git a/src/hooks/sdl.cpp b/src/hooks/sdl.cpp
index 0afa74d5..092e7ec6 100755
--- a/src/hooks/sdl.cpp
+++ b/src/hooks/sdl.cpp
@@ -10,7 +10,7 @@
 #include "hooks/hookedmethods.hpp"
 #include "hack.hpp"
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <SDL2/SDL_syswm.h>
 #include <SDL2/SDL_events.h>
 #include <GL/glew.h>
diff --git a/src/menu/CBaseWidget.cpp b/src/menu/CBaseWidget.cpp
index 58011cb3..4f3c5505 100755
--- a/src/menu/CBaseWidget.cpp
+++ b/src/menu/CBaseWidget.cpp
@@ -7,6 +7,8 @@
 
 #include "menu/CBaseWidget.h"
 #include "common.hpp"
+#include "GUI.h"
+
 #if TEXTMODE_VAC != 1
 void CBaseWidget::DrawBounds(int x, int y)
 {
diff --git a/src/menu/CMakeLists.txt b/src/menu/CMakeLists.txt
new file mode 100644
index 00000000..f5308e1c
--- /dev/null
+++ b/src/menu/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseContainer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseWidget.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CBaseWindow.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/compatibilitylayer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTextLabel.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/GUI.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/IWidget.cpp")
+
+add_subdirectory(ncc)
\ No newline at end of file
diff --git a/src/menu/CTextLabel.cpp b/src/menu/CTextLabel.cpp
index 6359754e..412a168a 100755
--- a/src/menu/CTextLabel.cpp
+++ b/src/menu/CTextLabel.cpp
@@ -9,6 +9,7 @@
 
 #include "common.hpp"
 #include "sdk.hpp"
+#include "GUI.h"
 
 #if TEXTMODE_VAC != 1
 std::string WordWrap(std::string &in, int max, unsigned long font)
diff --git a/src/menu/ncc/CMakeLists.txt b/src/menu/ncc/CMakeLists.txt
new file mode 100644
index 00000000..13886b3d
--- /dev/null
+++ b/src/menu/ncc/CMakeLists.txt
@@ -0,0 +1,11 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/Item.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemSublist.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemTitle.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ItemVariable.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/List.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Menu.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PlayerList.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/PlayerListEntry.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Root.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/Tooltip.cpp")
\ No newline at end of file
diff --git a/src/menu/ncc/Tooltip.cpp b/src/menu/ncc/Tooltip.cpp
index 7990b801..69d87f4c 100755
--- a/src/menu/ncc/Tooltip.cpp
+++ b/src/menu/ncc/Tooltip.cpp
@@ -8,6 +8,7 @@
 #include "menu/ncc/Tooltip.hpp"
 #include "menu/CTextLabel.h"
 #include "common.hpp"
+#include "GUI.h"
 #if TEXTMODE_VAC != 1
 namespace menu
 {
diff --git a/src/reclasses/CMakeLists.txt b/src/reclasses/CMakeLists.txt
new file mode 100644
index 00000000..23e158b6
--- /dev/null
+++ b/src/reclasses/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/C_MannVsMachineStats.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFGCClientSystem.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFInventoryManager.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFPartyClient.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CTFParty.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/ITFGroupMatchCriteria.cpp")
\ No newline at end of file
diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt
new file mode 100644
index 00000000..0bce3644
--- /dev/null
+++ b/src/sdk/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/checksum_md5.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/convar.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/HUD.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/KeyValues.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/MaterialSystemUtil.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/tier1.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/utlbuffer.cpp")
\ No newline at end of file
diff --git a/src/visual/CMakeLists.txt b/src/visual/CMakeLists.txt
new file mode 100644
index 00000000..7e94a164
--- /dev/null
+++ b/src/visual/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(cathook PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/atlas.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/colors.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawex.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawing.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/drawmgr.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/EffectChams.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/EffectGlow.cpp")
\ No newline at end of file
diff --git a/src/visual/drawex.cpp b/src/visual/drawex.cpp
index d82a326b..3212309b 100755
--- a/src/visual/drawex.cpp
+++ b/src/visual/drawex.cpp
@@ -8,7 +8,7 @@
 #include "common.hpp"
 #include "hack.hpp"
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 #include <GL/glew.h>
 #include <GL/gl.h>