diff --git a/src/sys/include/ubixfs/ubixfs.h b/src/sys/include/ubixfs/ubixfs.h
index b475f6b..76fcc2f 100644
--- a/src/sys/include/ubixfs/ubixfs.h
+++ b/src/sys/include/ubixfs/ubixfs.h
@@ -1,25 +1,31 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project nor the names of its
-contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  $Id$
 
-**************************************************************************************/
+*****************************************************************************************/
 
 #ifndef _UBIXFS_H
 #define _UBIXFS_H
@@ -130,7 +136,7 @@
 
 //Good Functions
 void initUbixFS(struct mountPoints *mp);
-int enableUbixFS();
+int ubixfs_init();
 int readUbixFS(fileDescriptor *fd,char *data,long offset,long size);
 int writeUbixFS(fileDescriptor *fd,char *data,long offset,long size);
 void syncBat(struct mountPoints *mp);
@@ -142,3 +148,8 @@
 void ubixFS_Thread();
 
 #endif
+
+/***
+ $Log$
+ END
+ ***/
diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 8717a70..d9305e9 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -40,11 +40,13 @@
 #include <isa/atkbd.h>
 #include <ubixos/time.h>
 #include <net/net.h>
+#include <isa/ne2k.h>
+#include <devfs/devfs.h>
+#include <ubixfs/ubixfs.h>
 
 typedef int (*intFunctionPTR)();
 
 /*
-  ubixfs_init,
   fdc_init,
 */
 
@@ -61,6 +63,7 @@
   net_init,
   ne2k_init,
   devfs_init,
+  ubixfs_init,
   };
 
 int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR);
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index cb74e8c..8784797 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -40,7 +40,6 @@
 #include <lib/bioscall.h>
 #include <isa/fdc.h>
 #include <isa/mouse.h>
-#include <ubixfs/ubixfs.h>
 #include <pci/pci.h>
 #include <pci/hd.h>
 #include <sde/sde.h
@@ -85,8 +84,7 @@
 
   //smpInit();
   //mouseInit();
-  //pciInit();
-  enableUbixFS();
+  //pciInit();f
   fdcInit();
   //initHardDisk();
 
diff --git a/src/sys/ubixfs/ubixfs.c b/src/sys/ubixfs/ubixfs.c
index d82d71c..efc502c 100644
--- a/src/sys/ubixfs/ubixfs.c
+++ b/src/sys/ubixfs/ubixfs.c
@@ -1,27 +1,27 @@
 /*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
+ Copyright (c) 2002-2004 The UbixOS Project
  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project nor the names of its
-contributors may be used to endorse or promote products derived from this software
-without specific prior written permission.
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  $Id$
 
@@ -41,7 +41,7 @@
 #include <lib/kprintf.h>
 #include <vmm/paging.h>
 
-int enableUbixFS() {
+int ubixfs_init() {
   /* Add UbixFS */
   if (vfsRegisterFS(0,initUbixFS,readUbixFS,writeUbixFS,openFileUbixFS,ubixFSUnlink,ubixFSmkDir,0x0,0x0) != 0x0) {
     kpanic("Unable To Enable UbixFS");
@@ -325,6 +325,9 @@
 
 /***
  $Log$
+ Revision 1.14  2004/06/28 23:12:58  reddawg
+ file format now container:/path/to/file
+
  Revision 1.13  2004/06/28 18:12:44  reddawg
  We need these files