diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml
index 06678a85bb7068..78196a7a74e375 100644
--- a/portal-impl/src/META-INF/portal-model-hints.xml
+++ b/portal-impl/src/META-INF/portal-model-hints.xml
@@ -264,6 +264,202 @@
 		<field name="name" type="String" />
 		<field name="currentId" type="long" />
 	</model>
+	<model name="com.liferay.document.library.kernel.model.DLContent">
+		<field name="contentId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="repositoryId" type="long" />
+		<field name="path" type="String">
+			<hint name="max-length">255</hint>
+		</field>
+		<field name="version" type="String" />
+		<field name="data" type="Blob" />
+		<field name="size" type="long" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileEntry">
+		<field name="uuid" type="String" />
+		<field name="fileEntryId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+		<field name="classNameId" type="long" />
+		<field name="classPK" type="long" />
+		<field name="repositoryId" type="long" />
+		<field name="folderId" type="long" />
+		<field name="treePath" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
+		<field name="name" type="String">
+			<hint name="max-length">255</hint>
+		</field>
+		<field name="fileName" type="String">
+			<hint name="max-length">255</hint>
+		</field>
+		<field name="extension" type="String" />
+		<field name="mimeType" type="String" />
+		<field name="title" type="String">
+			<hint name="max-length">255</hint>
+		</field>
+		<field name="description" type="String">
+			<hint-collection name="TEXTAREA" />
+		</field>
+		<field name="extraSettings" type="String">
+			<hint-collection name="CLOB" />
+		</field>
+		<field name="fileEntryTypeId" type="long" />
+		<field name="version" type="String" />
+		<field name="size" type="long" />
+		<field name="readCount" type="int" />
+		<field name="smallImageId" type="long" />
+		<field name="largeImageId" type="long" />
+		<field name="custom1ImageId" type="long" />
+		<field name="custom2ImageId" type="long" />
+		<field name="manualCheckInRequired" type="boolean" />
+		<field name="lastPublishDate" type="Date" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileEntryMetadata">
+		<field name="uuid" type="String" />
+		<field name="fileEntryMetadataId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="DDMStorageId" type="long" />
+		<field name="DDMStructureId" type="long" />
+		<field name="fileEntryId" type="long" />
+		<field name="fileVersionId" type="long" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileEntryType">
+		<field name="uuid" type="String" />
+		<field name="fileEntryTypeId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+		<field name="fileEntryTypeKey" type="String" />
+		<field name="name" type="String" localized="true">
+			<hint name="max-length">4000</hint>
+			<validator name="required" />
+		</field>
+		<field name="description" type="String" localized="true">
+			<hint-collection name="TEXTAREA" />
+		</field>
+		<field name="lastPublishDate" type="Date" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileRank">
+		<field name="fileRankId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="createDate" type="Date" />
+		<field name="fileEntryId" type="long" />
+		<field name="active" type="boolean" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileShortcut">
+		<field name="uuid" type="String" />
+		<field name="fileShortcutId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+		<field name="repositoryId" type="long" />
+		<field name="folderId" type="long" />
+		<field name="toFileEntryId" type="long" />
+		<field name="treePath" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
+		<field name="active" type="boolean" />
+		<field name="lastPublishDate" type="Date" />
+		<field name="status" type="int" />
+		<field name="statusByUserId" type="long" />
+		<field name="statusByUserName" type="String" />
+		<field name="statusDate" type="Date" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFileVersion">
+		<field name="uuid" type="String" />
+		<field name="fileVersionId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+		<field name="repositoryId" type="long" />
+		<field name="folderId" type="long" />
+		<field name="fileEntryId" type="long" />
+		<field name="treePath" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
+		<field name="fileName" type="String">
+			<hint name="max-length">255</hint>
+		</field>
+		<field name="extension" type="String" />
+		<field name="mimeType" type="String" />
+		<field name="title" type="String">
+			<hint name="max-length">255</hint>
+			<validator name="required" />
+		</field>
+		<field name="description" type="String">
+			<hint-collection name="TEXTAREA" />
+		</field>
+		<field name="changeLog" type="String" />
+		<field name="extraSettings" type="String">
+			<hint-collection name="CLOB" />
+		</field>
+		<field name="fileEntryTypeId" type="long" />
+		<field name="version" type="String" />
+		<field name="size" type="long" />
+		<field name="checksum" type="String" />
+		<field name="lastPublishDate" type="Date" />
+		<field name="status" type="int" />
+		<field name="statusByUserId" type="long" />
+		<field name="statusByUserName" type="String" />
+		<field name="statusDate" type="Date" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLFolder">
+		<field name="uuid" type="String" />
+		<field name="folderId" type="long" />
+		<field name="groupId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+		<field name="repositoryId" type="long" />
+		<field name="mountPoint" type="boolean" />
+		<field name="parentFolderId" type="long" />
+		<field name="treePath" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
+		<field name="name" type="String">
+			<hint name="max-length">255</hint>
+			<validator name="required" />
+		</field>
+		<field name="description" type="String">
+			<hint-collection name="TEXTAREA" />
+		</field>
+		<field name="lastPostDate" type="Date" />
+		<field name="defaultFileEntryTypeId" type="long" />
+		<field name="hidden" type="boolean" />
+		<field name="restrictionType" type="int" />
+		<field name="lastPublishDate" type="Date" />
+		<field name="status" type="int" />
+		<field name="statusByUserId" type="long" />
+		<field name="statusByUserName" type="String" />
+		<field name="statusDate" type="Date" />
+	</model>
+	<model name="com.liferay.document.library.kernel.model.DLSyncEvent">
+		<field name="syncEventId" type="long" />
+		<field name="companyId" type="long" />
+		<field name="modifiedTime" type="long" />
+		<field name="event" type="String" />
+		<field name="type" type="String" />
+		<field name="typePK" type="long" />
+	</model>
 	<model name="com.liferay.expando.kernel.model.ExpandoColumn">
 		<field name="columnId" type="long" />
 		<field name="companyId" type="long" />
