diff --git a/uart/Makefile b/nxuart/Makefile
similarity index 97%
rename from uart/Makefile
rename to nxuart/Makefile
index 89d0998..4770518 100644
--- a/uart/Makefile
+++ b/nxuart/Makefile
@@ -1,6 +1,6 @@
 PLOT_BRD = pcbnew --plot=ps_a4 --ps-pads-drill-opt=none --fill-all-zones
 
-NAME = uart
+NAME = nxuart
 
 .PHONY:		all sch brd front back clean
 
diff --git a/uart/bom/Makefile b/nxuart/bom/Makefile
similarity index 100%
rename from uart/bom/Makefile
rename to nxuart/bom/Makefile
diff --git a/uart/bom/dk/Makefile b/nxuart/bom/dk/Makefile
similarity index 100%
rename from uart/bom/dk/Makefile
rename to nxuart/bom/dk/Makefile
diff --git a/uart/bom/dk/digi-key.equ b/nxuart/bom/dk/digi-key.equ
similarity index 100%
rename from uart/bom/dk/digi-key.equ
rename to nxuart/bom/dk/digi-key.equ
diff --git a/uart/bom/dk/dk-db.pl b/nxuart/bom/dk/dk-db.pl
similarity index 100%
rename from uart/bom/dk/dk-db.pl
rename to nxuart/bom/dk/dk-db.pl
diff --git a/uart/bom/uart.equ b/nxuart/bom/uart.equ
similarity index 100%
rename from uart/bom/uart.equ
rename to nxuart/bom/uart.equ
diff --git a/uart/bom/uart.inv b/nxuart/bom/uart.inv
similarity index 100%
rename from uart/bom/uart.inv
rename to nxuart/bom/uart.inv
diff --git a/uart/bom/uart.sub b/nxuart/bom/uart.sub
similarity index 100%
rename from uart/bom/uart.sub
rename to nxuart/bom/uart.sub
diff --git a/nxuart/cam/Makefile b/nxuart/cam/Makefile
new file mode 100644
index 0000000..0b4eaa2
--- /dev/null
+++ b/nxuart/cam/Makefile
@@ -0,0 +1,19 @@
+.PHONY:			all clean
+
+NAME=nxuart
+
+all:			Makefile.mkmk
+
+Makefile.mkmk:		mkmk ../$(NAME).drl ../$(NAME)-PCB_Edges.gbr
+			./mkmk
+
+../$(NAME).drl:		../$(NAME).brd
+			pcbnew --drill `pwd`/../$(NAME).brd
+
+../$(NAME)-PCB_Edges.gbr:	../$(NAME).brd
+			pcbnew --plot=gerber -l PCB_Edges `pwd`/../$(NAME).brd
+
+-include Makefile.mkmk
+
+clean::
+			rm -f Makefile.mkmk
diff --git a/uart/cam/mkmk b/nxuart/cam/mkmk
similarity index 99%
rename from uart/cam/mkmk
rename to nxuart/cam/mkmk
index 3ad788e..2827a4c 100755
--- a/uart/cam/mkmk
+++ b/nxuart/cam/mkmk
@@ -2,7 +2,7 @@
 PATH=$PATH:/home/qi/cae-tools/cameo
 PATH=$PATH:/home/moko/svn.openmoko.org/developers/werner/cncmap/gp2rml
 
-NAME=uart
+NAME=nxuart
 X=2
 Y=0
 
diff --git a/uart/fw/Makefile b/nxuart/fw/Makefile
similarity index 100%
rename from uart/fw/Makefile
rename to nxuart/fw/Makefile
diff --git a/uart/fw/uart.c b/nxuart/fw/uart.c
similarity index 100%
rename from uart/fw/uart.c
rename to nxuart/fw/uart.c
diff --git a/uart/uart.brd b/nxuart/nxuart.brd
similarity index 100%
rename from uart/uart.brd
rename to nxuart/nxuart.brd
diff --git a/uart/uart.cmp b/nxuart/nxuart.cmp
similarity index 100%
rename from uart/uart.cmp
rename to nxuart/nxuart.cmp
diff --git a/uart/uart.pro b/nxuart/nxuart.pro
similarity index 100%
rename from uart/uart.pro
rename to nxuart/nxuart.pro
diff --git a/uart/uart.sch b/nxuart/nxuart.sch
similarity index 100%
rename from uart/uart.sch
rename to nxuart/nxuart.sch
diff --git a/uart/cam/Makefile b/uart/cam/Makefile
deleted file mode 100644
index d414d27..0000000
--- a/uart/cam/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.PHONY:			all clean
-
-NAME=uart
-
-all:			Makefile.mkmk
-
-Makefile.mkmk:		mkmk ../uart.drl ../uart-PCB_Edges.gbr
-			./mkmk
-
-../uart.drl:		../uart.brd
-			pcbnew --drill `pwd`/../uart.brd
-
-../uart-PCB_Edges.gbr:	../uart.brd
-			pcbnew --plot=gerber -l PCB_Edges `pwd`/../uart.brd
-
--include Makefile.mkmk
-
-clean::
-			rm -f Makefile.mkmk