diff --git a/src/sys/ubixfsv2/fsAbstract.h b/src/sys/ubixfsv2/fsAbstract.h
index 95d2274..e04860f 100644
--- a/src/sys/ubixfsv2/fsAbstract.h
+++ b/src/sys/ubixfsv2/fsAbstract.h
@@ -1,35 +1,39 @@
 #ifndef FSABSTRACT_H
 #define FSABSTRACT_H
 
-class vfs_fsAbstract {
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/types.h>
+
+class vfs_abstract {
  protected:
-  FSAbstract * prev;
-  FSAbstract * next;
+  vfs_abstract * prev;
+  vfs_abstract * next;
   void * dev;
  public: 
   /* File I/O */
-  virtual int  vfs_open(FILE *,int flags,...) = 0;
-  virtual int  vfs_close(FILE *) = 0;
-  virtual int  vfs_read(FILE *,void *,size_t,size_t) = 0;
-  virtual int  vfs_write(FILE *,void *,size_t,size_t) = 0;
+  virtual int     vfs_open(FILE *,int flags,...) = 0;
+  virtual int     vfs_close(FILE *) = 0;
+  virtual size_t  vfs_read(FILE *,void *,size_t,size_t) = 0;
+  virtual size_t  vfs_write(FILE *,void *,size_t,size_t) = 0;
 
   /* Dir I/O */
-  virtual int  vfs_opendir(DIR *,const char *) = 0x0;
-  virtual int  vfs_closedir(DIR *) = 0x0;
-  virtual int  vfs_mkdir(const char *,mode_t) = 0;
-  virtual int  vfs_readdir(DIR *,struct dirent *) = 0;
+  virtual int     vfs_opendir(DIR *,const char *) = 0x0;
+  virtual int     vfs_closedir(DIR *) = 0x0;
+  virtual int     vfs_mkdir(const char *,mode_t) = 0;
+  virtual int     vfs_readdir(DIR *,struct dirent *) = 0;
 
   /* FS Functions */
-  virtual int  vfs_init(void) = 0;
-  virtual int  vfs_format(dev_t *) = 0;
-  virtual int  vfs_stop(void) = 0;
-  virtual int  vfs_sync(void) = 0;
+  virtual int     vfs_init(void) = 0;
+  virtual int     vfs_format(dev_t *) = 0;
+  virtual int     vfs_stop(void) = 0;
+  virtual int     vfs_sync(void) = 0;
 
   /* Misc Functions */
-  virtual int  vfs_unlink(const char *) = 0;
-  virtual int  vfs_rename(const char *,const char *) = 0;
+  virtual int     vfs_unlink(const char *) = 0;
+  virtual int     vfs_rename(const char *,const char *) = 0;
 
-  virtual     ~FSAbstract(void) { };
-}; // FSAbstract
+  virtual     ~vfs_abstract(void) { };
+}; // vfs_FS
 
 #endif // !FSABSTRACT_H
diff --git a/src/sys/ubixfsv2/ubixfs.cpp b/src/sys/ubixfsv2/ubixfs.cpp
index 1c79e78..554a7d4 100644
--- a/src/sys/ubixfsv2/ubixfs.cpp
+++ b/src/sys/ubixfsv2/ubixfs.cpp
@@ -89,29 +89,12 @@
 
 } // UbixFS::getFreeBlock
 
-bool
-UbixFS::format(void) {
+int
+UbixFS::format(dev_t * dev) {
  
-  return true;
+  return 0;
 } // UbixFS::format
 
-bool
-UbixFS::mount(void) {
-  return true;
-
-} // UbixFS::mount
-
-bool
-UbixFS::unmount(void) {
-  return true;
-} // UbixFS::unmount
-
-bool
-UbixFS::verify(void) {
-  return true;
-
-} // UbixFS::verifyFS
-
 UbixFS::~UbixFS(void) {
   delete [] freeBlockList;
   return;
diff --git a/src/sys/ubixfsv2/ubixfs.h b/src/sys/ubixfsv2/ubixfs.h
index a7dae8e..a8c1956 100644
--- a/src/sys/ubixfsv2/ubixfs.h
+++ b/src/sys/ubixfsv2/ubixfs.h
@@ -4,18 +4,15 @@
 #include "superblock.h"
 #include "fsAbstract.h"
 
-class UbixFS : public FSAbstract {
+class UbixFS : public vfs_abstract {
  protected:
   signed char * freeBlockList;
   diskSuperBlock * superBlock;
   int32        getFreeBlock(uInt32);
   int32        getFreeBlock(void);
  public:
-               UbixFS(void);
-  virtual bool format(void);
-  virtual bool mount(void);
-  virtual bool unmount(void);
-  virtual bool verify(void);
+                  UbixFS(void);
+  virtual int format(dev_t *);
   virtual     ~UbixFS(void); 
 }; // UbixFS