diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/__init__.py
index b7d1b011bd..abb3c1979f 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/__init__.py
@@ -21,7 +21,8 @@
 # File auto-generated by PythonFileGenerator
 
 __all__ = [
-            'resp'
+            'resp',
+            'user'
           ]
 
 
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/AuthenticationData.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/AuthenticationData.py
similarity index 100%
rename from pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/AuthenticationData.py
rename to pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/AuthenticationData.py
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py
new file mode 100644
index 0000000000..dabda9b438
--- /dev/null
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/__init__.py
@@ -0,0 +1,27 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+# File auto-generated by PythonFileGenerator
+
+__all__ = [
+            'AuthenticationData'
+          ]
+
+from AuthenticationData import AuthenticationData
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/__init__.py
index 16d8b7b74e..f1f3904268 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/__init__.py
@@ -21,12 +21,10 @@
 # File auto-generated by PythonFileGenerator
 
 __all__ = [
-            'AuthenticationData',
             'User',
             'UserId'
           ]
 
-from AuthenticationData import AuthenticationData
 from User import User
 from UserId import UserId