diff --git a/src/bin/fdisk/Makefile b/src/bin/fdisk/Makefile
deleted file mode 100644
index 0f7b18c..0000000
--- a/src/bin/fdisk/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-# Application Makefile (C) 2002-2004 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.inc
-include ../Makefile.inc
-
-#Linker
-LD = ld
-
-#Binary File Name
-BINARY = fdisk
-
-#Delete Program
-REMOVE = rm -f
-
-#Objects
-OBJS = main.o
-
-LIBRARIES = ../../lib/libc_old/libc_old.so
-
-# Link The Binary
-$(BINARY) : $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
-	strip $(BINARY)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.s:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
- 
-# Clean Up The junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/bin/fdisk/main.c b/src/bin/fdisk/main.c
deleted file mode 100644
index 4e6d9fc..0000000
--- a/src/bin/fdisk/main.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*****************************************************************************************
- 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:
-
- 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.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/sys.h>
-#include <string.h>
-
-#include "ubixfs.h"
-
-struct dos_partition {
-       unsigned char   dp_flag;        /* bootstrap flags */
-        unsigned char   dp_shd;         /* starting head */
-        unsigned char   dp_ssect;       /* starting sector */
-        unsigned char   dp_scyl;        /* starting cylinder */
-        unsigned char   dp_type;         /* partition type */
-        unsigned char   dp_ehd;         /* end head */
-        unsigned char   dp_esect;       /* end sector */
-        unsigned char   dp_ecyl;        /* end cylinder */
-        uInt32       dp_start;       /* absolute starting sector number */
-        uInt32       dp_size;        /* partition size in sectors */
-};
-
-  
-int main(int argc,char **argv) {
-  FILE *fd;
-  FILE *mbr;
-  struct dos_partition *d = 0x0;
-  char *data = (char *)malloc(512);
-  int i = 0x0;
-  char buf[256];
-
-  d = (struct dos_partition *)(data + 0x1BE);
-
-  printf("Ubix Disk Editor Version 1.0\n");
-  printf("(c) 2004 Ubix Corp        \n\n");
- 
-  if (argc >= 2) {
-    printf("Drive Info (%s):\n",argv[1]);
-    fd = fopen(argv[1],"rb");
-    }
-  else {
-    printf("Drive Info (ad0):\n");
-    fd = fopen("devfs:ad0","rb");
-    }
-  fseek(fd,0,0);
-  fread(data,512,1,fd);
-
-  if (argc >= 3) {
-    i = atoi(argv[2]);
-    if (i == 0) {
-      mbr = fopen("sys:mrb","rb");
-      fseek(mbr,0,0);
-      fread(data,512,1,mbr);
-      printf("Installing Ubix MBR\n");
-      }
-    else {
-      i--;
-      printf("d[%i].dp_type   = %i, ",i,d[i].dp_type);
-      printf("New Value: ");
-      gets((char *)&buf);
-      d[i].dp_type = atoi(buf);
-      printf("d[%i].dp_start: %i, ",i,d[i].dp_start);
-      printf("New Value: ");
-      gets((char *)&buf);
-      d[i].dp_start = atoi(buf);
-      printf("d[%i].dp_size: %i, ",i,d[i].dp_size);
-      printf("New Value: ");
-      gets((char *)&buf);
-      d[i].dp_size = atoi(buf);
-      printf("d[%i].dp_type:  0x%X\n",i,d[i].dp_type);
-      printf("d[%i].dp_start: %i\n",i,d[i].dp_start);
-      printf("d[%i].dp_size:  %i\n",i,d[i].dp_size);
-      }
-    fseek(fd,0,0);
-    fwrite(data,512,1,fd);
-    }
-  else {
-    for (i=0;i<4;i++) {
-      if (d[i].dp_type != 0x0) {
-        printf("d[%i].dp_type: 0x%X\n",i,d[i].dp_type);
-        printf("d[%i].dp_start: %i\n",i,d[i].dp_start);
-        printf("d[%i].dp_size:  %i\n",i,d[i].dp_size);
-        }
-      }
-    }
-
-  fclose(fd);
-
-  return(0);
-  }
-
-/***
- $Log$
- Revision 1.8  2004/06/01 01:30:43  reddawg
- No more warnings and organized make files
-
- Revision 1.7  2004/05/24 13:54:52  reddawg
- Clean Up
-
-
- END
- ***/
diff --git a/src/bin/fdisk/ubixfs.h b/src/bin/fdisk/ubixfs.h
deleted file mode 100644
index 2193a7e..0000000
--- a/src/bin/fdisk/ubixfs.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************************
- 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:
-
- 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.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-#define	DOSPTYP_UBX	 0x2A	/* UbixFS partition type */
-#define UBIXDISKMAGIC    ((uInt32)0x45) /* The disk magic number */
-#define MAXUBIXPARTITIONS 16
-#define UBIXFSMAGIC      ((uInt32)0x69) /* The File System Magic Number */
-
-struct ubixDiskLabel {
-  uInt32 magicNum;
-  uInt32 magicNum2;
-  uInt16 driveType;
-  uInt16 numPartitions;
-  struct  ubixPartitions {             /* the partition table */
-    uInt32 p_size;       /* number of sectors in partition */
-    uInt32 p_offset;     /* starting sector */
-    uInt32 p_fsize;      /* filesystem basic fragment size */
-    uInt32 p_bsize;      /* BAT size */
-    uInt8 p_fstype;      /* filesystem type, see below */
-    uInt8 p_frag;        /* filesystem fragments per block */
-        } partitions[MAXUBIXPARTITIONS];
-  };
-
-//Block Allocation Table Entry
-struct blockAllocationTableEntry {
-  long attributes; //Block Attributes
-  long realSector; //Real Sector  
-  long nextBlock;  //Sector Of Next Block
-  long reserved;   //Reserved
-  };
-
-
-struct directoryEntry {
-  uLong  startCluster;   //Starting Cluster Of File
-  uLong  size;           //Size Of File
-  uLong  creationDate;  //Date Created
-  uLong  lastModified;  //Date Last Modified
-  uLong  uid;           //UID Of Owner
-  uLong  gid;           //GID Of Owner
-  uShort attributes;    //Files Attributes
-  uShort permissions;   //Files Permissions
-  char   fileName[256]; //File Name
-  };
-
-/***
- $Log$
-
- END
- ***/
diff --git a/src/sbin/fdisk/Makefile b/src/sbin/fdisk/Makefile
new file mode 100644
index 0000000..0f7b18c
--- /dev/null
+++ b/src/sbin/fdisk/Makefile
@@ -0,0 +1,45 @@
+# $Id$
+# Application Makefile (C) 2002-2004 The UbixOS Project
+
+# Include Global 'Source' Options
+include ../../Makefile.inc
+include ../Makefile.inc
+
+#Linker
+LD = ld
+
+#Binary File Name
+BINARY = fdisk
+
+#Delete Program
+REMOVE = rm -f
+
+#Objects
+OBJS = main.o
+
+LIBRARIES = ../../lib/libc_old/libc_old.so
+
+# Link The Binary
+$(BINARY) : $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
+	strip $(BINARY)
+
+# Compile the source files
+.cc.o:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+
+.cc.s:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.c.o:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+ 
+.c.s:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.S.o:
+	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
+ 
+# Clean Up The junk
+clean:
+	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/sbin/fdisk/main.c b/src/sbin/fdisk/main.c
new file mode 100644
index 0000000..6a1cbe6
--- /dev/null
+++ b/src/sbin/fdisk/main.c
@@ -0,0 +1,133 @@
+/*****************************************************************************************
+ 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:
+
+ 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.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/sys.h>
+#include <string.h>
+
+#include "ubixfs.h"
+
+struct dos_partition {
+       unsigned char   dp_flag;        /* bootstrap flags */
+        unsigned char   dp_shd;         /* starting head */
+        unsigned char   dp_ssect;       /* starting sector */
+        unsigned char   dp_scyl;        /* starting cylinder */
+        unsigned char   dp_type;         /* partition type */
+        unsigned char   dp_ehd;         /* end head */
+        unsigned char   dp_esect;       /* end sector */
+        unsigned char   dp_ecyl;        /* end cylinder */
+        uInt32       dp_start;       /* absolute starting sector number */
+        uInt32       dp_size;        /* partition size in sectors */
+};
+
+  
+int main(int argc,char **argv) {
+  FILE *fd;
+  FILE *mbr;
+  struct dos_partition *d = 0x0;
+  char *data = (char *)malloc(512);
+  int i = 0x0;
+  char buf[256];
+
+  d = (struct dos_partition *)(data + 0x1BE);
+
+  printf("Ubix Disk Editor Version 1.0\n");
+  printf("(c) 2004 Ubix Corp        \n\n");
+ 
+  if (argc >= 2) {
+    printf("Drive Info (%s):\n",argv[1]);
+    fd = fopen(argv[1],"rb");
+    }
+  else {
+    printf("Drive Info (ad0):\n");
+    fd = fopen("devfs:ad0","rb");
+    }
+  fseek(fd,0,0);
+  fread(data,512,1,fd);
+
+  if (argc >= 3) {
+    i = atoi(argv[2]);
+    if (i == 0) {
+      mbr = fopen("sys:mrb","rb");
+      fseek(mbr,0,0);
+      fread(data,512,1,mbr);
+      printf("Installing Ubix MBR\n");
+      }
+    else {
+      i--;
+      printf("d[%i].dp_type   = %i, ",i,d[i].dp_type);
+      printf("New Value: ");
+      gets((char *)&buf);
+      d[i].dp_type = atoi(buf);
+      printf("d[%i].dp_start: %i, ",i,d[i].dp_start);
+      printf("New Value: ");
+      gets((char *)&buf);
+      d[i].dp_start = atoi(buf);
+      printf("d[%i].dp_size: %i, ",i,d[i].dp_size);
+      printf("New Value: ");
+      gets((char *)&buf);
+      d[i].dp_size = atoi(buf);
+      printf("d[%i].dp_type:  0x%X\n",i,d[i].dp_type);
+      printf("d[%i].dp_start: %i\n",i,d[i].dp_start);
+      printf("d[%i].dp_size:  %i\n",i,d[i].dp_size);
+      }
+    fseek(fd,0,0);
+    fwrite(data,512,1,fd);
+    }
+  else {
+    for (i=0;i<4;i++) {
+      if (d[i].dp_type != 0x0) {
+        printf("d[%i].dp_type: 0x%X\n",i,d[i].dp_type);
+        printf("d[%i].dp_start: %i\n",i,d[i].dp_start);
+        printf("d[%i].dp_size:  %i\n",i,d[i].dp_size);
+        }
+      }
+    }
+
+  fclose(fd);
+
+  return(0);
+  }
+
+/***
+ $Log$
+ Revision 1.9  2004/08/15 00:33:02  reddawg
+ Wow the ide driver works again
+
+ Revision 1.8  2004/06/01 01:30:43  reddawg
+ No more warnings and organized make files
+
+ Revision 1.7  2004/05/24 13:54:52  reddawg
+ Clean Up
+
+
+ END
+ ***/
diff --git a/src/sbin/fdisk/ubixfs.h b/src/sbin/fdisk/ubixfs.h
new file mode 100644
index 0000000..e6554ae
--- /dev/null
+++ b/src/sbin/fdisk/ubixfs.h
@@ -0,0 +1,80 @@
+/*****************************************************************************************
+ 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:
+
+ 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.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <sys/types.h>
+
+#define	DOSPTYP_UBX	 0x2A	/* UbixFS partition type */
+#define UBIXDISKMAGIC    ((uInt32)0x45) /* The disk magic number */
+#define MAXUBIXPARTITIONS 16
+#define UBIXFSMAGIC      ((uInt32)0x69) /* The File System Magic Number */
+
+struct ubixDiskLabel {
+  uInt32 magicNum;
+  uInt32 magicNum2;
+  uInt16 driveType;
+  uInt16 numPartitions;
+  struct  ubixPartitions {             /* the partition table */
+    uInt32 p_size;       /* number of sectors in partition */
+    uInt32 p_offset;     /* starting sector */
+    uInt32 p_fsize;      /* filesystem basic fragment size */
+    uInt32 p_bsize;      /* BAT size */
+    uInt8 p_fstype;      /* filesystem type, see below */
+    uInt8 p_frag;        /* filesystem fragments per block */
+        } partitions[MAXUBIXPARTITIONS];
+  };
+
+//Block Allocation Table Entry
+struct blockAllocationTableEntry {
+  long attributes; //Block Attributes
+  long realSector; //Real Sector  
+  long nextBlock;  //Sector Of Next Block
+  long reserved;   //Reserved
+  };
+
+
+struct directoryEntry {
+  uLong  startCluster;   //Starting Cluster Of File
+  uLong  size;           //Size Of File
+  uLong  creationDate;  //Date Created
+  uLong  lastModified;  //Date Last Modified
+  uLong  uid;           //UID Of Owner
+  uLong  gid;           //GID Of Owner
+  uShort attributes;    //Files Attributes
+  uShort permissions;   //Files Permissions
+  char   fileName[256]; //File Name
+  };
+
+/***
+ $Log$
+ Revision 1.2  2004/05/24 13:54:52  reddawg
+ Clean Up
+
+
+ END
+ ***/