diff --git a/core/index.c b/core/containers/index.c
similarity index 98%
rename from core/index.c
rename to core/containers/index.c
index 43909afc..1646b036 100644
--- a/core/index.c
+++ b/core/containers/index.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/index.h>
+#include <core/containers/index.h>
 
 
 static struct index_entry *__index_alloc(gchar *key)
diff --git a/core/filter.c b/core/filter.c
index 2b965cdd..f5021dc1 100644
--- a/core/filter.c
+++ b/core/filter.c
@@ -2,8 +2,8 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 
+#include <core/containers/index.h>
 #include <core/filter.h>
-#include <core/index.h>
 #include <core/string.h>
 
 
diff --git a/gui/manager.cpp b/gui/manager.cpp
index 131afee1..46f0d1f6 100644
--- a/gui/manager.cpp
+++ b/gui/manager.cpp
@@ -5,7 +5,7 @@ extern "C" {
 #include <core/containers/database.h>
 #include <core/idle.h>
 }
-#include <core/index.h>
+#include <core/containers/index.h>
 #include <core/library.h>
 #include <core/playlist.h>
 #include <gui/ocarina.h>
diff --git a/include/core/index.h b/include/core/containers/index.h
similarity index 88%
rename from include/core/index.h
rename to include/core/containers/index.h
index 31632f49..f40ad126 100644
--- a/include/core/index.h
+++ b/include/core/containers/index.h
@@ -4,8 +4,8 @@
  * The struct index_entry is used to associate a database key
  * with a set of integers, creating an inverted index.
  */
-#ifndef OCARINA_CORE_INDEX_H
-#define OCARINA_CORE_INDEX_H
+#ifndef OCARINA_CORE_CONTAINERS_INDEX_H
+#define OCARINA_CORE_CONTAINERS_INDEX_H
 
 #include <core/containers/database.h>
 #include <core/containers/set.h>
@@ -35,4 +35,4 @@ bool index_has(struct database *, const gchar *, unsigned int);
 #ifdef CONFIG_TESTING
 const struct db_ops *test_index_ops();
 #endif /* CONFIG_TESTING */
-#endif /* OCARINA_CORE_INDEX_H */
+#endif /* OCARINA_CORE_CONTAINERS_INDEX_H */
diff --git a/include/core/playlist.h b/include/core/playlist.h
index 06fc3fdc..f680f99e 100644
--- a/include/core/playlist.h
+++ b/include/core/playlist.h
@@ -5,7 +5,7 @@
 #define OCARINA_CORE_PLAYLIST_H
 
 extern "C" {
-#include <core/index.h>
+#include <core/containers/index.h>
 }
 #include <core/queue.h>
 
diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index 41069ed0..fb189c27 100644
--- a/tests/core/Sconscript
+++ b/tests/core/Sconscript
@@ -20,7 +20,6 @@ res += [ CoreTest("file",     "file.c")       ]
 res += [ CoreTest("date",     "date.c")       ]
 
 res += SConscript("containers/Sconscript")
-res += [ CoreTest("index",    "index.c")      ]
 res += [ CoreTest("filter",   "filter.c")     ]
 res += [ CoreTest("idle",     "idle.c")       ]
 
diff --git a/tests/core/containers/Sconscript b/tests/core/containers/Sconscript
index 6bd7a26a..61a7d16a 100644
--- a/tests/core/containers/Sconscript
+++ b/tests/core/containers/Sconscript
@@ -13,5 +13,6 @@ def ContainerTest(name, source):
 
 res  = [ ContainerTest("set",      "set.c")      ]
 res  = [ ContainerTest("database", "database.c") ]
+res += [ ContainerTest("index",    "index.c")    ]
 
 Return("res")
diff --git a/tests/core/index.c b/tests/core/containers/index.c
similarity index 98%
rename from tests/core/index.c
rename to tests/core/containers/index.c
index 3602f1c4..18eaa58a 100644
--- a/tests/core/index.c
+++ b/tests/core/containers/index.c
@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  * Test a Database
  */
-#include <core/index.h>
+#include <core/containers/index.h>
 #include <tests/test.h>