@@ -1647,202 +1843,6 @@
 		<field name="classPK" type="long" />
 		<field name="workflowInstanceId" type="long" />
 	</model>
-	<model name="com.liferay.document.library.kernel.model.DLContent">
-		<field name="contentId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="repositoryId" type="long" />
-		<field name="path" type="String">
-			<hint name="max-length">255</hint>
-		</field>
-		<field name="version" type="String" />
-		<field name="data" type="Blob" />
-		<field name="size" type="long" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileEntry">
-		<field name="uuid" type="String" />
-		<field name="fileEntryId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="userName" type="String" />
-		<field name="createDate" type="Date" />
-		<field name="modifiedDate" type="Date" />
-		<field name="classNameId" type="long" />
-		<field name="classPK" type="long" />
-		<field name="repositoryId" type="long" />
-		<field name="folderId" type="long" />
-		<field name="treePath" type="String">
-			<hint name="max-length">4000</hint>
-		</field>
-		<field name="name" type="String">
-			<hint name="max-length">255</hint>
-		</field>
-		<field name="fileName" type="String">
-			<hint name="max-length">255</hint>
-		</field>
-		<field name="extension" type="String" />
-		<field name="mimeType" type="String" />
-		<field name="title" type="String">
-			<hint name="max-length">255</hint>
-		</field>
-		<field name="description" type="String">
-			<hint-collection name="TEXTAREA" />
-		</field>
-		<field name="extraSettings" type="String">
-			<hint-collection name="CLOB" />
-		</field>
-		<field name="fileEntryTypeId" type="long" />
-		<field name="version" type="String" />
-		<field name="size" type="long" />
-		<field name="readCount" type="int" />
-		<field name="smallImageId" type="long" />
-		<field name="largeImageId" type="long" />
-		<field name="custom1ImageId" type="long" />
-		<field name="custom2ImageId" type="long" />
-		<field name="manualCheckInRequired" type="boolean" />
-		<field name="lastPublishDate" type="Date" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileEntryMetadata">
-		<field name="uuid" type="String" />
-		<field name="fileEntryMetadataId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="DDMStorageId" type="long" />
-		<field name="DDMStructureId" type="long" />
-		<field name="fileEntryId" type="long" />
-		<field name="fileVersionId" type="long" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileEntryType">
-		<field name="uuid" type="String" />
-		<field name="fileEntryTypeId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="userName" type="String" />
-		<field name="createDate" type="Date" />
-		<field name="modifiedDate" type="Date" />
-		<field name="fileEntryTypeKey" type="String" />
-		<field name="name" type="String" localized="true">
-			<hint name="max-length">4000</hint>
-			<validator name="required" />
-		</field>
-		<field name="description" type="String" localized="true">
-			<hint-collection name="TEXTAREA" />
-		</field>
-		<field name="lastPublishDate" type="Date" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileRank">
-		<field name="fileRankId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="createDate" type="Date" />
-		<field name="fileEntryId" type="long" />
-		<field name="active" type="boolean" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileShortcut">
-		<field name="uuid" type="String" />
-		<field name="fileShortcutId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="userName" type="String" />
-		<field name="createDate" type="Date" />
-		<field name="modifiedDate" type="Date" />
-		<field name="repositoryId" type="long" />
-		<field name="folderId" type="long" />
-		<field name="toFileEntryId" type="long" />
-		<field name="treePath" type="String">
-			<hint name="max-length">4000</hint>
-		</field>
-		<field name="active" type="boolean" />
-		<field name="lastPublishDate" type="Date" />
-		<field name="status" type="int" />
-		<field name="statusByUserId" type="long" />
-		<field name="statusByUserName" type="String" />
-		<field name="statusDate" type="Date" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFileVersion">
-		<field name="uuid" type="String" />
-		<field name="fileVersionId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="userName" type="String" />
-		<field name="createDate" type="Date" />
-		<field name="modifiedDate" type="Date" />
-		<field name="repositoryId" type="long" />
-		<field name="folderId" type="long" />
-		<field name="fileEntryId" type="long" />
-		<field name="treePath" type="String">
-			<hint name="max-length">4000</hint>
-		</field>
-		<field name="fileName" type="String">
-			<hint name="max-length">255</hint>
-		</field>
-		<field name="extension" type="String" />
-		<field name="mimeType" type="String" />
-		<field name="title" type="String">
-			<hint name="max-length">255</hint>
-			<validator name="required" />
-		</field>
-		<field name="description" type="String">
-			<hint-collection name="TEXTAREA" />
-		</field>
-		<field name="changeLog" type="String" />
-		<field name="extraSettings" type="String">
-			<hint-collection name="CLOB" />
-		</field>
-		<field name="fileEntryTypeId" type="long" />
-		<field name="version" type="String" />
-		<field name="size" type="long" />
-		<field name="checksum" type="String" />
-		<field name="lastPublishDate" type="Date" />
-		<field name="status" type="int" />
-		<field name="statusByUserId" type="long" />
-		<field name="statusByUserName" type="String" />
-		<field name="statusDate" type="Date" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLFolder">
-		<field name="uuid" type="String" />
-		<field name="folderId" type="long" />
-		<field name="groupId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="userId" type="long" />
-		<field name="userName" type="String" />
-		<field name="createDate" type="Date" />
-		<field name="modifiedDate" type="Date" />
-		<field name="repositoryId" type="long" />
-		<field name="mountPoint" type="boolean" />
-		<field name="parentFolderId" type="long" />
-		<field name="treePath" type="String">
-			<hint name="max-length">4000</hint>
-		</field>
-		<field name="name" type="String">
-			<hint name="max-length">255</hint>
-			<validator name="required" />
-		</field>
-		<field name="description" type="String">
-			<hint-collection name="TEXTAREA" />
-		</field>
-		<field name="lastPostDate" type="Date" />
-		<field name="defaultFileEntryTypeId" type="long" />
-		<field name="hidden" type="boolean" />
-		<field name="restrictionType" type="int" />
-		<field name="lastPublishDate" type="Date" />
-		<field name="status" type="int" />
-		<field name="statusByUserId" type="long" />
-		<field name="statusByUserName" type="String" />
-		<field name="statusDate" type="Date" />
-	</model>
-	<model name="com.liferay.document.library.kernel.model.DLSyncEvent">
-		<field name="syncEventId" type="long" />
-		<field name="companyId" type="long" />
-		<field name="modifiedTime" type="long" />
-		<field name="event" type="String" />
-		<field name="type" type="String" />
-		<field name="typePK" type="long" />
-	</model>
 	<model name="com.liferay.ratings.kernel.model.RatingsEntry">
 		<field name="uuid" type="String" />
 		<field name="entryId" type="long" />
