--- a/Makefile	Mon Oct 04 20:45:32 2010 +0200
+++ b/Makefile	Wed Aug 03 21:58:21 2011 +0200
@@ -1,6 +1,8 @@
 LIBNAME		=	orange
 SRC			=	\
-	_.d \
+	core/io.d \
+	core/string.d \
+	core/_.d \
 	serialization/Events.d \
 	serialization/RegisterWrapper.d \
 	serialization/Serializable.d \
@@ -16,17 +18,20 @@
 	util/Traits.d \
 	util/Use.d \
 	util/_.d \
-	util/io.d \
-	util/string.d \
 	util/collection/Array.d \
+	util/collection/_.d \
 	xml/PhobosXML.d \
 	xml/XMLDocument.d \
-	_.d
+	xml/_.d \
 
 DC			=	dmd
 DCFLAGS		=	-I/usr/include/d -I/usr/local/include/d
 
 
+UNITTEST = test/UnitTester.d \
+	tests/Serializer.d \
+	tests/all.d \
+
 # Everything below this line should be fairly generic (with a few hard-coded things).
 
 OBJ         =   $(addsuffix .o,$(addprefix $(LIBNAME)/,$(basename $(SRC))))
@@ -60,4 +65,4 @@
 
 %.o : %.d
 	@echo Compiling $< . . .
-	@$(DC) -c $(DCFLAGS) $< -of$@ -Hfimport/$(basename $@).di
+	@$(DC) -c $< -of$@ -Hfimport/$(basename $@).di