diff --git a/core/src/main/groovy/com/muwire/core/files/FileManager.groovy b/core/src/main/groovy/com/muwire/core/files/FileManager.groovy
index e9db4929..da8a52f0 100644
--- a/core/src/main/groovy/com/muwire/core/files/FileManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/FileManager.groovy
@@ -2,6 +2,8 @@ package com.muwire.core.files
 
 import com.muwire.core.EventBus
 import com.muwire.core.SharedFile
+import com.muwire.core.search.ResultsEvent
+import com.muwire.core.search.SearchEvent
 
 class FileManager {
 
diff --git a/core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy b/core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy
index e78694ee..f3f3c3b3 100644
--- a/core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy
+++ b/core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy
@@ -1,4 +1,4 @@
-package com.muwire.core.files
+package com.muwire.core.search
 
 import com.muwire.core.Event
 import com.muwire.core.SharedFile
diff --git a/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy b/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy
index a045e1b8..0d6c910b 100644
--- a/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy
+++ b/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy
@@ -1,4 +1,4 @@
-package com.muwire.core.files
+package com.muwire.core.search
 
 import com.muwire.core.Event
 
diff --git a/core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy b/core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
index 36878aa2..b5ba2e25 100644
--- a/core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
+++ b/core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
@@ -1,4 +1,4 @@
-package com.muwire.core.files
+package com.muwire.core.search
 
 
 class SearchIndex {
diff --git a/core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy b/core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy
index 2ce3ac1b..652a66d3 100644
--- a/core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy
+++ b/core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy
@@ -1,4 +1,4 @@
-package com.muwire.core.files
+package com.muwire.core.search
 
 import org.junit.Test