diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
deleted file mode 100644
index 2201d72..0000000
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * $Id$
- *
- * Edit document field.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.docfieldmanagement
- */
-/**
-* BL information for adding a DocField
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-require_once("../../../../../config/dmsDefaults.php");
-
-KTUtil::extractGPC('fDocFieldDataType', 'fDocFieldHasLookup', 'fDocFieldID', 'fDocFieldIsGeneric', 'fDocFieldName', 'fForStore');
-
-if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
-	require_once("editDocFieldUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
-	require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
-	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-	require_once("$default->fileSystemRoot/presentation/Html.inc");
-	
-	$oPatternCustom = & new PatternCustom();		
-	
-	 if (isset($fForStore)) {
-
-		$oDocField = DocumentField::get($fDocFieldID);
-		$oDocField->setName($fDocFieldName);
-		$oDocField->setDataType($fDocFieldDataType);
-		
-		//check if checkbox checked || hidden value
-		if ($fDocFieldIsGeneric) {
-			$oDocField->setIsGeneric(true);
-		} else {
-			$oDocField->setIsGeneric(false);
-		}
-		//check if checkbox checked
-		if (isset($fDocFieldHasLookup)) {
-			$oDocField->setHasLookup(true);
-		} else {
-			$oDocField->setHasLookup(false);
-		}
-		if ($oDocField->update()) {
-
-			// if we're setting lookup to be true, then prompt for an initial lookup value??
-			if (isset($fDocFieldHasLookup)) {
-				// and there are no metadata values for this lookup
-				if (DocumentField::getLookupCount($fDocFieldID) == 0) {
-					// then redirect to the edit metadata page
-					controllerRedirect("addMetaDataForField", "fDocFieldID=$fDocFieldID");
-					exit;
-				}
-			}
-			// otherwise, go to the list page
-			controllerRedirect("listDocFields", "");
-		} else {
-			// if fail print out fail message
-			$oPatternCustom->setHtml(getEditPageFail());
-		}
-	} else if (isset($fDocFieldID)){	
-		// post back on DocField select from manual edit page	
-		$oPatternCustom->setHtml(getEditPage($fDocFieldID));
-		$sFormAction = $_SERVER["PHP_SELF"] . "?fForStore=1";
-	} else {
-		// if nothing happens...just reload edit page
-		$oPatternCustom->setHtml(getEditPage(null));
-		$sFormAction = $_SERVER["PHP_SELF"];
-	}
-	
-	//render the page
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-	$main->setFormAction($sFormAction);	
-	$main->setCentralPayload($oPatternCustom);
-    $main->setHasRequiredFields(true);
-	$main->render();	
-}
-?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
deleted file mode 100644
index 5ccce71..0000000
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * $Id$
- *
- * Edit document field lookups.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.docfieldmanagement
- */
-
-require_once("../../../../../config/dmsDefaults.php");
-
-KTUtil::extractGPC('fDocFieldID');
-
-if (checkSession()) {
-    require_once("editDocFieldLookupsUI.inc");
-    require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
-    require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-
-    $oPatternCustom = & new PatternCustom();
-
-    if(isset($fDocFieldID)) { 
-        $oDocField = DocumentField::get($fDocFieldID);
-        if ($oDocField->getHasLookup()){
-	        // do a check to see both drop downs selected
-            $oPatternCustom->setHtml(getPage($oDocField));
-        } else {
-            $_SESSION["KTErrorMessage"][] = _("Document Field is not Lookup enabled.");
-            exit(controllerRedirect("listDocFields"));
-        }
-    } else {
-        $_SESSION["KTErrorMessage"][] = _("No document field lookup selected");
-        exit(controllerRedirect("listDocFields"));
-    }
-
-    // render page
-    $main->setCentralPayload($oPatternCustom);
-    $main->render();
-}
-?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
deleted file mode 100644
index 6df781f..0000000
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * $Id$
- *
- * Edit document field lookups UI functions
- *
- * Copyright (c) 2003, 2005 Jam Warehouse http://www.jamwarehouse.com
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.docfieldmanagement
- */
-
-require_once("$default->fileSystemRoot/presentation/Html.inc");
- 
-function getPage($oDocField) {
-    global $default;
-
-    $iDocFieldID = $oDocField->getID();
-    
-    $LookupDisplay .= "<b>" . _("Current Lookups") . "</b><br>\n";	
-	$sQuery = array("SELECT * FROM " . $default->metadata_table .
-				" WHERE document_field_id = ?",
-                array($iDocFieldID));
-
- 	$aColumns = array("name");
-    $aColumnNames = array(_("Lookup name"));
-    $aColumnTypes = array(1);
-    $aDBColumnArray = array("id");
-    $aQueryStringVariableNames = array("fDocFieldLookupID");
-    	    
-    $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
-    $oSearchResults->setEmptyTableMessage("<font color=\"red\">" . _("You must enter at least one value!") . "</font>");   
-	$LookupDisplay .= $oSearchResults->render() ;
-
-	$sFontTag  .= "<font face=\"Arial\" color=\"#0066cc\">";
-	$sTableTag .= "<table width=100% border=0 cellspacing=0>";
-	$sBgColor = "#F5F6EE";
-	
-    $sToRender .= renderHeading(_("Edit Document Field Lookups"));
-	
-    $sToRender .= "<table width=\"600\" border=0>";
-    $sToRender .= "<tr><td width=100%><br><b>" . _("Field Name") . ": &nbsp;</b>" . $oDocField->getName() . "<br><br></td><td>";
-    $sToRender .= "<a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"" . KTHtml::getBackButton() . "\" border = \"0\" /></a>";
-    
-    $sToRender .= "</td></tr>\n";
-    $sToRender .= "</table>";    
-    
-    $sToRender .= "<table width=\"600\" border=0 ><tr><td>";
-    $sToRender .= "<table border=0 >";
-    
-	$sToRender .= "<tr ><td valign=top>" . $LookupDisplay . "</td></tr>\n";
-	$sToRender .= "<tr><td height=130><br></td></tr>\n";
-	$sToRender .= "</table>";    
-	
-	$sToRender .= "</td><td valign=top>\n";
-    
-    $sToRender .= "<table border=0 cellspacing=1>\n";
-    $sToRender .= "<tr><td><b>Options</b></td></tr>";
-    $sToRender .= "<tr><td width=200 bgcolor=$sBgColor>";
-    $sToRender .= "<br><a href=\"$default->rootUrl/control.php?action=addMetaDataForField&fDocFieldID=$iDocFieldID\">&nbsp;&nbsp;" . _("Add Document Field Lookups") . "</a><br><br>";
-    $sToRender .= "</td><td>"; 	
-    $sToRender .= "</td></tr>";
-	
-	$iDocFieldLookupCount = DocumentField::getLookupCount($iDocFieldID);
-	if ($iDocFieldLookupCount > 0) {
-		
-		$sToRender .= "<tr><td width=200 bgcolor=$sBgColor>";
-	    $sToRender .= "<br><a href=\"$default->rootUrl/control.php?action=editMetadataForField&fDocFieldID=$iDocFieldID\">&nbsp;&nbsp;" . _("Edit Document Field Lookups") . "</a><br><br>";
-	    $sToRender .= "</td><td>"; 	
-	    $sToRender .= "</td></tr>";
-	    
-	    $sToRender .= "<tr><td width=200 bgcolor=$sBgColor>";
-	    $sToRender .= "<br><a href=\"$default->rootUrl/control.php?action=removeMetaDataFromField&fDocFieldID=$iDocFieldID\">&nbsp;&nbsp;" . _("Remove Document Field Lookups") . "</a><br><br>";
-	    $sToRender .= "</td><td>";    
-	    $sToRender .= "</td></tr>";
-	}
-    $sToRender .= "</table>\n";
-    
-    $sToRender .= "</td></tr>";
-    $sToRender .= "</table>\n";
-
-    return $sToRender;
-}
-
-?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
deleted file mode 100644
index c55aeff..0000000
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * $Id$
- *
- * Edit document field UI functions.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.docfieldmanagement
- */
-
-// if its the manual edit page..then display normally
-function getEditPage($iDocFieldID) {
-    global $default;
-    $oDocField = null;
-    if (isset($iDocFieldID)) {
-        $oDocField = DocumentField::get($iDocFieldID);
-        $checkBox = $oDocField->isFieldLinkedToType();
-        $aDataTypes =  $oDocField->getAllDataTypes();
-        $currentDataType = $oDocField->getDataType();
-    }
-    
-    $sToRender .= renderHeading(_("Edit Document Field"));
-    $sToRender .= "<table>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr>\n";
-    $sToRender .= "<td>" . _("Document Field Name:") . " </td><td>" . getDocFieldDisplay($oDocField) . "</td>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "<tr>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "<tr>\n";
-    
-    // if a DocField selected...show checkboxes
-    if (isset($iDocFieldID)) {
-        $sToRender .= "</tr>\n";
-        $sToRender .= "<tr>\n";
-        $sToRender .= "<td>" . _("Data Type") . ": </td><td>" . getDataTypesList($aDataTypes, $currentDataType ) . "</td>\n";
-        $sToRender .= "</tr>\n";
-        $sToRender .= "<tr>\n";
-        
-        // allow changing the generic status if the field is not linked to a document type
-        // and if this isn't the category field
-        if ( ($checkBox == false) && $oDocField->getName() != "Category") {
-            $sToRender .= "<td>" . _("Is Generic") . ": </td><td>" . getIsGenericCheckBox($oDocField) . "</td>\n";
-        } else {
-            $sToRender .= "<input type=\"hidden\" name=\"fDocFieldIsGeneric\" value=\"" . $oDocField->getIsGeneric() . "\">\n";
-        }
-        
-        $sToRender .= "</tr>\n";
-        $sToRender .= "<tr>\n";
-        $sToRender .= "<td>" . _("Has MetaData Lookup:") . " </td><td>" . getHasLookupCheckBox($oDocField) . "</td>\n";
-        $sToRender .= "</tr>\n";
-        $sToRender .= "<tr>\n";
-        $sToRender .= "</tr>\n";
-    }
-    
-    
-    $sToRender .= "<tr>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "<td></td>" . getUpdateButton($oDocField);
-    $sToRender .= getCancelButton($oDocField);
-    $sToRender .= "</table>\n";
-    
-    $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
-    $sToRender .= "function validateForm(theForm) {\n";
-    $sToRender .= "\tif (!(validRequired(theForm.fDocFieldName, 'Document Field Name'))) {\n";
-    $sToRender .= "\t\treturn false;\n";
-    $sToRender .= "\t}\n";
-    $sToRender .= "return true;\n}\n";
-    $sToRender .= "//-->\n</script>\n\n";
-    
-    return $sToRender;
-}
-
-// if edition is successful print otu success page
-function getEditPageSuccess() {
-    global $default;
-    
-    $sToRender .= renderHeading(_("Edit Document Field"));
-    $sToRender .= "<b>" . _("Success") . "!</b>\n";
-    $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr><td>" . _("The Document Field was successfully modified") . "</td></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"" . KTHtml::getBackButton() . "\" border = \"0\" /></a></td>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "</table>\n";
-    
-    return $sToRender;
-}
-
-
-// gets the page if edition fails
-function getEditPageFail() {
-    global $default;
-    
-    $sToRender .= renderHeading(_("Edit Document Field"));
-    $sToRender .= "<b>" . strtoupper(_("Failure")) . "!</b>\n";
-    $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr><td>" . _("The Document Field modification Failed!") . "</td></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"" . KTHtml::getBackButton() . "\" border = \"0\" /></a></td>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "</table>\n";
-    
-    return $sToRender;
-}
-
-// show the list box when no DocField selected
-// then shows a text box with the DocField's name
-function getDocFieldDisplay($oDocField) {
-    global $default;
-    if (!isset($oDocField)) {
-        $oPatternListBox = & new PatternListBox($default->document_fields_table, "name", "id", "fDocFieldID");
-        $oPatternListBox->setPostBackOnChange(true);
-        return $oPatternListBox->render();
-    } else {
-        $sToRender .= "<input type=\"hidden\" name=\"fDocFieldID\" value=\"" . $oDocField->iId . "\">\n";
-        if ($oDocField->getName() == "Category") {
-        	$sToRender .= "<input type=\"hidden\" name=\"fDocFieldName\" value=\"" . $oDocField->getName() . "\">\n";
-        	$sToRender .= $oDocField->getName();
-        } else {
-        	$sToRender .= "<input size=\"40\" type=\"text\" name=\"fDocFieldName\" value=\"" . $oDocField->getName() . "\">";
-        }
-		return $sToRender;
-    }
-}
-
-// show Group details on confirm deletion page
-function getDataTypesList($aDataTypes, $sCurrent) {
-    global $default;
-    
-    $sDataype = "<Select Name=\"fDocFieldDataType\">";
-    
-    for ($i=0;$i < count($aDataTypes);$i++) {
-        
-        if($aDataTypes[$i]["name"] == $sCurrent) {
-            $Options .=  "<OPTION value= \"". $aDataTypes[$i]["name"]. "\" SELECTED>". $aDataTypes[$i]["name"] ."</OPTION>\n";
-        } else {
-            // $oDocField= DocField::get($aAllSpecific[$i]["id"]);
-            $Options .=  "<OPTION value= \"". $aDataTypes[$i]["name"] . "\">". $aDataTypes[$i]["name"] ."</OPTION>\n";
-        }
-    }
-    $sDataype .= $Options . "</SELECT>";
-    return $sDataype;
-}
-
-
-// returns the checkbox ticked or unticked
-function getIsGenericCheckBox($oDocField) {
-    if (!isset($oDocField)) {
-        return "";
-    } else {
-        return "<input type=\"checkbox\" name=\"fDocFieldIsGeneric\" " . ($oDocField->getIsGeneric() ? "CHECKED " : " ") . " />";
-    }
-}
-
-// returns the checkbox ticked or unticked
-function getHasLookupCheckBox($oDocField) {
-    if (!isset($oDocField)) {
-        return "";
-    } else {
-        return "<input type=\"checkbox\" name=\"fDocFieldHasLookup\" " . ($oDocField->getHasLookup() ? "CHECKED " : " ") . " />";
-    }
-    
-}
-
-// gets the updatebutton when a DocField is selected
-function getUpdateButton($oDocField) {
-    global $default;
-    if (!isset($oDocField)) {
-        return _("Please select a Document Field:") . " ";
-    } else {
-        return "<td align = right><input type=\"image\" src =\"" . KTHtml::getUpdateButton() . "\" value=\"submit\" border=\"0\"/></td>\n";
-    }
-}
-
-// gets the cancel button when a DocField is selected
-function getCancelButton($oDocField) {
-    global $default;
-    if (!isset($oDocField)) {
-        return "<td align = right><a href=\"$default->rootUrl/control.php?action=docfield\"><img src =\"" . KTHtml::getCancelButton() . "\" value=\"cancel\" border=\"0\"/></a></td>\n";
-    }
-    else {
-        return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"" . KTHtml::getCancelButton() . "\" border=\"0\" /></a></td>\n";
-    }
-}
-?>