--- a/Makefile	Mon May 30 22:55:19 2011 -0400
+++ b/Makefile	Tue May 31 23:58:29 2011 -0400
@@ -15,8 +15,8 @@
 
 sarpn_OBJS=src/sarpn.o src/std.o src/string.o src/stack.o src/operations.o src/math.o arch/arch.a
 dynamic_OBJS=src/dynamic.o src/std.o src/string.o src/stack.o arch/arch.a
-testFS_OBJS=src/testFS.o src/std.o src/string.o src/fs.o arch/arch.a
-shell_OBJS=src/shell.o src/std.o src/fs.o src/string.o src/stdio.o src/os/scall.o arch/arch.a
+testFS_OBJS=src/testFS.o src/std.o src/string.o src/os/fs.o arch/arch.a
+shell_OBJS=src/shell.o src/std.o src/os/fs.o src/string.o src/stdio.o src/os/scall.o arch/arch.a
 infLoop_OBJS=src/infLoop.o
 
 ARCH_OBJS=arch/io.o arch/cons.o arch/ebcdic.o arch/fba.o arch/ioint.o \
@@ -101,17 +101,15 @@
 # DO NOT DELETE
 
 src/dynamic.o: include/std.h include/die.h include/string.h include/stack.h
-src/fs.o: include/fs.h include/std.h include/die.h include/error.h
-src/fs.o: include/string.h include/tod.h
 src/operations.o: include/operations.h include/std.h include/die.h
 src/operations.o: include/stack.h include/string.h include/math.h
 src/sarpn.o: include/std.h include/die.h include/string.h
 src/sarpn.o: include/operations.h include/stack.h
 src/shell.o: include/std.h include/die.h include/string.h include/stdio.h
-src/shell.o: include/error.h include/fs.h include/elf.h include/psw.h
+src/shell.o: include/error.h include/os/fs.h include/elf.h include/psw.h
 src/shell.o: include/svc.h include/os/scall.h
 src/stack.o: include/stack.h include/std.h include/die.h
 src/std.o: include/std.h include/die.h include/string.h
 src/stdio.o: include/stdio.h include/std.h include/die.h include/string.h
 src/stdio.o: include/stdarg.h
-src/testFS.o: include/std.h include/die.h include/fs.h include/error.h
+src/testFS.o: include/std.h include/die.h include/os/fs.h include/error.h