diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
index e87d7754..a770fba9 100644
--- a/Sources/Plasma/CoreLib/CMakeLists.txt
+++ b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -19,6 +19,7 @@ set(CoreLib_SOURCES
     hsCritSect.cpp
     hsExceptionStack.cpp
     hsFastMath.cpp
+    hsFiles.cpp
     hsGeometry3.cpp
     hsMatrix33.cpp
     hsMatrix44.cpp
@@ -34,6 +35,7 @@ set(CoreLib_SOURCES
     hsThread.cpp
     hsWide.cpp
     pcSmallRect.cpp
+    plFileUtils.cpp
     plGeneric.cpp
     plLoadMask.cpp
     plString.cpp
@@ -43,14 +45,15 @@ set(CoreLib_SOURCES
 if(WIN32 AND NOT CYGWIN)
     set(CoreLib_SOURCES ${CoreLib_SOURCES}
         hsThread_Win.cpp
+        hsFiles_Win.cpp
     )
 endif(WIN32 AND NOT CYGWIN)
 if(UNIX)
     set(CoreLib_SOURCES ${CoreLib_SOURCES}
         hsThread_Unix.cpp
+        hsFiles_Unix.cpp
     )
 endif(UNIX)
-    
 
 set(CoreLib_HEADERS
     HeadSpin.h
@@ -62,6 +65,7 @@ set(CoreLib_HEADERS
     hsCritSect.h
     hsExceptions.h
     hsFastMath.h
+    hsFiles.h
     hsGeometry3.h
     hsHashTable.h
     hsMatrix44.h
@@ -79,6 +83,7 @@ set(CoreLib_HEADERS
     hsThread.h
     hsWide.h
     pcSmallRect.h
+    plFileUtils.h
     plGeneric.h
     plLoadMask.h
     plQuality.h
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles.cpp b/Sources/Plasma/CoreLib/hsFiles.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles.cpp
rename to Sources/Plasma/CoreLib/hsFiles.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles.h b/Sources/Plasma/CoreLib/hsFiles.h
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles.h
rename to Sources/Plasma/CoreLib/hsFiles.h
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles_Mac.cpp b/Sources/Plasma/CoreLib/hsFiles_Mac.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles_Mac.cpp
rename to Sources/Plasma/CoreLib/hsFiles_Mac.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles_PS2.cpp b/Sources/Plasma/CoreLib/hsFiles_PS2.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles_PS2.cpp
rename to Sources/Plasma/CoreLib/hsFiles_PS2.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp b/Sources/Plasma/CoreLib/hsFiles_Unix.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp
rename to Sources/Plasma/CoreLib/hsFiles_Unix.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles_Win.cpp b/Sources/Plasma/CoreLib/hsFiles_Win.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/hsFiles_Win.cpp
rename to Sources/Plasma/CoreLib/hsFiles_Win.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp b/Sources/Plasma/CoreLib/plFileUtils.cpp
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp
rename to Sources/Plasma/CoreLib/plFileUtils.cpp
diff --git a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.h b/Sources/Plasma/CoreLib/plFileUtils.h
similarity index 100%
rename from Sources/Plasma/PubUtilLib/plFile/plFileUtils.h
rename to Sources/Plasma/CoreLib/plFileUtils.h
diff --git a/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt
index 46528416..05a735af 100644
--- a/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt
@@ -5,26 +5,16 @@ include_directories("../../PubUtilLib")
 include_directories(${ZLIB_INCLUDE_DIR})
 
 set(plFile_SOURCES
-    hsFiles.cpp
     plBrowseFolder.cpp
     plEncryptedStream.cpp
-    plFileUtils.cpp
     plInitFileReader.cpp
     plSecureStream.cpp
     plStreamSource.cpp
 )
 
-if(WIN32)
-    set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Win.cpp)
-else(WIN32)
-    set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Unix.cpp)
-endif(WIN32)
-
 set(plFile_HEADERS
-    hsFiles.h
     plBrowseFolder.h
     plEncryptedStream.h
-    plFileUtils.h
     plInitFileReader.h
     plSecureStream.h
     plStreamSource.h