diff --git a/tools b/tools
deleted file mode 160000
index 3cbecc7..0000000
--- a/tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3cbecc704f70f48ead70c92200e8aef20917bb53
diff --git a/drivers/a2j/Makefile.am b/tools/alsa_midi/Makefile.am
similarity index 100%
rename from drivers/a2j/Makefile.am
rename to tools/alsa_midi/Makefile.am
diff --git a/drivers/a2j/a2j.h b/tools/alsa_midi/a2j.h
similarity index 100%
rename from drivers/a2j/a2j.h
rename to tools/alsa_midi/a2j.h
diff --git a/drivers/a2j/input_client.c b/tools/alsa_midi/alsa_midi.c
similarity index 100%
rename from drivers/a2j/input_client.c
rename to tools/alsa_midi/alsa_midi.c
diff --git a/drivers/a2j/list.c b/tools/alsa_midi/list.c
similarity index 100%
rename from drivers/a2j/list.c
rename to tools/alsa_midi/list.c
diff --git a/drivers/a2j/list.h b/tools/alsa_midi/list.h
similarity index 100%
rename from drivers/a2j/list.h
rename to tools/alsa_midi/list.h
diff --git a/drivers/a2j/port.c b/tools/alsa_midi/port.c
similarity index 100%
rename from drivers/a2j/port.c
rename to tools/alsa_midi/port.c
diff --git a/drivers/a2j/port.h b/tools/alsa_midi/port.h
similarity index 100%
rename from drivers/a2j/port.h
rename to tools/alsa_midi/port.h
diff --git a/drivers/a2j/port_hash.c b/tools/alsa_midi/port_hash.c
similarity index 100%
rename from drivers/a2j/port_hash.c
rename to tools/alsa_midi/port_hash.c
diff --git a/drivers/a2j/port_hash.h b/tools/alsa_midi/port_hash.h
similarity index 100%
rename from drivers/a2j/port_hash.h
rename to tools/alsa_midi/port_hash.h
diff --git a/drivers/a2j/port_thread.c b/tools/alsa_midi/port_thread.c
similarity index 100%
rename from drivers/a2j/port_thread.c
rename to tools/alsa_midi/port_thread.c
diff --git a/drivers/a2j/port_thread.h b/tools/alsa_midi/port_thread.h
similarity index 100%
rename from drivers/a2j/port_thread.h
rename to tools/alsa_midi/port_thread.h