diff --git a/lib/wnaspi32.c b/lib/MSWindows/aspi32.c
similarity index 98%
rename from lib/wnaspi32.c
rename to lib/MSWindows/aspi32.c
index bf5adbaa..6733bf7a 100644
--- a/lib/wnaspi32.c
+++ b/lib/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: wnaspi32.c,v 1.1 2004/02/07 00:38:12 rocky Exp $
+    $Id: aspi32.c,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: wnaspi32.c,v 1.1 2004/02/07 00:38:12 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.1 2004/03/05 12:32:45 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -47,11 +47,11 @@ static const char _rcsid[] = "$Id: wnaspi32.c,v 1.1 2004/02/07 00:38:12 rocky Ex
 #include <fcntl.h>
 
 #include <windows.h>
-#include "_cdio_win32.h"
+#include "win32.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "wnaspi32.h"
+#include "aspi32.h"
 
 /* General ioctl() CD-ROM command function */
 static bool 
diff --git a/lib/wnaspi32.h b/lib/MSWindows/aspi32.h
similarity index 98%
rename from lib/wnaspi32.h
rename to lib/MSWindows/aspi32.h
index d0b6f970..b1b85bd9 100644
--- a/lib/wnaspi32.h
+++ b/lib/MSWindows/aspi32.h
@@ -1,6 +1,6 @@
 /* Win32 aspi specific */
 /*
-    $Id: wnaspi32.h,v 1.2 2004/02/07 00:35:18 rocky Exp $
+    $Id: aspi32.h,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
diff --git a/lib/_cdio_win32.c b/lib/MSWindows/win32.c
similarity index 98%
rename from lib/_cdio_win32.c
rename to lib/MSWindows/win32.c
index e9c27e62..b515285a 100644
--- a/lib/_cdio_win32.c
+++ b/lib/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_win32.c,v 1.28 2004/03/05 04:23:52 rocky Exp $
+    $Id: win32.c,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.28 2004/03/05 04:23:52 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.1 2004/03/05 12:32:45 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -48,11 +48,11 @@ static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.28 2004/03/05 04:23:52 rock
 
 #include <windows.h>
 #include <winioctl.h>
-#include "_cdio_win32.h"
+#include "win32.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "wnaspi32.h"
+#include "aspi32.h"
 
 #define WIN_NT               ( GetVersion() < 0x80000000 )
 
diff --git a/lib/_cdio_win32.h b/lib/MSWindows/win32.h
similarity index 94%
rename from lib/_cdio_win32.h
rename to lib/MSWindows/win32.h
index 8fcdbd6b..3c48707c 100644
--- a/lib/_cdio_win32.h
+++ b/lib/MSWindows/win32.h
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_win32.h,v 1.4 2004/03/05 04:23:52 rocky Exp $
+    $Id: win32.h,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1329dad5..31a88e06 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.26 2004/03/01 02:17:56 rocky Exp $
+#   $Id: Makefile.am,v 1.27 2004/03/05 12:32:45 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -52,33 +52,33 @@ noinst_HEADERS = cdio_assert.h bytesex.h bytesex_asm.h \
 	cdio_private.h ds.h 
 
 libcdio_sources = \
-	_cdio_bincue.c \
 	_cdio_bsdi.c \
 	_cdio_freebsd.c \
 	_cdio_generic.c \
 	_cdio_linux.c \
 	_cdio_osx.c \
-	_cdio_nrg.c \
 	_cdio_stdio.c \
 	_cdio_stdio.h \
 	_cdio_stream.c \
 	_cdio_stream.h \
 	_cdio_sunos.c \
-	_cdio_win32.c \
-	_cdio_win32.h \
 	bytesex.h \
 	bytesex_asm.h \
 	cdio.c \
 	cd_types.c \
 	ds.c \
 	ds.h \
+	image/bincue.c \
+	image/nrg.c \
 	logging.c \
+	MSWindows/aspi32.c \
+	MSWindows/aspi32.h \
+	MSWindows/ioctl.c \
+	MSWindows/win32.c \
+	MSWindows/win32.h \
 	scsi_mmc.h \
 	sector.c \
-	util.c \
-	win32ioctl.c \
-	wnaspi32.c \
-	wnaspi32.h
+	util.c
 
 lib_LTLIBRARIES    = libcdio.la libiso9660.la
 
diff --git a/lib/_cdio_bincue.c b/lib/image/bincue.c
similarity index 96%
rename from lib/_cdio_bincue.c
rename to lib/image/bincue.c
index 087366f9..476e8bcd 100644
--- a/lib/_cdio_bincue.c
+++ b/lib/image/bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_bincue.c,v 1.43 2004/03/05 04:23:52 rocky Exp $
+    $Id: bincue.c,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.43 2004/03/05 04:23:52 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.1 2004/03/05 12:32:45 rocky Exp $";
 
 #include "cdio_assert.h"
 #include "cdio_private.h"
@@ -549,22 +549,13 @@ _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
   _img_private_t *_obj = env;
   int i;
   int retval;
+  unsigned int blocksize = mode1_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
-    if (mode1_form2) {
-      if ( (retval = _cdio_read_mode1_sector (_obj, 
-					      ((char *)data) 
-					      + (M2RAW_SECTOR_SIZE * i),
-					      lsn + i, true)) )
-	return retval;
-    } else {
-      char buf[M2RAW_SECTOR_SIZE] = { 0, };
-      if ( (retval = _cdio_read_mode1_sector (_obj, buf, lsn + i, false)) )
-	return retval;
-      
-      memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i), 
-	      buf, CDIO_CD_FRAMESIZE);
-    }
+    if ( (retval = _cdio_read_mode1_sector (_obj, 
+					    ((char *)data) + (blocksize * i),
+					    lsn + i, mode1_form2)) )
+      return retval;
   }
   return 0;
 }
@@ -613,21 +604,13 @@ _cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
   _img_private_t *_obj = env;
   int i;
   int retval;
+  unsigned int blocksize = mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
-    if (mode2_form2) {
-      if ( (retval = _cdio_read_mode2_sector (_obj, 
-					 ((char *)data) + (M2RAW_SECTOR_SIZE * i),
-					 lsn + i, true)) )
-	return retval;
-    } else {
-      char buf[M2RAW_SECTOR_SIZE] = { 0, };
-      if ( (retval = _cdio_read_mode2_sector (_obj, buf, lsn + i, true)) )
-	return retval;
-      
-      memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i), 
-	      buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
-    }
+    if ( (retval = _cdio_read_mode2_sector (_obj, 
+					    ((char *)data) + (blocksize * i),
+					    lsn + i, mode2_form2)) )
+      return retval;
   }
   return 0;
 }
diff --git a/lib/_cdio_nrg.c b/lib/image/nrg.c
similarity index 99%
rename from lib/_cdio_nrg.c
rename to lib/image/nrg.c
index cdbd4fb5..269b42aa 100644
--- a/lib/_cdio_nrg.c
+++ b/lib/image/nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_nrg.c,v 1.34 2004/02/26 03:57:42 rocky Exp $
+    $Id: nrg.c,v 1.1 2004/03/05 12:32:45 rocky Exp $
 
     Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -48,7 +48,7 @@
 #include "cdio_private.h"
 #include "_cdio_stdio.h"
 
-static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.34 2004/02/26 03:57:42 rocky Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.1 2004/03/05 12:32:45 rocky Exp $";
 
 /* structures used */