diff --git a/portal-impl/src/META-INF/portal-spring.xml b/portal-impl/src/META-INF/portal-spring.xml
index 809397dcda9389..503cc0a68f7d10 100644
--- a/portal-impl/src/META-INF/portal-spring.xml
+++ b/portal-impl/src/META-INF/portal-spring.xml
@@ -42,6 +42,39 @@
 	<bean id="com.liferay.blogs.kernel.service.BlogsStatsUserLocalService" class="com.liferay.portlet.blogs.service.impl.BlogsStatsUserLocalServiceImpl" />
 	<bean id="com.liferay.blogs.kernel.service.persistence.BlogsStatsUserPersistence" class="com.liferay.portlet.blogs.service.persistence.impl.BlogsStatsUserPersistenceImpl" parent="basePersistence" />
 	<bean id="com.liferay.blogs.kernel.service.persistence.BlogsStatsUserFinder" class="com.liferay.portlet.blogs.service.persistence.impl.BlogsStatsUserFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLAppLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLAppService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLAppHelperLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppHelperLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLContentLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLContentLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLContentPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLContentPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileEntryLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileEntryService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryMetadataLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryMetadataPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryMetadataPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryMetadataFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryMetadataFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileEntryTypeService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryTypePersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryTypePersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryTypeFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryTypeFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileRankLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileRankLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileRankPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileRankPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileRankFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileRankFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileShortcutLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileShortcutLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileShortcutService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileShortcutServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileShortcutPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileShortcutPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileVersionLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileVersionLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLFileVersionService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileVersionServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileVersionPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileVersionPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLFolderLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFolderLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLFolderService" class="com.liferay.portlet.documentlibrary.service.impl.DLFolderServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFolderPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFolderPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLFolderFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFolderFinderImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLSyncEventLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLSyncEventLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.persistence.DLSyncEventPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLSyncEventPersistenceImpl" parent="basePersistence" />
