diff --git a/lib/documentmanagement/documentcontentversion.inc.php b/lib/documentmanagement/documentcontentversion.inc.php
new file mode 100644
index 0000000..c80029a
--- /dev/null
+++ b/lib/documentmanagement/documentcontentversion.inc.php
@@ -0,0 +1,48 @@
+<?php
+
+require_once(KT_LIB_DIR . '/ktentity.inc');
+
+class KTDocumentContentVersion extends KTEntity {
+    var $_bUsePearError = true;
+
+    /** Which document is this content a version of? */
+    var $iDocumentId;
+
+    /** What was the filename of the stored content */
+    var $sFilename;
+
+    /** How big was the stored content */
+    var $iSize;
+
+    /** Which MIME type was this content */
+    var $iMimeId;
+
+    /** User-specified major version for this content */
+    var $iMajorVersion;
+
+    /** User-specified minor version for this content */
+    var $iMinorVersion;
+
+    /** Where in the storage this file can be found */
+    var $sStoragePath;
+
+    var $_aFieldToSelect = array(
+        "iId" => "id",
+
+        // transaction-related
+        "iDocumentId" => 'document_id',
+        "sFilename" => 'filename',
+        "iSize" => 'size',
+        "iMimeId" => 'mime_id',
+        "iMajorVersion" => 'major_version',
+        "iMinorVersion" => 'minor_version',
+        "sStoragePath" => 'storage_path',
+    );
+
+    function KTDocumentContentVersion() {
+    }
+
+    
+}
+
+?>
diff --git a/lib/documentmanagement/documentcore.inc.php b/lib/documentmanagement/documentcore.inc.php
new file mode 100644
index 0000000..947c6dd
--- /dev/null
+++ b/lib/documentmanagement/documentcore.inc.php
@@ -0,0 +1,201 @@
+<?php
+
+require_once(KT_LIB_DIR . '/ktentity.inc');
+
+class KTDocumentCore extends KTEntity {
+    var $_bUsePearError = true;
+
+    /** The original creator of the document */
+    var $iCreatorId;
+
+    /** The creation time of the document */
+    var $dCreated;
+
+    /** The user that last modified the document */
+    var $iModifiedUserId;
+
+    /** The time of the last modification to the document */
+    var $dModified;
+
+    /** The parent folder of the document */
+    var $iFolderId;
+
+    /** List of folder from the root to the document */
+    var $sParentFolderIds;
+
+    /** Fully qualified path of the document */
+    var $sFullPath;
+
+    /** Status of the document (live, deleted, archived, &c.) */
+    var $iStatusId;
+
+    /** Where the document receives its permission information from */
+    var $iPermissionObjectId;
+    /** The fully looked-up permission information for this document */
+    var $iPermissionLookupId;
+    
+    /** The most recent metadata version for the object */
+    var $iMetadataVersionId;
+
+    var $_aFieldToSelect = array(
+        "iId" => "id",
+
+        // transaction-related
+        "iCreatorId" => 'creator_id',
+        "dCreated" => 'created',
+        "iModifiedUserId" => 'modified_user_id',
+        "dModified" => 'modified',
+
+
+        // location-related
+        "iFolderId" => 'folder_id',
+        "sParentFolderIds" => 'parent_folder_ids',
+        "sFullPath" => 'full_path',
+
+        // status
+        "iStatusId" => 'status_id',
+
+        // permission-related
+        "iPermissionObjectId" => 'permission_object_id',
+        "iPermissionLookupId" => 'permission_lookup_id',
+    );
+
+    function KTDocument() {
+    }
+
+    // {{{ getters/setters
+    function getCreatorId() { return $this->iCreatorId; }
+    function setCreatorId($iNewValue) { $this->iCreatorId = $iNewValue; }
+    function getCreatedDateTime() { return $this->dCreated; }
+    function getModifiedUserId() { return $this->iModifiedUserId; }
+    function setModifiedUserId($iNewValue) { $this->iModifiedUserId = $iNewValue; }
+    function getLastModifiedDate() { return $this->dModified; }
+    function setLastModifiedDate($dNewValue) { $this->dModified = $dNewValue; }
+
+    function getFolderId() { return $this->iFolderId; }
+    function setFolderId($iNewValue) { $this->iFolderId = $iNewValue; }
+
+    function getStatusId() { return $this->iStatusId; }
+    function setStatusId($iNewValue) { $this->iStatusId = $iNewValue; }
+
+    function getPermissionObjectId() { return $this->iPermissionObjectId; }
+    function setPermissionObjectId($iNewValue) { $this->iPermissionObjectId = $iNewValue; }
+    function getPermissionLookupId() { return $this->iPermissionLookupId; }
+    function setPermissionLookupId($iNewValue) { $this->iPermissionLookupId = $iNewValue; }
+    // }}}
+
+    // {{{ getParentId
+    /**
+     * Allows documents to be treated like folders in terms of finding
+     * their parent objects.
+     */
+    function getParentId() {
+        return $this->getFolderId();
+    }
+    // }}}
+
+    // {{{ ktentity requirements
+    function _fieldValues () {
+        $this->sFullPath = KTDocument::_generateFolderPath($this->iFolderId);
+        $this->sParentFolderIds = KTDocument::_generateFolderIds($this->iFolderId);
+        return parent::_fieldValues();
+    }
+
+    /**
+     * Recursive function to generate a comma delimited string containing
+     * the parent folder ids
+     *
+     * @return String   comma delimited string containing the parent folder ids
+     */
+    function _generateParentFolderIds($iFolderId) {
+        $sTable = KTUtil::getTableName('folders');
+        if (empty($iFolderId)) {
+            return;
+        }
+
+        $sQuery = sprintf('SELECT parent_id FROM %s WHERE id = ?', $sTable);
+        $aParams = array($iFolderId);
+        $iParentId = DBUtil::getOneResultKey(array($sQuery, $aParams), 'parent_id');
+        return Document::_generateParentFolderIds($iParentId) . ",$iFolderId";
+    }
+
+    /**
+     * Returns a comma delimited string containing the parent folder ids, strips leading /
+     *
+     * @return String   comma delimited string containing the parent folder ids
+     */
+    function _generateFolderIds($iFolderId) {
+        $sFolderIds = Document::_generateParentFolderIds($iFolderId);
+        return substr($sFolderIds, 1, strlen($sFolderIds));
+    }
+
+    /**
+     * Recursively generates forward slash deliminated string giving full path of document
+     * from file system root url
+     */
+    function _generateFullFolderPath($iFolderId) {
+        global $default;
+        //if the folder is not the root folder
+        if (empty($iFolderId)) {
+            return;
+        }
+        $sQuery = sprintf("SELECT name, parent_id FROM %s WHERE Id = ?", $sTable);
+        $aParams = array($iFolderId);
+        $aRow = DBUtil::getOneResult(array($sQuery, $aParams));
+        return Document::_generateFullFolderPath($aRow["parent_id"]) . "/" . $aRow["name"];
+    }
+
+    /**
+     * Returns a forward slash deliminated string giving full path of document, strips leading /
+     */
+    function _generateFolderPath($iFolderId) {
+        global $default;
+        $sPath = Document::_generateFullFolderPath($iFolderId);
+        $sPath = substr($sPath, 1, strlen($sPath));
+        return $sPath;
+    }
+    // }}}
+
+    // {{{ create
+    function create() {
+        if (empty($this->dCreated)) {
+            $this->dCreated = getCurrentDateTime();
+        }
+        if (empty($this->dModified)) {
+            $this->dModified = getCurrentDateTime();
+        }
+        if (empty($this->iModifiedUserId)) {
+            $this->iModifiedUserId = $this->iCreatorId;
+        }
+        $oFolder = Folder::get($this->getFolderId());
+        $this->iPermissionObjectId = $oFolder->getPermissionObjectId();
+        $res = parent::create();
+
+        if ($res === true) {
+            KTPermissionUtil::updatePermissionLookup($this);
+        }
+
+        return $res;
+    }
+    // }}}
+
+    // {{{ update
+    function update($bPathMove = false) {
+        $res = parent::update();
+        if (($res === true) && ($bPathMove === true)) {
+            KTPermissionUtil::updatePermissionLookup($this);
+        }
+        return $res;
+    }
+    // }}}
+
+    // {{{ get
+    function &get($iId) {
+        return KTEntityUtil::get('KTDocument', $iId);
+    }
+    // }}}
+
+
+}
+
+?>
diff --git a/lib/documentmanagement/documentmetadataversion.inc.php b/lib/documentmanagement/documentmetadataversion.inc.php
new file mode 100644
index 0000000..e7bf630
--- /dev/null
+++ b/lib/documentmanagement/documentmetadataversion.inc.php
@@ -0,0 +1,76 @@
+<?php
+
+require_once(KT_LIB_DIR . '/ktentity.inc');
+
+class KTDocumentMetadataVersion extends KTEntity {
+    var $_bUsePearError = true;
+
+    /** Which document we are a version of */
+    var $iDocumentId;
+
+    /** Which metadata version of the document we are describing */
+    var $iMetadataVersion;
+
+    /** Which content was associated with this metadata version */
+    var $iContentVersionId;
+
+    /** The document type of the document during this version */
+    var $iDocumentTypeId;
+
+    /** The name of the document during this version */
+    var $sName;
+
+    /** The description of the document during this version */
+    var $sDescription;
+
+    /** The status of the document during this version */
+    var $iStatusId;
+
+    /** When this version was created */
+    var $dVersionCreated;
+
+    /** Who created this version */
+    var $iVersionCreatorId;
+
+    var $_aFieldToSelect = array(
+        "iId" => "id",
+
+        "iDocumentId" => 'document_id',
+        "iMetadataVersion" => 'metadata_version',
+        "iContentVersionId" => 'content_version_id',
+
+        "iDocumentTypeId" => 'document_type_id',
+
+        "sName" => 'name',
+        "sDescription" => 'description',
+
+        "iStatusId" => 'status_id',
+
+        "dVersionCreated" => 'version_created',
+        "iVersionCreatorId" => 'version_creator_id',
+    );
+
+    function KTDocumentMetadataVersion() {
+    }
+
+    // {{{ getters/setters
+    function getDocumentId() { return $this->iDocumentId; }
+    function setDocumentId($iNewValue) { $this->iDocumentId = $iNewValue; }
+    function getMetadataVersion() { return $this->iMetadataVersion; }
+    function setMetadataVersion($iNewValue) { $this->iMetadataVersion = $iNewValue; }
+    function getDocumentTypeId() { return $this->iDocumentTypeId; }
+    function setDocumentTypeId($iNewValue) { $this->iDocumentTypeId = $iNewValue; }
+    function getName() { return $this->sName; }
+    function setName($sNewValue) { $this->sName = $sNewValue; }
+    function getDescription() { return $this->sDescription; }
+    function setDescription($sNewValue) { $this->sDescription = $sNewValue; }
+    function getStatusId() { return $this->sStatusId; }
+    function setStatusId($iNewValue) { $this->sStatusId = $iNewValue; }
+    function getVersionCreated() { return $this->dVersionCreated; }
+    function setVersionCreated($dNewValue) { $this->dVersionCreated = $dNewValue; }
+    function getVersionCreatorId() { return $this->iVersionCreatorId; }
+    function setVersionCreatorId($iNewValue) { $this->iVersionCreatorId = $iNewValue; }
+    // }}}
+}
+
+?>