diff --git a/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt b/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt
index f22b053c..e416ef88 100644
--- a/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt
+++ b/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt
@@ -12,6 +12,6 @@ set(plFileEncrypt_SOURCES
 )
 
 add_executable(plFileEncrypt ${plFileEncrypt_SOURCES})
-target_link_libraries(plFileEncrypt CoreLib CoreLibExe plFile plUnifiedTime pnProduct plUUID)
+target_link_libraries(plFileEncrypt CoreLib CoreLibExe plFile plUnifiedTime pnUUID pnProduct)
 
 source_group("Source Files" FILES ${plFileEncrypt_SOURCES})
diff --git a/Sources/Plasma/Apps/plFileEncrypt/main.cpp b/Sources/Plasma/Apps/plFileEncrypt/main.cpp
index 37fad98a..731b373b 100644
--- a/Sources/Plasma/Apps/plFileEncrypt/main.cpp
+++ b/Sources/Plasma/Apps/plFileEncrypt/main.cpp
@@ -44,12 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //#include "pnUtils/pnUtils.h"
 #include "pnProduct/pnProduct.h"
 #include "hsUtils.h"
-
-/* Hack so that we can pull in the product info */
-#include "pnFactory/plCreator.h"
-#include "plUUID/plUUID.h"
-REGISTER_CREATABLE( plCreatableUuid);
-
+#include "pnUUID/pnUUIDCreatable.h"
 
 void EncryptFiles(const char* dir, const char* ext, bool encrypt);
 
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
index 5e2f7bf9..f6320204 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
+++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
@@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 
 #include <Python.h>
 #include "pyGlueHelpers.h"
diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt
index 38036bf0..cfee5403 100644
--- a/Sources/Plasma/NucleusLib/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/CMakeLists.txt
@@ -32,3 +32,4 @@ add_subdirectory(pnSimpleNet)
 add_subdirectory(pnTimer)
 add_subdirectory(pnUtils)
 add_subdirectory(pnUtilsExe)
+add_subdirectory(pnUUID)
diff --git a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
index 39a242d4..df20e728 100644
--- a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
+++ b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
@@ -68,5 +68,6 @@ REGISTER_NONCREATABLE( plDispatchBase );
 #include "pnNetCommon/pnNetCommonCreatable.h"
 #include "pnSceneObject/pnSceneObjectCreatable.h"
 #include "pnTimer/pnTimerCreatable.h"
+#include "pnUUID/pnUUIDCreatable.h"
 
 #endif // pnNucleusCreatables_inc
diff --git a/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt
index eab2753f..6dd8d8f9 100644
--- a/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories("../../CoreLib")
 include_directories("../../NucleusLib")
-include_directories("../../PubUtilLib")
 
 set(pnProduct_HEADERS
     Pch.h
@@ -21,5 +20,7 @@ set(pnProduct_PRIVATE
 
 add_library(pnProduct STATIC ${pnProduct_HEADERS} ${pnProduct_PRIVATE})
 
+target_link_libraries(pnProduct pnUUID)
+
 source_group("Header Files" FILES ${pnProduct_HEADERS})
 source_group("Private" FILES ${pnProduct_PRIVATE})
diff --git a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h
index 9a137cfe..a4b282ff 100644
--- a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h
+++ b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h
@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 
 //#include "pnUtils/pnUtils.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 
 #include "pnPrBuildId.h"
 #include "pnPrBranchId.h"
diff --git a/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
new file mode 100644
index 00000000..3a183b2a
--- /dev/null
+++ b/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
@@ -0,0 +1,28 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib")
+
+set(pnUUID_SOURCES
+    pnUUID.cpp
+)
+
+if(WIN32)
+    set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Win32.cpp)
+else(WIN32)
+    set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Unix.cpp)
+endif(WIN32)
+
+set(pnUUID_HEADERS
+    pnUUID.h
+    pnUUIDCreatable.h
+)
+
+add_library(pnUUID STATIC ${pnUUID_SOURCES} ${pnUUID_HEADERS})
+target_link_libraries(pnUUID pnFactory)
+if(WIN32)
+    target_link_libraries(pnUUID pnUtils)
+else(WIN32)
+    target_link_libraries(pnUUID uuid)
+endif(WIN32)
+
+source_group("Source Files" FILES ${pnUUID_SOURCES})
+source_group("Header Files" FILES ${pnUUID_HEADERS})
diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID.cpp b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
similarity index 99%
rename from Sources/Plasma/PubUtilLib/plUUID/plUUID.cpp
rename to Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
index 6dfd79da..cf4291c6 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/plUUID.cpp
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
@@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plUUID.h"
+#include "pnUUID.h"
 #include "hsStream.h"
 
 plUUID::plUUID()
diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
similarity index 98%
rename from Sources/Plasma/PubUtilLib/plUUID/plUUID.h
rename to Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
index bf780949..24828014 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
@@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#ifndef plUUID_h_inc
-#define plUUID_h_inc
+#ifndef pnUUID_h_inc
+#define pnUUID_h_inc
 
 #include "hsTypes.h"
 #include "hsStlUtils.h"
@@ -107,4 +107,4 @@ public:
 };
 
 
-#endif // plUUID_h_inc
+#endif // pnUUID_h_inc
diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUIDCreatable.h b/Sources/Plasma/NucleusLib/pnUUID/pnUUIDCreatable.h
new file mode 100644
index 00000000..0b327aea
--- /dev/null
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUIDCreatable.h
@@ -0,0 +1,54 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==LICENSE==*/
+
+#ifndef pnUUIDCreatable_inc
+#define pnUUIDCreatable_inc
+
+#include "pnFactory/plCreator.h"
+
+
+#include "pnUUID.h"
+
+REGISTER_CREATABLE( plCreatableUuid );
+
+#endif // pnUUIDCreatable_inc
+
diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
similarity index 99%
rename from Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
rename to Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
index cab0fa9b..61856b50 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
@@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plUUID.h"
+#include "pnUUID.h"
 
 #ifdef HS_BUILD_FOR_UNIX
 
diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Win32.cpp b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
similarity index 99%
rename from Sources/Plasma/PubUtilLib/plUUID/plUUID_Win32.cpp
rename to Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
index c7724540..47fcde9e 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Win32.cpp
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
@@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "plUUID.h"
+#include "pnUUID.h"
 
 #ifdef HS_BUILD_FOR_WIN32
 
diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt
index 97fe4c29..1b7a1912 100644
--- a/Sources/Plasma/PubUtilLib/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt
@@ -48,5 +48,4 @@ add_subdirectory(plStreamLogger)
 add_subdirectory(plSurface)
 add_subdirectory(plTransform)
 add_subdirectory(plUnifiedTime)
-add_subdirectory(plUUID)
 add_subdirectory(plVault)
diff --git a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h
index 056066bd..22a6599c 100644
--- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h
+++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h
@@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plAgeDescription/plAgeDescription.h"
 
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 
 //
 // A singleton class which manages loading and unloading ages and operations associated with that
diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h
index 55570026..c33838f3 100644
--- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h
+++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h
@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plLoadAgeMsg_INC
 
 #include "pnMessage/plMessage.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 #include "hsUtils.h"
 
 //
diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
index 53f45510..9e04b5d0 100644
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsConfig.h"
 #include "hsStlUtils.h"
 #include "pnFactory/plCreatable.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 
 class plClientGuid : public plCreatable
 {
diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp
index 0e639056..aebec2f9 100644
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp
@@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "plNetCommon.h"
 #include "hsStlUtils.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 #include <algorithm>
 
 namespace plNetCommon
diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h
index 25ea1014..85e98e86 100644
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h
@@ -55,10 +55,6 @@ REGISTER_CREATABLE( plNetCoreStatsSummary );
 #endif // SERVER
 REGISTER_CREATABLE( plCreatableListHelper );
 
-// HACK: plUUID should have it's own creatable include
-#include "../plUUID/plUUID.h"
-REGISTER_CREATABLE( plCreatableUuid );
-
 #include "plClientGuid.h"
 REGISTER_CREATABLE( plClientGuid );
 #include "plNetServerSessionInfo.h"
diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h
index 23c21675..6a31d56d 100644
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h
@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnFactory/plCreatable.h"
 #include "pnNetCommon/plNetServers.h"
 #include "plNetCommon/plSpawnPointInfo.h"
-#include "plUUID/plUUID.h"
+#include "pnUUID/pnUUID.h"
 
 
 class hsStream;
diff --git a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
deleted file mode 100644
index 53e01fcc..00000000
--- a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-include_directories("../../CoreLib")
-include_directories("../../NucleusLib")
-include_directories("../../PubUtilLib")
-
-set(plUUID_SOURCES
-    plUUID.cpp
-)
-
-if(WIN32)
-    set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp)
-else(WIN32)
-    set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Unix.cpp)
-endif(WIN32)
-
-set(plUUID_HEADERS
-    plUUID.h
-)
-
-add_library(plUUID STATIC ${plUUID_SOURCES} ${plUUID_HEADERS})
-target_link_libraries(plUUID pnFactory)
-if(NOT WIN32)
-    target_link_libraries(plUUID uuid)
-endif(NOT WIN32)
-
-source_group("Source Files" FILES ${plUUID_SOURCES})
-source_group("Header Files" FILES ${plUUID_HEADERS})