diff --git a/core/src/main/groovy/com/muwire/core/files/ResultsEvent.groovy b/core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy
similarity index 100%
rename from core/src/main/groovy/com/muwire/core/files/ResultsEvent.groovy
rename to core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy
diff --git a/core/src/main/groovy/com/muwire/core/files/SearchEvent.groovy b/core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy
similarity index 100%
rename from core/src/main/groovy/com/muwire/core/files/SearchEvent.groovy
rename to core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy
diff --git a/core/src/main/groovy/com/muwire/core/files/SearchIndex.groovy b/core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
similarity index 100%
rename from core/src/main/groovy/com/muwire/core/files/SearchIndex.groovy
rename to core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
diff --git a/core/src/test/groovy/com/muwire/core/files/SearchIndexTest.groovy b/core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy
similarity index 100%
rename from core/src/test/groovy/com/muwire/core/files/SearchIndexTest.groovy
rename to core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy