diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 4ba39238..cd3ca06d 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt
index b29eb4a1..9564e99d 100644
--- a/INC/LIBGUI.I.txt
+++ b/INC/LIBGUI.I.txt
@@ -154,6 +154,6 @@ S.TEXT.TEXT		.EQ S.OBJ+8
 *				...
 *--------------------------------------
 MAN
-SAVE INC/LIBGUI.I
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE inc/libgui.i
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.G.BM.txt b/LIB/LIBGUI.G.BM.txt
index 383d3ff8..25b5ed9a 100644
--- a/LIB/LIBGUI.G.BM.txt
+++ b/LIB/LIBGUI.G.BM.txt
@@ -15,6 +15,6 @@ BM.Apple		.DA #S.BM.F.BBP4
 				.HS 1FF1				Dark blue (4)
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.G.BM
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.g.bm
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.G.CUR.txt b/LIB/LIBGUI.G.CUR.txt
index db38f05a..fc497629 100644
--- a/LIB/LIBGUI.G.CUR.txt
+++ b/LIB/LIBGUI.G.CUR.txt
@@ -384,6 +384,6 @@ CUR.Wait6.MASK	.DA %11111111.00111111
 				.DA %11111100.11111111
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.G.CUR
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.g.cur
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.G.FON.txt b/LIB/LIBGUI.G.FON.txt
index 1e15a909..03abe31c 100644
--- a/LIB/LIBGUI.G.FON.txt
+++ b/LIB/LIBGUI.G.FON.txt
@@ -6,6 +6,6 @@ hSYSFONB		.BS 1
 SYSFON.H		.BS 1
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.G.FON
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.g.fon
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.G.WND.txt b/LIB/LIBGUI.G.WND.txt
index 792def0b..0135c7e4 100644
--- a/LIB/LIBGUI.G.WND.txt
+++ b/LIB/LIBGUI.G.WND.txt
@@ -6,6 +6,6 @@ WND.Stack.Top	.BS 1
 WND.Stack		.BS WND.MAX
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.G.WND
-LOAD USR/SRC/LIB/LIBGUI.S
-ASM
+SAVE usr/src/lib/libgui.g.wnd
+LOAD usr/src/lib/libgui.s
+asm
diff --git a/LIB/LIBGUI.S.BM.txt b/LIB/LIBGUI.S.BM.txt
index 2198e5fe..eadc7e18 100644
--- a/LIB/LIBGUI.S.BM.txt
+++ b/LIB/LIBGUI.S.BM.txt
@@ -6,6 +6,6 @@ BM.Get
 *--------------------------------------
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.BM
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.bm
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.BUT.txt b/LIB/LIBGUI.S.BUT.txt
index eda9c871..ad5efc87 100644
--- a/LIB/LIBGUI.S.BUT.txt
+++ b/LIB/LIBGUI.S.BUT.txt
@@ -33,6 +33,6 @@ BUT.Draw
 
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.BUT
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.but
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.CLIP.txt b/LIB/LIBGUI.S.CLIP.txt
index 35e9830e..0b05772d 100644
--- a/LIB/LIBGUI.S.CLIP.txt
+++ b/LIB/LIBGUI.S.CLIP.txt
@@ -272,6 +272,6 @@ CLIP.Line.EncodeY.AX
 .8				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.CLIP
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.clip
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.CUR.txt b/LIB/LIBGUI.S.CUR.txt
index e5690721..2a26cc47 100644
--- a/LIB/LIBGUI.S.CUR.txt
+++ b/LIB/LIBGUI.S.CUR.txt
@@ -101,6 +101,6 @@ DrawCursor.I	>LDYA L.SCR
 .9				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.CUR
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.cur
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt
index 538d8a1b..e4619f03 100644
--- a/LIB/LIBGUI.S.DRAW.txt
+++ b/LIB/LIBGUI.S.DRAW.txt
@@ -28,8 +28,8 @@ Draw			>PULLW ZPCBPtr			Get CB
 				inc ZPCBPtr+1
 				bra .1
 .8				clc
-				.9
-				rts
+.9				rts
+
 Draw.Jmp		jmp (J.Cmds-S.CB.CMD.DRAWLINE,x)
 *--------------------------------------
 * In: Control Block in CB.Cache
@@ -274,6 +274,6 @@ DrawText		>LDYA L.CB.Cache
 *--------------------------------------
 
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.DRAW
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.draw
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.EVT.txt b/LIB/LIBGUI.S.EVT.txt
index b5efc89b..8d167081 100644
--- a/LIB/LIBGUI.S.EVT.txt
+++ b/LIB/LIBGUI.S.EVT.txt
@@ -4,6 +4,6 @@ NEW
 EVT.Get			
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.EVT
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.evt
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.FON.txt b/LIB/LIBGUI.S.FON.txt
index 751a6e19..24111b46 100644
--- a/LIB/LIBGUI.S.FON.txt
+++ b/LIB/LIBGUI.S.FON.txt
@@ -27,6 +27,6 @@ FON.Init		>PUSHWZ				Aux type
 
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.FON
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.fon
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt
index 5554c92a..24ffe2b8 100644
--- a/LIB/LIBGUI.S.MENU.txt
+++ b/LIB/LIBGUI.S.MENU.txt
@@ -60,6 +60,6 @@ MENU.MenuEditor	.AZ "File"
 				.DA #0
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.MENU
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.menu
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt
index 00acf85a..dc5f90f6 100644
--- a/LIB/LIBGUI.S.MOU.txt
+++ b/LIB/LIBGUI.S.MOU.txt
@@ -74,6 +74,6 @@ MOU.ReadMouse	lda A2osX.ASCREEN		GUI screen active ?
 				>RET 2					Discard PTR
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.MOU
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.mou
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.PAT.txt b/LIB/LIBGUI.S.PAT.txt
index 4817e562..bf6b0c66 100644
--- a/LIB/LIBGUI.S.PAT.txt
+++ b/LIB/LIBGUI.S.PAT.txt
@@ -38,6 +38,6 @@ GetCPattern		tax
 				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.PAT
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.pat
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt
index 4709190b..de01c0fa 100644
--- a/LIB/LIBGUI.S.WND.txt
+++ b/LIB/LIBGUI.S.WND.txt
@@ -82,6 +82,6 @@ WND.Close		clc
 				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S.WND
-LOAD USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s.wnd
+LOAD usr/src/lib/libgui.s
 ASM
diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt
index 2daa43ff..5ec1363d 100644
--- a/LIB/LIBGUI.S.txt
+++ b/LIB/LIBGUI.S.txt
@@ -5,11 +5,11 @@ NEW
 				.OR	$2000
 				.TF lib/libgui
 *--------------------------------------
-				.INB INC/MACROS.I
-				.INB INC/A2OSX.I
-				.INB INC/KERNEL.I
-				.INB INC/GFX.I
-				.INB INC/LIBGUI.I
+				.INB inc/macros.i
+				.INB inc/a2osx.i
+				.INB inc/kernel.i
+				.INB inc/gfx.i
+				.INB inc/libgui.i
 *--------------------------------------
 WND.MAX			.EQ 64
 *--------------------------------------
@@ -217,29 +217,29 @@ GFXWrite.YA		>PUSHYA
 				>SYSCALL2 IOCTL
 				rts
 *--------------------------------------
-				.INB USR/SRC/LIB/LIBGUI.S.BM
-				.INB USR/SRC/LIB/LIBGUI.S.BUT
-				.INB USR/SRC/LIB/LIBGUI.S.CLIP
-				.INB USR/SRC/LIB/LIBGUI.S.CUR
-				.INB USR/SRC/LIB/LIBGUI.S.DRAW
-				.INB USR/SRC/LIB/LIBGUI.S.FON
-				.INB USR/SRC/LIB/LIBGUI.S.MENU
-				.INB USR/SRC/LIB/LIBGUI.S.MOU
-				.INB USR/SRC/LIB/LIBGUI.S.PAT
-				.INB USR/SRC/LIB/LIBGUI.S.WND
+				.INB usr/src/lib/libgui.s.bm
+				.INB usr/src/lib/libgui.s.but
+				.INB usr/src/lib/libgui.s.clip
+				.INB usr/src/lib/libgui.s.cur
+				.INB usr/src/lib/libgui.s.draw
+				.INB usr/src/lib/libgui.s.fon
+				.INB usr/src/lib/libgui.s.menu
+				.INB usr/src/lib/libgui.s.mou
+				.INB usr/src/lib/libgui.s.pat
+				.INB usr/src/lib/libgui.s.wnd
 *--------------------------------------
 CS.END
 *--------------------------------------
-				.INB USR/SRC/LIB/LIBGUI.G.BM
-				.INB USR/SRC/LIB/LIBGUI.G.CUR
-				.INB USR/SRC/LIB/LIBGUI.G.FON
-				.INB USR/SRC/LIB/LIBGUI.G.WND
+				.INB usr/src/lib/libgui.g.bm
+				.INB usr/src/lib/libgui.g.cur
+				.INB usr/src/lib/libgui.g.fon
+				.INB usr/src/lib/libgui.g.wnd
 *--------------------------------------
-DEVNAME.GFX		.AZ "/DEV/GFX"
-DEVNAME.MOUSE	.AZ "/DEV/MOU1"
+DEVNAME.GFX		.AZ "/dev/gfx"
+DEVNAME.MOUSE	.AZ "/dev/mou1"
 *--------------------------------------
-SYSX7			.AZ "/A2OSX.BUILD/SBIN/GUI/SYSX7"
-SYSX7B			.AZ "/A2OSX.BUILD/SBIN/GUI/SYSX7B"
+SYSX7			.AZ "/A2OSX.BUILD/sbin/sysx7"
+SYSX7B			.AZ "/A2OSX.BUILD/sbin/sysx7b"
 *--------------------------------------
 LibCount		.BS 1
 hDevMouse		.BS 1
@@ -303,5 +303,5 @@ BUT.Sys			.DA #S.OBJ.T.BUT
 MENU.Sys
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBGUI.S
+SAVE usr/src/lib/libgui.s
 ASM
diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt
index 0fa647ee..825ae239 100644
--- a/SBIN/GUI.S.txt
+++ b/SBIN/GUI.S.txt
@@ -4,12 +4,12 @@ AUTO 4,1
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF SBIN/GUI/GUI
+				.TF sbin/gui
 *--------------------------------------
-				.INB INC/IO.I
-				.INB INC/MACROS.I
-				.INB INC/A2OSX.I
-				.INB INC/LIBGUI.I
+				.INB inc/io.i
+				.INB inc/macros.i
+				.INB inc/a2osx.i
+				.INB inc/libgui.i
 *--------------------------------------
 * Zero Page Segment, up to 32 bytes
 *--------------------------------------
@@ -110,7 +110,7 @@ Destop.Paint	>LIBCALL hLIBGUI,LIBGUI.HideCursor
 				rts
 *--------------------------------------
 CS.END
-LIBGUI			.AZ "LIBGUI"
+LIBGUI			.AZ "libgui"
 hLIBGUI			.BS 1
 *--------------------------------------
 MouseData		.BS S.MOUSE
@@ -122,5 +122,5 @@ CUR.T			.BS 1
 DS.END
 				.ED
 MAN
-SAVE USR/SRC/SBIN/GUI.S
+SAVE usr/src/sbin/gui.s
 ASM
