-targets = blerg.a blergtool tag_test
-blerg_a_objects = database.o tags.o
-blergtool_objects = blergtool.o blerg.a
-
-tag_test_objects = tag_test.o tags.o
+targets = blerg.a blergtool http_blerg
+blerg_a_objects = database/database.o database/tags.o
+blergtool_objects = tools/blergtool.o blerg.a
+http_blerg_objects = http/http_blerg.o http/canned_responses.o misc/auth.o blerg.a