diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearchResults.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearchResults.java
index fe76ac320..d71ddcb55 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearchResults.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearchResults.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.Vector;
 
 import com.arsdigita.cms.docmgr.ui.DMConstants;
-import com.arsdigita.lucene.LuceneSearch;
+import com.arsdigita.search.lucene.LuceneSearch;
 
 
 /**
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearcher.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearcher.java
index cbb1f2e8b..6a6e4d7bf 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearcher.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/search/LuceneSearcher.java
@@ -14,9 +14,9 @@ import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.kernel.User;
-import com.arsdigita.lucene.LuceneSearch;
-import com.arsdigita.lucene.ObjectTypeFilter;
-import com.arsdigita.lucene.TypeSpecificFilter;
+import com.arsdigita.search.lucene.LuceneSearch;
+import com.arsdigita.search.lucene.ObjectTypeFilter;
+import com.arsdigita.search.lucene.TypeSpecificFilter;
 
 public class LuceneSearcher implements Searcher
 {
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
index 168c49936..83414b030 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
@@ -7,7 +7,8 @@ import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Iterator;
+// pboy: unneccessary import, to be deleted
+// import java.util.Iterator;
 import java.util.TooManyListenersException;
 
 import javax.servlet.http.HttpServletRequest;
@@ -50,7 +51,8 @@ import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.ArrayParameter;
 import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.bebop.parameters.EmailValidationListener;
-import com.arsdigita.bebop.parameters.NotEmptyValidationListener;
+// pboy: unneccessary import, to be deleted
+// import com.arsdigita.bebop.parameters.NotEmptyValidationListener;
 import com.arsdigita.bebop.parameters.StringLengthValidationListener;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.bebop.parameters.TrimmedStringParameter;
@@ -60,7 +62,8 @@ import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ContentSectionCollection;
 import com.arsdigita.cms.FileAsset;
-import com.arsdigita.cms.docmgr.DocFolder;
+// pboy: unneccessary import, to be deleted
+// import com.arsdigita.cms.docmgr.DocFolder;
 import com.arsdigita.cms.docmgr.DocMgr;
 import com.arsdigita.cms.docmgr.Document;
 import com.arsdigita.dispatcher.DispatcherHelper;