+	<bean id="com.liferay.document.library.kernel.service.DLTrashLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLTrashLocalServiceImpl" />
+	<bean id="com.liferay.document.library.kernel.service.DLTrashService" class="com.liferay.portlet.documentlibrary.service.impl.DLTrashServiceImpl" />
 	<bean id="com.liferay.expando.kernel.service.ExpandoColumnLocalService" class="com.liferay.portlet.expando.service.impl.ExpandoColumnLocalServiceImpl" />
 	<bean id="com.liferay.expando.kernel.service.ExpandoColumnService" class="com.liferay.portlet.expando.service.impl.ExpandoColumnServiceImpl" />
 	<bean id="com.liferay.expando.kernel.service.persistence.ExpandoColumnPersistence" class="com.liferay.portlet.expando.service.persistence.impl.ExpandoColumnPersistenceImpl" parent="basePersistence" />
@@ -268,39 +301,6 @@
 	<bean id="com.liferay.portal.service.persistence.WorkflowDefinitionLinkPersistence" class="com.liferay.portal.service.persistence.impl.WorkflowDefinitionLinkPersistenceImpl" parent="basePersistence" />
 	<bean id="com.liferay.portal.service.WorkflowInstanceLinkLocalService" class="com.liferay.portal.service.impl.WorkflowInstanceLinkLocalServiceImpl" />
 	<bean id="com.liferay.portal.service.persistence.WorkflowInstanceLinkPersistence" class="com.liferay.portal.service.persistence.impl.WorkflowInstanceLinkPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLAppLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLAppService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLAppHelperLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLAppHelperLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLContentLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLContentLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLContentPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLContentPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileEntryLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileEntryService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileEntryMetadataLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryMetadataLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryMetadataPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryMetadataPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryMetadataFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryMetadataFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileEntryTypeLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileEntryTypeService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryTypePersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryTypePersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileEntryTypeFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileEntryTypeFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileRankLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileRankLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileRankPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileRankPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileRankFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileRankFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileShortcutLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileShortcutLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileShortcutService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileShortcutServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileShortcutPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileShortcutPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileVersionLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileVersionLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLFileVersionService" class="com.liferay.portlet.documentlibrary.service.impl.DLFileVersionServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFileVersionPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFileVersionPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLFolderLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLFolderLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLFolderService" class="com.liferay.portlet.documentlibrary.service.impl.DLFolderServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFolderPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFolderPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLFolderFinder" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLFolderFinderImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLSyncEventLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLSyncEventLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.persistence.DLSyncEventPersistence" class="com.liferay.portlet.documentlibrary.service.persistence.impl.DLSyncEventPersistenceImpl" parent="basePersistence" />
-	<bean id="com.liferay.document.library.kernel.service.DLTrashLocalService" class="com.liferay.portlet.documentlibrary.service.impl.DLTrashLocalServiceImpl" />
-	<bean id="com.liferay.document.library.kernel.service.DLTrashService" class="com.liferay.portlet.documentlibrary.service.impl.DLTrashServiceImpl" />
 	<bean id="com.liferay.ratings.kernel.service.RatingsEntryLocalService" class="com.liferay.portlet.ratings.service.impl.RatingsEntryLocalServiceImpl" />
 	<bean id="com.liferay.ratings.kernel.service.RatingsEntryService" class="com.liferay.portlet.ratings.service.impl.RatingsEntryServiceImpl" />
 	<bean id="com.liferay.ratings.kernel.service.persistence.RatingsEntryPersistence" class="com.liferay.portlet.ratings.service.persistence.impl.RatingsEntryPersistenceImpl" parent="basePersistence" />