diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp
index d5d967d8..0b37e3a9 100644
--- a/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/Sources/Plasma/Apps/plClient/winmain.cpp
@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <curl/curl.h>
 
 #include "hsStream.h"
+#include "plCmdParser.h"
 #include "plClient.h"
 #include "plClientResMgr/plClientResMgr.h"
 #include "pfCrashHandler/plCrashCli.h"
@@ -66,7 +67,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plProduct.h"
 #include "plNetGameLib/plNetGameLib.h"
 #include "plPhysX/plSimulationMgr.h"
-#include "pnUtils/plCmdParser.h"
 
 #include "res/resource.h"
 
diff --git a/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp b/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp
index a9a53063..40e678d0 100644
--- a/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp
+++ b/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp
@@ -46,9 +46,9 @@ Mead, WA   99021
 #include "plProduct.h"
 #include "hsThread.h"
 #include "hsTimer.h"
+#include "plCmdParser.h"
 
 #include "pnUtils/pnUtils.h"
-#include "pnUtils/plCmdParser.h"
 #include "pnAsyncCore/pnAsyncCore.h"
 #include "plNetGameLib/plNetGameLib.h"
 #include "plStatusLog/plStatusLog.h"
diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
index 8de8b9e2..21abff68 100644
--- a/Sources/Plasma/CoreLib/CMakeLists.txt
+++ b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -28,6 +28,7 @@ set(CoreLib_SOURCES
     hsTemplates.cpp
     hsWide.cpp
     pcSmallRect.cpp
+    plCmdParser.cpp
     plFileSystem.cpp
     plFormat.cpp
     plGeneric.cpp
@@ -74,6 +75,7 @@ set(CoreLib_HEADERS
     hsWide.h
     hsWindows.h
     pcSmallRect.h
+    plCmdParser.h
     plFileSystem.h
     plFormat.h
     plGeneric.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/plCmdParser.cpp b/Sources/Plasma/CoreLib/plCmdParser.cpp
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/plCmdParser.cpp
rename to Sources/Plasma/CoreLib/plCmdParser.cpp
diff --git a/Sources/Plasma/NucleusLib/pnUtils/plCmdParser.h b/Sources/Plasma/CoreLib/plCmdParser.h
similarity index 100%
rename from Sources/Plasma/NucleusLib/pnUtils/plCmdParser.h
rename to Sources/Plasma/CoreLib/plCmdParser.h
diff --git a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
index 349c2e40..80612e1c 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
@@ -15,8 +15,6 @@ set(pnUtils_HEADERS
     pnUtSort.h
     pnUtStr.h
     pnUtTime.h
-
-    plCmdParser.h
 )
 
 set(pnUtils_SOURCES
@@ -26,8 +24,6 @@ set(pnUtils_SOURCES
     pnUtList.cpp
     pnUtStr.cpp
     pnUtTime.cpp
-
-    plCmdParser.cpp
 )
 
 add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_SOURCES})
diff --git a/Sources/Tests/CoreTests/CMakeLists.txt b/Sources/Tests/CoreTests/CMakeLists.txt
index 3f58acdd..c10e7796 100644
--- a/Sources/Tests/CoreTests/CMakeLists.txt
+++ b/Sources/Tests/CoreTests/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(../../Plasma/CoreLib)
 
 SET(CoreLibTest_SOURCES
     test_plString.cpp
+    test_plCmdParser.cpp
     )
 
 add_executable(test_CoreLib ${CoreLibTest_SOURCES})
diff --git a/Sources/Tests/NucleusTests/pnUtilsTest/test_plCmdParser.cpp b/Sources/Tests/CoreTests/test_plCmdParser.cpp
similarity index 99%
rename from Sources/Tests/NucleusTests/pnUtilsTest/test_plCmdParser.cpp
rename to Sources/Tests/CoreTests/test_plCmdParser.cpp
index 85d28cf9..e0df9fc1 100644
--- a/Sources/Tests/NucleusTests/pnUtilsTest/test_plCmdParser.cpp
+++ b/Sources/Tests/CoreTests/test_plCmdParser.cpp
@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include <cstring>
 #include <gtest/gtest.h>
-#include "pnUtils/plCmdParser.h"
+#include "plCmdParser.h"
 
 TEST(plCmdParser, basic_parsing)
 {
diff --git a/Sources/Tests/NucleusTests/CMakeLists.txt b/Sources/Tests/NucleusTests/CMakeLists.txt
index 6abd34a5..56df15ee 100644
--- a/Sources/Tests/NucleusTests/CMakeLists.txt
+++ b/Sources/Tests/NucleusTests/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(pnEncryptionTest)
-add_subdirectory(pnUtilsTest)
diff --git a/Sources/Tests/NucleusTests/pnUtilsTest/CMakeLists.txt b/Sources/Tests/NucleusTests/pnUtilsTest/CMakeLists.txt
deleted file mode 100644
index f96fc670..00000000
--- a/Sources/Tests/NucleusTests/pnUtilsTest/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(${GTEST_INCLUDE_DIR})
-include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-include_directories(../../../Plasma/CoreLib)
-include_directories(../../../Plasma/NucleusLib)
-
-set(pnUtilsTest_SOURCES
-    test_plCmdParser.cpp
-    )
-
-add_executable(test_pnUtils ${pnUtilsTest_SOURCES})
-target_link_libraries(test_pnUtils gtest gtest_main)
-target_link_libraries(test_pnUtils pnUtils)
-
-add_test(NAME test_pnUtils COMMAND test_pnUtils)
-add_dependencies(check test_pnUtils)
-