diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt
index 7fffb29b..2905e2e0 100644
--- a/cl_dll/CMakeLists.txt
+++ b/cl_dll/CMakeLists.txt
@@ -29,25 +29,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings -DLINUX -D_LINUX -Dstricm
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
 
 set (CLDLL_SOURCES 
-	../dlls/crossbow.cpp 
-	../dlls/crowbar.cpp 
-	../dlls/egon.cpp 
-	../dlls/gauss.cpp 
-	../dlls/handgrenade.cpp 
-	../dlls/hornetgun.cpp 
-	../dlls/mp5.cpp 
-	../dlls/python.cpp 
-	../dlls/rpg.cpp 
-	../dlls/satchel.cpp 
-	../dlls/shotgun.cpp 
-	../dlls/squeakgrenade.cpp 
-	../dlls/tripmine.cpp 
-	../dlls/glock.cpp
-	ev_hldm.cpp 
-	hl/hl_baseentity.cpp
-	hl/hl_events.cpp
-	hl/hl_objects.cpp
-	hl/hl_weapons.cpp
+	dmc/DMC_Teleporters.cpp
+	ev_hldm.cpp
+	../dlls/dmc/quake_gun.cpp
+	../dlls/dmc/quake_weapons_all.cpp
+	quake/quake_baseentity.cpp
+	quake/quake_events.cpp
+	quake/quake_objects.cpp
+	quake/quake_weapons.cpp
 	ammo.cpp
 	ammo_secondary.cpp
 	ammohistory.cpp
@@ -59,7 +48,7 @@ set (CLDLL_SOURCES
 	entity.cpp
 	ev_common.cpp
 	events.cpp
-	flashlight.cpp
+#	flashlight.cpp
 	GameStudioModelRenderer.cpp
 	geiger.cpp
 	health.cpp
@@ -91,7 +80,7 @@ set (CLDLL_SOURCES
 	input_xash3d.cpp
 	scoreboard.cpp
 	MOTD.cpp)
-include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
+include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public dmc ../dlls/dmc )
 
 if(USE_VOICEMGR)
 	#set(CLDLL_SOURCES
diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
index cc0063b4..695b002b 100644
--- a/dlls/CMakeLists.txt
+++ b/dlls/CMakeLists.txt
@@ -29,109 +29,120 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LINUX -DCLIENT_WEAPONS -Dstricmp=strcasec
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
 
 set (SVDLL_SOURCES 
-	agrunt.cpp
-	airtank.cpp
-	aflock.cpp
+	aghl/agarena.cpp
+	aghl/agglobal.cpp
+	aghl/aglms.cpp
+	aghl/agspectator.cpp
+	dmc/quake_gun.cpp
+	dmc/quake_items.cpp
+	dmc/quake_nail.cpp
+	dmc/quake_player.cpp
+	dmc/quake_rocket.cpp
+	dmc/quake_weapons_all.cpp
+	dmc/observer.cpp
+#	agrunt.cpp
+#	airtank.cpp
+#	aflock.cpp
 	animating.cpp
 	animation.cpp
-	apache.cpp
-	barnacle.cpp
-	barney.cpp
-	bigmomma.cpp
-	bloater.cpp
+#	apache.cpp
+#	barnacle.cpp
+#	barney.cpp
+#	bigmomma.cpp
+#	bloater.cpp
 	bmodels.cpp
-	bullsquid.cpp
+#	bullsquid.cpp
 	buttons.cpp
 	cbase.cpp
 	client.cpp
 	combat.cpp
-	controller.cpp
-	crossbow.cpp
-	crowbar.cpp
-	defaultai.cpp
+#	controller.cpp
+#	crossbow.cpp
+#	crowbar.cpp
+#	defaultai.cpp
 	doors.cpp
 	effects.cpp
-	egon.cpp
+#	egon.cpp
 	explode.cpp
-	flyingmonster.cpp
+#	flyingmonster.cpp
 	func_break.cpp
-	func_tank.cpp
+#	func_tank.cpp
 	game.cpp
 	gamerules.cpp
-	gargantua.cpp
-	gauss.cpp
-	genericmonster.cpp
-	ggrenade.cpp
+#	gargantua.cpp
+#	gauss.cpp
+#	genericmonster.cpp
+#	ggrenade.cpp
 	globals.cpp
-	glock.cpp
-	gman.cpp
+#	glock.cpp
+#	gman.cpp
 	h_ai.cpp
-	h_battery.cpp
-	h_cine.cpp
-	h_cycler.cpp
+#	h_battery.cpp
+#	h_cine.cpp
+#	h_cycler.cpp
 	h_export.cpp
-	handgrenade.cpp
-	hassassin.cpp
-	headcrab.cpp
-	healthkit.cpp
-	hgrunt.cpp
-	hornet.cpp
-	hornetgun.cpp
-	houndeye.cpp
-	ichthyosaur.cpp
-	islave.cpp
-	items.cpp
-	leech.cpp
+#	handgrenade.cpp
+#	hassassin.cpp
+#	headcrab.cpp
+#	healthkit.cpp
+#	hgrunt.cpp
+#	hornet.cpp
+#	hornetgun.cpp
+#	houndeye.cpp
+#	ichthyosaur.cpp
+#	islave.cpp
+#	items.cpp
+#	leech.cpp
 	lights.cpp
 	maprules.cpp
-	monstermaker.cpp
-	monsters.cpp
-	monsterstate.cpp
-	mortar.cpp
-	mp5.cpp
+#	monstermaker.cpp
+#	monsters.cpp
+#	monsterstate.cpp
+#	mortar.cpp
+#	mp5.cpp
 	multiplay_gamerules.cpp
-	nihilanth.cpp
+#	nihilanth.cpp
 	nodes.cpp
-	osprey.cpp
+#	osprey.cpp
 	pathcorner.cpp
 	plane.cpp
 	plats.cpp
 	player.cpp
-	python.cpp
-	rat.cpp
-	roach.cpp
-	rpg.cpp
-	satchel.cpp
+#	python.cpp
+#	rat.cpp
+#	roach.cpp
+#	rpg.cpp
+#	satchel.cpp
 	schedule.cpp
-	scientist.cpp
-	scripted.cpp
-	shotgun.cpp
+#	scientist.cpp
+#	scripted.cpp
+#	shotgun.cpp
 	singleplay_gamerules.cpp
 	skill.cpp
 	sound.cpp
-	soundent.cpp
+#	soundent.cpp
 	spectator.cpp
-	squadmonster.cpp
-	squeakgrenade.cpp
+#	squadmonster.cpp
+#	squeakgrenade.cpp
 	subs.cpp
-	talkmonster.cpp
+#	talkmonster.cpp
 	teamplay_gamerules.cpp
-	tempmonster.cpp
-	tentacle.cpp
+#	tempmonster.cpp
+#	tentacle.cpp
 	triggers.cpp
-	tripmine.cpp
-	turret.cpp
+#	tripmine.cpp
+#	turret.cpp
 	util.cpp
 	weapons.cpp
 	world.cpp
-	xen.cpp
-	zombie.cpp
+#	xen.cpp
+#	zombie.cpp
 	../pm_shared/pm_debug.c
 	../pm_shared/pm_math.c
 	../pm_shared/pm_shared.c
 )
 	
-include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
+include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public dmc aghl .. )
 
 if(USE_VOICEMGR)
 	set(SVDLL_SOURCES