diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISChildrenMethod.java b/source/java/org/alfresco/repo/cmis/rest/CMISChildrenMethod.java
index da77a3447b..ff6c1a5ec4 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISChildrenMethod.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISChildrenMethod.java
@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
 
 import java.util.List;
 
-import org.alfresco.cmis.CMISService;
+import org.alfresco.cmis.CMISServices;
 import org.alfresco.cmis.CMISTypesFilterEnum;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.repo.web.scripts.RepositoryImageResolver;
@@ -51,14 +51,14 @@ import freemarker.template.TemplateScalarModel;
  */
 public class CMISChildrenMethod implements TemplateMethodModelEx
 {
-    private CMISService cmisService;
+    private CMISServices cmisService;
     private ServiceRegistry serviceRegistry;
     private TemplateImageResolver imageResolver;
     
     /**
      * Construct
      */
-    public CMISChildrenMethod(CMISService cmisService, ServiceRegistry serviceRegistry, RepositoryImageResolver imageResolver)
+    public CMISChildrenMethod(CMISServices cmisService, ServiceRegistry serviceRegistry, RepositoryImageResolver imageResolver)
     {
         this.cmisService = cmisService;
         this.serviceRegistry = serviceRegistry;
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISPropertyValueMethod.java b/source/java/org/alfresco/repo/cmis/rest/CMISPropertyValueMethod.java
index 6bb347eb56..c9a23e743c 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISPropertyValueMethod.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISPropertyValueMethod.java
@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
 
 import java.util.List;
 
-import org.alfresco.cmis.CMISService;
+import org.alfresco.cmis.CMISServices;
 import org.alfresco.repo.template.TemplateNode;
 
 import freemarker.ext.beans.BeanModel;
@@ -45,12 +45,12 @@ import freemarker.template.TemplateScalarModel;
  */
 public final class CMISPropertyValueMethod implements TemplateMethodModelEx
 {
-    private CMISService cmisService;
+    private CMISServices cmisService;
     
     /**
      * Construct
      */
-    public CMISPropertyValueMethod(CMISService cmisService)
+    public CMISPropertyValueMethod(CMISServices cmisService)
     {
         this.cmisService = cmisService;
     }
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java b/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java
index 014bb30f7a..b08fb4e627 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java
@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
 
 import java.util.List;
 
-import org.alfresco.cmis.search.CMISResultSet;
+import org.alfresco.cmis.CMISResultSet;
 import org.alfresco.repo.web.scripts.RepositoryImageResolver;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java
index df3f202a28..d6ab0ce324 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java
@@ -27,17 +27,17 @@ package org.alfresco.repo.cmis.rest;
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.alfresco.cmis.CMISDictionaryService;
 import org.alfresco.cmis.CMISFullTextSearchEnum;
 import org.alfresco.cmis.CMISJoinEnum;
+import org.alfresco.cmis.CMISPropertyDefinition;
 import org.alfresco.cmis.CMISQueryEnum;
-import org.alfresco.cmis.CMISService;
+import org.alfresco.cmis.CMISQueryOptions;
+import org.alfresco.cmis.CMISQueryService;
+import org.alfresco.cmis.CMISResultSet;
+import org.alfresco.cmis.CMISServices;
+import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.cmis.CMISTypesFilterEnum;
-import org.alfresco.cmis.dictionary.CMISDictionaryService;
-import org.alfresco.cmis.dictionary.CMISPropertyDefinition;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
-import org.alfresco.cmis.search.CMISQueryOptions;
-import org.alfresco.cmis.search.CMISQueryService;
-import org.alfresco.cmis.search.CMISResultSet;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
 import org.alfresco.repo.jscript.ScriptNode;
@@ -60,7 +60,7 @@ public class CMISScript extends BaseScopableProcessorExtension
 {
     private ServiceRegistry services;
     private Repository repository;
-    private CMISService cmisService;
+    private CMISServices cmisService;
     private CMISDictionaryService cmisDictionaryService;
     private CMISQueryService cmisQueryService;
     private Paging paging;
@@ -101,7 +101,7 @@ public class CMISScript extends BaseScopableProcessorExtension
      * 
      * @param cmisService
      */
-    public void setCMISService(CMISService cmisService)
+    public void setCMISService(CMISServices cmisService)
     {
         this.cmisService = cmisService;
     }
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
index dc2cc28600..fc2c159090 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
@@ -31,10 +31,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.alfresco.cmis.search.CMISResultSet;
-import org.alfresco.cmis.search.CMISResultSetColumn;
-import org.alfresco.cmis.search.CMISResultSetMetaData;
-import org.alfresco.cmis.search.CMISResultSetRow;
+import org.alfresco.cmis.CMISResultSet;
+import org.alfresco.cmis.CMISResultSetColumn;
+import org.alfresco.cmis.CMISResultSetMetaData;
+import org.alfresco.cmis.CMISResultSetRow;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISTypeDefinitionMethod.java b/source/java/org/alfresco/repo/cmis/rest/CMISTypeDefinitionMethod.java
index 4b505c6b9b..b022d01ffe 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISTypeDefinitionMethod.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISTypeDefinitionMethod.java
@@ -26,8 +26,8 @@ package org.alfresco.repo.cmis.rest;
 
 import java.util.List;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryService;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
+import org.alfresco.cmis.CMISDictionaryService;
+import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.service.namespace.QName;
 
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java
index dd3d78ac70..1cc1556e77 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java
@@ -39,12 +39,12 @@ import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.alfresco.cmis.CMISService;
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
-import org.alfresco.cmis.dictionary.CMISDictionaryService;
-import org.alfresco.cmis.dictionary.CMISScope;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
-import org.alfresco.cmis.search.CMISQueryService;
+import org.alfresco.cmis.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryService;
+import org.alfresco.cmis.CMISQueryService;
+import org.alfresco.cmis.CMISScope;
+import org.alfresco.cmis.CMISServices;
+import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cmis.PropertyFilter;
 import org.alfresco.repo.cmis.ws.utils.CmisObjectsUtils;
@@ -83,7 +83,7 @@ public class DMAbstractServicePort
     protected ObjectFactory cmisObjectFactory = new ObjectFactory();
     protected CMISDictionaryService cmisDictionaryService;
     protected CMISQueryService cmisQueryService;
-    protected CMISService cmisService;
+    protected CMISServices cmisService;
     protected DescriptorService descriptorService;
     protected NodeService nodeService;
     protected VersionService versionService;
@@ -93,7 +93,7 @@ public class DMAbstractServicePort
     protected CmisObjectsUtils cmisObjectsUtils;
 
     
-    public void setCmisService(CMISService cmisService)
+    public void setCmisService(CMISServices cmisService)
     {
         this.cmisService = cmisService;
     }
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
index 4663adcee8..ce2d73be37 100755
--- a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
@@ -28,11 +28,11 @@ import java.io.Serializable;
 import java.util.Map;
 
 import org.alfresco.cmis.CMISDataTypeEnum;
-import org.alfresco.cmis.search.CMISQueryOptions;
-import org.alfresco.cmis.search.CMISResultSet;
-import org.alfresco.cmis.search.CMISResultSetColumn;
-import org.alfresco.cmis.search.CMISResultSetMetaData;
-import org.alfresco.cmis.search.CMISResultSetRow;
+import org.alfresco.cmis.CMISQueryOptions;
+import org.alfresco.cmis.CMISResultSet;
+import org.alfresco.cmis.CMISResultSetColumn;
+import org.alfresco.cmis.CMISResultSetMetaData;
+import org.alfresco.cmis.CMISResultSetRow;
 import org.alfresco.repo.cmis.PropertyFilter;
 
 /**
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
index edf539f080..9dbd9fcb8d 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
@@ -34,9 +34,9 @@ import java.util.Map;
 import javax.activation.DataHandler;
 import javax.xml.ws.Holder;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
-import org.alfresco.cmis.dictionary.CMISScope;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
+import org.alfresco.cmis.CMISDictionaryModel;
+import org.alfresco.cmis.CMISScope;
+import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cmis.PropertyFilter;
 import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete;
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRelationshipServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRelationshipServicePort.java
index b5a2e8fec4..844dfc3a0a 100755
--- a/source/java/org/alfresco/repo/cmis/ws/DMRelationshipServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMRelationshipServicePort.java
@@ -28,9 +28,9 @@ import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.alfresco.cmis.dictionary.CMISScope;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
-import org.alfresco.cmis.dictionary.CMISTypeId;
+import org.alfresco.cmis.CMISScope;
+import org.alfresco.cmis.CMISTypeDefinition;
+import org.alfresco.cmis.CMISTypeId;
 import org.alfresco.repo.cmis.PropertyFilter;
 import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType;
 import org.alfresco.repo.web.util.paging.Cursor;
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
index 43e2f0a5e2..d9b9f227ec 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
@@ -37,15 +37,15 @@ import java.util.Map;
 import javax.xml.bind.JAXBElement;
 
 import org.alfresco.cmis.CMISCardinalityEnum;
+import org.alfresco.cmis.CMISChoice;
 import org.alfresco.cmis.CMISContentStreamAllowedEnum;
 import org.alfresco.cmis.CMISDataTypeEnum;
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISFullTextSearchEnum;
 import org.alfresco.cmis.CMISJoinEnum;
+import org.alfresco.cmis.CMISPropertyDefinition;
+import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.cmis.CMISUpdatabilityEnum;
-import org.alfresco.cmis.dictionary.CMISChoice;
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
-import org.alfresco.cmis.dictionary.CMISPropertyDefinition;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
 import org.alfresco.repo.web.util.paging.Cursor;
 import org.alfresco.service.descriptor.Descriptor;
 
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMVersioningServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMVersioningServicePort.java
index c1978265a7..511bdaec0f 100755
--- a/source/java/org/alfresco/repo/cmis/ws/DMVersioningServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMVersioningServicePort.java
@@ -28,7 +28,7 @@ import java.util.List;
 
 import javax.xml.ws.Holder;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cmis.PropertyFilter;
 import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType;
diff --git a/source/java/org/alfresco/repo/cmis/ws/PropertyUtil.java b/source/java/org/alfresco/repo/cmis/ws/PropertyUtil.java
index 7efe619bc6..cd8c76270d 100755
--- a/source/java/org/alfresco/repo/cmis/ws/PropertyUtil.java
+++ b/source/java/org/alfresco/repo/cmis/ws/PropertyUtil.java
@@ -28,7 +28,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.util.Pair;
 
 /**
diff --git a/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java b/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java
index 589ff03b9c..c4b426bb82 100755
--- a/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java
+++ b/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java
@@ -27,10 +27,10 @@ package org.alfresco.repo.cmis.ws.utils;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryService;
-import org.alfresco.cmis.dictionary.CMISScope;
-import org.alfresco.cmis.dictionary.CMISTypeDefinition;
-import org.alfresco.cmis.dictionary.CMISTypeId;
+import org.alfresco.cmis.CMISDictionaryService;
+import org.alfresco.cmis.CMISScope;
+import org.alfresco.cmis.CMISTypeDefinition;
+import org.alfresco.cmis.CMISTypeId;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cmis.ws.EnumObjectType;
 import org.alfresco.repo.cmis.ws.InvalidArgumentException;
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java
index 63214ff4ac..a30995546e 100644
--- a/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java
@@ -28,7 +28,7 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 
 /**
  * @author Michael Shavnev
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/CmisServiceTestHelper.java b/source/test/java/org/alfresco/repo/cmis/ws/CmisServiceTestHelper.java
index 1309b8f47a..df1710e3b3 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/CmisServiceTestHelper.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/CmisServiceTestHelper.java
@@ -44,8 +44,8 @@ import javax.xml.ws.Service;
 
 import junit.framework.TestCase;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
-import org.alfresco.cmis.dictionary.CMISTypeId;
+import org.alfresco.cmis.CMISDictionaryModel;
+import org.alfresco.cmis.CMISTypeId;
 import org.alfresco.repo.content.MimetypeMap;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.endpoint.Client;
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMMultiFilingServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMMultiFilingServiceTest.java
index 82c3c883ac..1c07023fe4 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/DMMultiFilingServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/DMMultiFilingServiceTest.java
@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.ws;
 
 import javax.xml.namespace.QName;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 
 public class DMMultiFilingServiceTest extends AbstractServiceTest
 {
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServiceTest.java
index a1d0f32ef6..35a1e2a2d9 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServiceTest.java
@@ -28,7 +28,7 @@ import java.math.BigInteger;
 
 import javax.xml.ws.Holder;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 
 /**
  * @author Alexander Tsvetkov
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java
index 32c257f231..f4e5fe791a 100644
--- a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java
@@ -30,7 +30,7 @@ import java.util.List;
 import javax.activation.DataHandler;
 import javax.xml.ws.Holder;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.mapping.CMISMapping;
 import org.alfresco.repo.content.MimetypeMap;
 
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMVersioningServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMVersioningServiceTest.java
index 471f9b74d0..1af282f725 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/DMVersioningServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/DMVersioningServiceTest.java
@@ -27,7 +27,7 @@ package org.alfresco.repo.cmis.ws;
 import javax.activation.DataHandler;
 import javax.xml.ws.Holder;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.repo.content.MimetypeMap;
 
 public class DMVersioningServiceTest extends AbstractServiceTest
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/MultiThreadsServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/MultiThreadsServiceTest.java
index 2ba86e8297..d6f0f2a51d 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/MultiThreadsServiceTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/MultiThreadsServiceTest.java
@@ -28,7 +28,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import org.alfresco.cmis.dictionary.CMISDictionaryModel;
+import org.alfresco.cmis.CMISDictionaryModel;
 
 public class MultiThreadsServiceTest extends AbstractServiceTest
 {