diff --git a/src/servers/Jamfile b/src/servers/Jamfile
index afe9ac36d2..0b96bca022 100644
--- a/src/servers/Jamfile
+++ b/src/servers/Jamfile
@@ -4,7 +4,7 @@ SubInclude HAIKU_TOP src servers app ;
 SubInclude HAIKU_TOP src servers bluetooth ;
 SubInclude HAIKU_TOP src servers cddb_daemon ;
 SubInclude HAIKU_TOP src servers debug ;
-SubInclude HAIKU_TOP src servers index_server ;
+SubInclude HAIKU_TOP src servers index ;
 SubInclude HAIKU_TOP src servers input ;
 SubInclude HAIKU_TOP src servers mail ;
 SubInclude HAIKU_TOP src servers media ;
diff --git a/src/servers/index_server/AnalyserDispatcher.h b/src/servers/index/AnalyserDispatcher.h
similarity index 100%
rename from src/servers/index_server/AnalyserDispatcher.h
rename to src/servers/index/AnalyserDispatcher.h
diff --git a/src/servers/index_server/CatchUpManager.cpp b/src/servers/index/CatchUpManager.cpp
similarity index 100%
rename from src/servers/index_server/CatchUpManager.cpp
rename to src/servers/index/CatchUpManager.cpp
diff --git a/src/servers/index_server/CatchUpManager.h b/src/servers/index/CatchUpManager.h
similarity index 100%
rename from src/servers/index_server/CatchUpManager.h
rename to src/servers/index/CatchUpManager.h
diff --git a/src/servers/index_server/IndexServer.cpp b/src/servers/index/IndexServer.cpp
similarity index 100%
rename from src/servers/index_server/IndexServer.cpp
rename to src/servers/index/IndexServer.cpp
diff --git a/src/servers/index_server/IndexServer.h b/src/servers/index/IndexServer.h
similarity index 100%
rename from src/servers/index_server/IndexServer.h
rename to src/servers/index/IndexServer.h
diff --git a/src/servers/index_server/Jamfile b/src/servers/index/Jamfile
similarity index 93%
rename from src/servers/index_server/Jamfile
rename to src/servers/index/Jamfile
index d2c4b4ecd1..ded7a9ac5f 100644
--- a/src/servers/index_server/Jamfile
+++ b/src/servers/index/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src servers index_server ;
+SubDir HAIKU_TOP src servers index ;
 
 AddResources index_server : index_server.rdef ;
 
diff --git a/src/servers/index_server/ModifiedNotifications.cpp b/src/servers/index/ModifiedNotifications.cpp
similarity index 100%
rename from src/servers/index_server/ModifiedNotifications.cpp
rename to src/servers/index/ModifiedNotifications.cpp
diff --git a/src/servers/index_server/ModifiedNotifications.h b/src/servers/index/ModifiedNotifications.h
similarity index 100%
rename from src/servers/index_server/ModifiedNotifications.h
rename to src/servers/index/ModifiedNotifications.h
diff --git a/src/servers/index_server/VolumeWatcher.cpp b/src/servers/index/VolumeWatcher.cpp
similarity index 100%
rename from src/servers/index_server/VolumeWatcher.cpp
rename to src/servers/index/VolumeWatcher.cpp
diff --git a/src/servers/index_server/VolumeWatcher.h b/src/servers/index/VolumeWatcher.h
similarity index 100%
rename from src/servers/index_server/VolumeWatcher.h
rename to src/servers/index/VolumeWatcher.h
diff --git a/src/servers/index_server/index_server.rdef b/src/servers/index/index_server.rdef
similarity index 100%
rename from src/servers/index_server/index_server.rdef
rename to src/servers/index/index_server.rdef
diff --git a/src/servers/index_server/main.cpp b/src/servers/index/main.cpp
similarity index 100%
rename from src/servers/index_server/main.cpp
rename to src/servers/index/main.cpp