diff --git a/03d1-datagrid/DataGridExample.mxml b/03d1-datagrid/DataGridExample.mxml
index e69a051..a2edcdf 100644
--- a/03d1-datagrid/DataGridExample.mxml
+++ b/03d1-datagrid/DataGridExample.mxml
@@ -13,7 +13,7 @@
             import mx.rpc.events.FaultEvent;
             import mx.controls.Alert;
 
-            import RequestParams;
+            import com.ag.RequestParams;
 
             [Bindable]
             private var photoFeed:ArrayCollection;
diff --git a/Makefile b/Makefile
index c28c014..8cb8676 100644
--- a/Makefile
+++ b/Makefile
@@ -16,21 +16,20 @@ SWFS = $(patsubst %.mxml,%.swf,$(wildcard [0-9]*-*/*.mxml))
 
 
 # define all target swc paths (same as with swf paths above)
-SWCS = $(patsubst %.as,%.swc,$(wildcard comps/*.as))
+SWCS = $(patsubst %.as,%.swc,$(wildcard com/ag/*.as))
 
 
 # define an implicit build rule for any file matching %.swf,
 # using the $< (input) and $@ (output) automatic variables
 %.swf : %.mxml
-	$(MXMLC) $< -warnings -l+=./comps -output $@
+	$(MXMLC) $< -warnings -l+=./com/ag -output $@
 
 
 # define an implicit build rule for any file matching %.swc,
 # using the $< (input) and $@ (output) automatic variables
 # just like with the %.swf implicit rule above
 %.swc : %.as
-	_CLS=$$(echo $< | sed 's@.*/\(.*\)\..*$$@\1@') && \
-	$(COMPC) -sp ./comps -output $@ -include-classes $$_CLS
+	$(COMPC) -sp+=./ -output $@ -include-classes $(subst /,.,$(basename $<))
 
 
 # build all expected swf and swc files
diff --git a/comps/RequestParams.as b/com/ag/RequestParams.as
similarity index 88%
rename from comps/RequestParams.as
rename to com/ag/RequestParams.as
index d6ccb46..ffcd8a8 100644
--- a/comps/RequestParams.as
+++ b/com/ag/RequestParams.as
@@ -1,4 +1,4 @@
-package
+package com.ag
 {
     public class RequestParams
     {