diff --git a/.gitignore b/.gitignore
index c96b870526..dce0e2eb6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,9 @@ log.txt
 
 /replay.rep
 
-# dependency DLLs (different for every platform!)
-cg.dll
-cgGL.dll
-glfw.dll
+/*.dll
+*.mdb
+/*.exe
+
+# backup files by various editors
+*~
diff --git a/Makefile b/Makefile
index 0f42751e9b..e6e74413b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,10 @@
 CSC     = gmcs
-
 CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
-
 DEFINE  = DEBUG;TRACE
 
-RESC       = resgen2
-
 default: OpenRa.Game.exe
 
-PROGRAMS	=	fileformats gl game
+PROGRAMS	=	fileformats gl game ra cnc aftermath
 
 COMMON_LIBS	:= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
@@ -31,7 +27,27 @@ game_KIND			:= winexe
 game_LIBS			:= $(COMMON_LIBS) System.Windows.Forms.dll $(fileformats_TARGET) $(gl_TARGET) \
 						thirdparty/Tao/Tao.OpenAl.dll
 game_DEPS			:= $(fileformats_TARGET) $(gl_TARGET)
-game_FLAGS			:= -win32icon:OpenRa.Game/OpenRa.ico -platform:x86
+game_FLAGS			:= -win32icon:OpenRa.Game/OpenRa.ico
+
+ra_SRCS				:=	$(shell find OpenRa.Mods.RA/ -iname '*.cs')
+ra_TARGET			:=	mods/ra/OpenRa.Mods.RA.dll
+ra_KIND				:=	library
+ra_LIBS				:= $(COMMON_LIBS) $(fileformats_TARGET) $(game_TARGET)
+ra_DEPS				:= $(fileformats_TARGET) $(game_TARGET)
+
+cnc_SRCS			:=	$(shell find OpenRa.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			:=	mods/cnc/OpenRa.Mods.Cnc.dll
+cnc_KIND			:=	library
+cnc_LIBS			:= $(COMMON_LIBS) $(fileformats_TARGET) $(game_TARGET)
+cnc_DEPS			:= $(fileformats_TARGET) $(game_TARGET)
+
+aftermath_SRCS		:=	$(shell find OpenRa.Mods.Aftermath/ -iname '*.cs')
+aftermath_TARGET	:=	mods/cnc/OpenRa.Mods.Aftermath.dll
+aftermath_KIND		:=	library
+aftermath_LIBS		:= $(COMMON_LIBS) $(fileformats_TARGET) $(game_TARGET)
+aftermath_DEPS		:= $(fileformats_TARGET) $(game_TARGET)
+
+# -platform:x86
 
 define BUILD_ASSEMBLY
 $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
@@ -46,7 +62,11 @@ endef
 $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 
 .SUFFIXES:
-.PHONY: clean all default
+.PHONY: clean all default mods
 
 clean: 
-	@-rm *.exe *.dll *.mdb
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
+
+mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
+
all: default mods
+
diff --git a/OpenRa.Game/OpenRA.ico b/OpenRa.Game/OpenRa.ico
similarity index 100%
rename from OpenRa.Game/OpenRA.ico
rename to OpenRa.Game/OpenRa.ico