diff --git a/Makefile b/Makefile
index 5f79f14..7b9bb41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,8 @@
-.PHONY:		all gen generate sch brd xpdf dsv
+.PHONY:		all dsv
 
 all:
-		@echo "make what ? target: gen sch brd xpdf dsv"
+		@echo "make what ? target: dsv"
 		@exit 1
 
-gen generate:
-		eeschema --plot `pwd`/wpan-atrf.sch
-		# need scripts
-
-sch:
-		eeschema `pwd`/wpan-atrf.sch
-
-brd:
-		pcbnew `pwd`/wpan-atrf.brd
-
-xpdf:
-		xpdf wpan-atrf.pdf
-
 dsv:
 		scripts/dsv setup BOOKSHELF
diff --git a/atrf/Makefile b/atrf/Makefile
new file mode 100644
index 0000000..6583781
--- /dev/null
+++ b/atrf/Makefile
@@ -0,0 +1,18 @@
+.PHONY:		all gen generate sch brd xpdf
+
+all:
+		@echo "make what ? target: gen sch brd xpdf"
+		@exit 1
+
+gen generate:
+		eeschema --plot `pwd`/wpan-atrf.sch
+		# need scripts
+
+sch:
+		eeschema `pwd`/wpan-atrf.sch
+
+brd:
+		pcbnew `pwd`/wpan-atrf.brd
+
+xpdf:
+		xpdf wpan-atrf.pdf
diff --git a/atrf.sch b/atrf/atrf.sch
similarity index 100%
rename from atrf.sch
rename to atrf/atrf.sch
diff --git a/usb.sch b/atrf/usb.sch
similarity index 100%
rename from usb.sch
rename to atrf/usb.sch
diff --git a/wpan-atrf.brd b/atrf/wpan-atrf.brd
similarity index 100%
rename from wpan-atrf.brd
rename to atrf/wpan-atrf.brd
diff --git a/wpan-atrf.cmp b/atrf/wpan-atrf.cmp
similarity index 100%
rename from wpan-atrf.cmp
rename to atrf/wpan-atrf.cmp
diff --git a/wpan-atrf.pro b/atrf/wpan-atrf.pro
similarity index 68%
rename from wpan-atrf.pro
rename to atrf/wpan-atrf.pro
index fac6a89..4241f1e 100644
--- a/wpan-atrf.pro
+++ b/atrf/wpan-atrf.pro
@@ -1,4 +1,4 @@
-update=Fri Aug 20 17:28:04 2010
+update=Sun Aug 22 16:03:40 2010
 last_client=pcbnew
 [eeschema]
 version=1
@@ -39,11 +39,11 @@ ShowSheetReferenceAndTitleBlock=1
 LibName1=power
 LibName2=device
 LibName3=conn
-LibName4=components/at86rf230
-LibName5=components/c8051f326
-LibName6=components/mini_usb_b
-LibName7=components/xtal-4
-LibName8=components/antenna
+LibName4=../components/at86rf230
+LibName5=../components/c8051f326
+LibName6=../components/mini_usb_b
+LibName7=../components/xtal-4
+LibName8=../components/antenna
 [cvpcb]
 version=1
 NetIExt=net
@@ -69,9 +69,9 @@ MSegLar=150
 LastNetListRead=wpan-atrf.net
 [pcbnew/libraries]
 LibDir=
-LibName1=modules/meander
-LibName2=modules/mini-usb
-LibName3=modules/pads
-LibName4=modules/qfn
-LibName5=modules/stdpass
-LibName6=modules/xtal-4
+LibName1=../modules/meander
+LibName2=../modules/mini-usb
+LibName3=../modules/pads
+LibName4=../modules/qfn
+LibName5=../modules/stdpass
+LibName6=../modules/xtal-4
diff --git a/wpan-atrf.sch b/atrf/wpan-atrf.sch
similarity index 100%
rename from wpan-atrf.sch
rename to atrf/wpan-atrf.sch