diff --git a/mapping.albums.json b/mapping.albums.json
new file mode 100644
index 0000000..c8b4990
--- /dev/null
+++ b/mapping.albums.json
@@ -0,0 +1,27 @@
+{
+    "mappings" : {
+        "properties": {
+            "Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Genre": {
+                "type": "keyword"
+            }
+        }
+    }
+}
diff --git a/mapping.artists.json b/mapping.artists.json
new file mode 100644
index 0000000..c8b4990
--- /dev/null
+++ b/mapping.artists.json
@@ -0,0 +1,27 @@
+{
+    "mappings" : {
+        "properties": {
+            "Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Genre": {
+                "type": "keyword"
+            }
+        }
+    }
+}
diff --git a/mapping.json b/mapping.json
deleted file mode 100644
index 9846e64..0000000
--- a/mapping.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"mappings" : {
-		"properties": {
-			"Artist": {
-				"type": "text",
-				"fields": {
-					"raw": {"type": "keyword"}
-				}
-			},
-			"Album Artist": {
-				"type": "text",
-				"fields": {
-					"raw": {"type": "keyword"}
-				}
-			},
-			"Album": {
-				"type": "text",
-				"fields": {
-					"raw": {"type": "keyword"}
-				}
-			},
-			"Bit Rate": {
-				"type": "integer"
-			},
-			"Genre": {
-				"type": "text",
-				"fields": {
-					"raw": {"type": "keyword"}
-				}
-			},
-			"Kind": {
-				"type": "keyword"
-			}
-		}
-	}
-}
diff --git a/mapping.songs.json b/mapping.songs.json
new file mode 100644
index 0000000..983c685
--- /dev/null
+++ b/mapping.songs.json
@@ -0,0 +1,33 @@
+{
+    "mappings" : {
+        "properties": {
+            "Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album Artist": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Album": {
+                "type": "text",
+                "fields": {
+                    "raw": {"type": "keyword"}
+                }
+            },
+            "Bit Rate": {
+                "type": "integer"
+            },
+            "Genre": {
+                "type": "keyword"
+            },
+            "Kind": {
+                "type": "keyword"
+            }
+        }
+    }
+}