3 files changed, 82 insertions, 61 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 3803c03..5640682 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -97,14 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_bufferedio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\_bytesio.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c
 # End Source File
 # Begin Source File
@@ -141,19 +133,39 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_fileio.c
+SOURCE=..\..\Modules\_functoolsmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_functoolsmodule.c
+SOURCE=..\..\Modules\_heapqmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_heapqmodule.c
+SOURCE=..\..\Modules\_io\bytesio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\_io\stringio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\_io\fileio.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\Modules\_io\bufferedio.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\_io\iobase.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_iobase.c
+SOURCE=..\..\Modules\_io\textio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\_io\_iomodule.c
 # End Source File
 # Begin Source File
 
@@ -181,10 +193,6 @@ SOURCE=..\..\Modules\_sre.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_stringio.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\_struct.c
 # End Source File
 # Begin Source File
@@ -193,10 +201,6 @@ SOURCE=..\..\PC\_subprocess.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_textio.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\_threadmodule.c
 # End Source File
 # Begin Source File
@@ -475,10 +479,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\io.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Objects\iterobject.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index a5df0d1..e24e573 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -274,6 +274,32 @@
 	</References>
 	<Files>
 		<Filter
+			Name="_io"
+            Filter="">
+			<File
+				RelativePath="..\..\Modules\_io\fileio.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\_io\bytesio.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\_io\stringio.c">
+			</File>
+			<File
+			    RelativePath="..\..\Modules\_io\bufferedio.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\_io\iobase.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\_io\textio.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\_io\_iomodule.c">
+			</File>
+		</Filter>
+
+		<Filter
 			Name="zlib"
 			Filter="">
 			<File
@@ -362,18 +388,12 @@
 			RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_bytesio.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_codecsmodule.c">
 		</File>
 		<File
 			RelativePath="..\..\Modules\_csv.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_fileio.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_functoolsmodule.c">
 		</File>
 		<File
@@ -398,9 +418,6 @@
 			RelativePath="..\..\Modules\_sre.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_stringio.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_struct.c">
 		</File>
 		<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 76fa47e..88af248 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -986,30 +986,38 @@
 				RelativePath="..\..\Modules\_csv.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\Modules\_fileio.c"
-				>
-			</File>
-                        <File
-                                RelativePath="..\..\Modules\_bytesio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_bufferedio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_iobase.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_textio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\io.c"
-                                >
-                        </File>                        
+			<Filter
+				Name="_io"
+				>
+				<File
+					RelativePath="..\..\Modules\_io\fileio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bytesio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\stringio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bufferedio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\iobase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\textio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\_iomodule.c"
+					>
+				</File>
+			</Filter>
 			<File
 				RelativePath="..\..\Modules\_functoolsmodule.c"
 				>
@@ -1043,10 +1051,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\_stringio.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\_struct.c"
 				>
 			</File>