Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r68d706a717523e9fc110ac8ec85a5b319deb8bf3 -r19c9010eff6be2e29657beed94349a978088650f
--- lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 68d706a717523e9fc110ac8ec85a5b319deb8bf3)
+++ lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 19c9010eff6be2e29657beed94349a978088650f)
@@ -14,19 +14,19 @@
 	<form-beans>
 	
     <form-bean name="PasswordChangeActionForm"
-               type="com.lamsinternational.lams.web.PasswordChangeActionForm" />
+               type="org.lamsfoundation.lams.web.PasswordChangeActionForm" />
     
     <form-bean name="OrganisationActionForm"
-               type="com.lamsinternational.lams.usermanagement.web.OrganisationActionForm" />
+               type="org.lamsfoundation.lams.usermanagement.web.OrganisationActionForm" />
 
     <form-bean name="UserActionForm"
-               type="com.lamsinternational.lams.usermanagement.web.UserActionForm" />
+               type="org.lamsfoundation.lams.usermanagement.web.UserActionForm" />
                
     <form-bean name="UsersAddActionForm"
-               type="com.lamsinternational.lams.usermanagement.web.UsersAddActionForm" />
+               type="org.lamsfoundation.lams.usermanagement.web.UsersAddActionForm" />
 
     <form-bean name="UsersRemoveActionForm"
-               type="com.lamsinternational.lams.usermanagement.web.UsersRemoveActionForm" />
+               type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveActionForm" />
                
 	</form-beans>
 	<!-- ========== Global Exceptions Definitions =================================== -->
@@ -48,7 +48,7 @@
 	<action-mappings>
 
     <action path="/home"
-            type="com.lamsinternational.lams.web.HomeAction"
+            type="org.lamsfoundation.lams.web.HomeAction"
             parameter="method">
       <forward name="admin"
                path=".admin">
@@ -68,7 +68,7 @@
 	</action>
 
     <action path="/admin"
-            type="com.lamsinternational.lams.usermanagement.web.AdminAction"
+            type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
             parameter="method">
       <forward name="admin"
                path=".admin">
@@ -82,13 +82,16 @@
       <forward name="usersadd"
                path=".admin.usersadd">
       </forward>
+      <forward name="usersremove"
+               path=".admin.usersremove">
+      </forward>
       <forward name="error"
                path=".admin.error">
       </forward>
 	</action>
 
     <action path="/organisation"
-            type="com.lamsinternational.lams.usermanagement.web.OrganisationAction"
+            type="org.lamsfoundation.lams.usermanagement.web.OrganisationAction"
             name="OrganisationActionForm"
             scope="session"
             input=".admin.organisation"
@@ -102,24 +105,21 @@
 	</action>
 
     <action path="/user"
-            type="com.lamsinternational.lams.usermanagement.web.UserAction"
+            type="org.lamsfoundation.lams.usermanagement.web.UserAction"
             name="UserActionForm"
             scope="session"
             input=".admin.user"
             validate="true">
       <forward name="admin"
                path=".admin">
       </forward>
-      <forward name="userview"
-               path=".admin.userview">
-      </forward>
       <forward name="error"
                path=".admin.error">
       </forward>
 	</action>
 
     <action path="/usersadd"
-            type="com.lamsinternational.lams.usermanagement.web.UsersAddAction"
+            type="org.lamsfoundation.lams.usermanagement.web.UsersAddAction"
             name="UsersAddActionForm"
             scope="session"
             input=".admin.usersadd"
@@ -136,7 +136,7 @@
 	</action>
 
     <action path="/usersremove"
-            type="com.lamsinternational.lams.usermanagement.web.UsersRemoveAction"
+            type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveAction"
             name="UsersRemoveActionForm"
             scope="session"
             input=".admin.usersremove"
@@ -151,7 +151,7 @@
 
 
     <action path="/passwordChanged"
-            type="com.lamsinternational.lams.web.PasswordChangeAction"
+            type="org.lamsfoundation.lams.web.PasswordChangeAction"
             name="PasswordChangeActionForm"
             scope="session"
             input=".passwordChange"
@@ -175,7 +175,7 @@
 
 	<!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-   <message-resources parameter="com.lamsinternational.lams.application" />
+   <message-resources parameter="org.lamsfoundation.lams.application" />
 
 	<!-- ===================== Plugin Definition  ======================== -->
 	<plug-in className="org.apache.struts.tiles.TilesPlugin">