diff --git a/.gitmodules b/.gitmodules
index f8e11bd..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "lilydrum"]
-	path = lilydrum
-	url = /home/ericteunis/public/git/lilydrum.git/
-[submodule "bagpipemusic"]
-	path = bagpipemusic
-	url = https://github.com/svenax/bagpipemusic.git
diff --git a/music/2-4_marches/black_bear/config.ily b/2-4_marches/black_bear/config.ily
similarity index 100%
rename from music/2-4_marches/black_bear/config.ily
rename to 2-4_marches/black_bear/config.ily
diff --git a/music/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly
similarity index 100%
rename from music/2-4_marches/black_bear/full.ly
rename to 2-4_marches/black_bear/full.ly
diff --git a/music/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/black_bear/notes.pipes.ily
rename to 2-4_marches/black_bear/notes.pipes.ily
diff --git a/music/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily
similarity index 100%
rename from music/2-4_marches/black_bear/notes.side.ily
rename to 2-4_marches/black_bear/notes.side.ily
diff --git a/music/2-4_marches/black_bear/notes.side.v1.2.ily b/2-4_marches/black_bear/notes.side.v1.2.ily
similarity index 100%
rename from music/2-4_marches/black_bear/notes.side.v1.2.ily
rename to 2-4_marches/black_bear/notes.side.v1.2.ily
diff --git a/music/2-4_marches/black_bear/notes.side.v1.3.ily b/2-4_marches/black_bear/notes.side.v1.3.ily
similarity index 100%
rename from music/2-4_marches/black_bear/notes.side.v1.3.ily
rename to 2-4_marches/black_bear/notes.side.v1.3.ily
diff --git a/music/2-4_marches/black_bear/pipes.ly b/2-4_marches/black_bear/pipes.ly
similarity index 100%
rename from music/2-4_marches/black_bear/pipes.ly
rename to 2-4_marches/black_bear/pipes.ly
diff --git a/music/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly
similarity index 100%
rename from music/2-4_marches/black_bear/side.ly
rename to 2-4_marches/black_bear/side.ly
diff --git a/music/2-4_marches/brown_haired_maiden/config.ily b/2-4_marches/brown_haired_maiden/config.ily
similarity index 100%
rename from music/2-4_marches/brown_haired_maiden/config.ily
rename to 2-4_marches/brown_haired_maiden/config.ily
diff --git a/music/2-4_marches/brown_haired_maiden/notes.pipes.ily b/2-4_marches/brown_haired_maiden/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/brown_haired_maiden/notes.pipes.ily
rename to 2-4_marches/brown_haired_maiden/notes.pipes.ily
diff --git a/music/2-4_marches/brown_haired_maiden/pipes.ly b/2-4_marches/brown_haired_maiden/pipes.ly
similarity index 100%
rename from music/2-4_marches/brown_haired_maiden/pipes.ly
rename to 2-4_marches/brown_haired_maiden/pipes.ly
diff --git a/music/2-4_marches/caller_herrin/.callerherrin.ly.swp b/2-4_marches/caller_herrin/.callerherrin.ly.swp
similarity index 100%
rename from music/2-4_marches/caller_herrin/.callerherrin.ly.swp
rename to 2-4_marches/caller_herrin/.callerherrin.ly.swp
diff --git a/music/2-4_marches/caller_herrin/Caller_Herrin'.bww b/2-4_marches/caller_herrin/Caller_Herrin'.bww
similarity index 100%
rename from music/2-4_marches/caller_herrin/Caller_Herrin'.bww
rename to 2-4_marches/caller_herrin/Caller_Herrin'.bww
diff --git a/music/2-4_marches/caller_herrin/calseconds.bww b/2-4_marches/caller_herrin/calseconds.bww
similarity index 100%
rename from music/2-4_marches/caller_herrin/calseconds.bww
rename to 2-4_marches/caller_herrin/calseconds.bww
diff --git a/music/2-4_marches/caller_herrin/config.ily b/2-4_marches/caller_herrin/config.ily
similarity index 100%
rename from music/2-4_marches/caller_herrin/config.ily
rename to 2-4_marches/caller_herrin/config.ily
diff --git a/music/2-4_marches/caller_herrin/notes.pipes.ily b/2-4_marches/caller_herrin/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/caller_herrin/notes.pipes.ily
rename to 2-4_marches/caller_herrin/notes.pipes.ily
diff --git a/music/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
similarity index 100%
rename from music/2-4_marches/caller_herrin/pipes.ly
rename to 2-4_marches/caller_herrin/pipes.ly
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily
similarity index 100%
rename from music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily
rename to 2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily
rename to 2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
similarity index 100%
rename from music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
rename to 2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
diff --git a/music/2-4_marches/duncan_mcinness/config.ily b/2-4_marches/duncan_mcinness/config.ily
similarity index 100%
rename from music/2-4_marches/duncan_mcinness/config.ily
rename to 2-4_marches/duncan_mcinness/config.ily
diff --git a/music/2-4_marches/duncan_mcinness/notes.side.ily b/2-4_marches/duncan_mcinness/notes.side.ily
similarity index 100%
rename from music/2-4_marches/duncan_mcinness/notes.side.ily
rename to 2-4_marches/duncan_mcinness/notes.side.ily
diff --git a/music/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly
similarity index 100%
rename from music/2-4_marches/duncan_mcinness/side.ly
rename to 2-4_marches/duncan_mcinness/side.ly
diff --git a/music/2-4_marches/high_road_to_gairloch/config.ily b/2-4_marches/high_road_to_gairloch/config.ily
similarity index 100%
rename from music/2-4_marches/high_road_to_gairloch/config.ily
rename to 2-4_marches/high_road_to_gairloch/config.ily
diff --git a/music/2-4_marches/high_road_to_gairloch/notes.pipes.ily b/2-4_marches/high_road_to_gairloch/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/high_road_to_gairloch/notes.pipes.ily
rename to 2-4_marches/high_road_to_gairloch/notes.pipes.ily
diff --git a/music/2-4_marches/high_road_to_gairloch/pipes.ly b/2-4_marches/high_road_to_gairloch/pipes.ly
similarity index 100%
rename from music/2-4_marches/high_road_to_gairloch/pipes.ly
rename to 2-4_marches/high_road_to_gairloch/pipes.ly
diff --git a/music/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/config.ily
rename to 2-4_marches/mackenzie_highlanders/config.ily
diff --git a/music/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/full.ly
rename to 2-4_marches/mackenzie_highlanders/full.ly
diff --git a/music/2-4_marches/mackenzie_highlanders/notes.pipes.ily b/2-4_marches/mackenzie_highlanders/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/notes.pipes.ily
rename to 2-4_marches/mackenzie_highlanders/notes.pipes.ily
diff --git a/music/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/notes.side.alt.ily
rename to 2-4_marches/mackenzie_highlanders/notes.side.alt.ily
diff --git a/music/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/notes.side.ily
rename to 2-4_marches/mackenzie_highlanders/notes.side.ily
diff --git a/music/2-4_marches/mackenzie_highlanders/pipes.ly b/2-4_marches/mackenzie_highlanders/pipes.ly
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/pipes.ly
rename to 2-4_marches/mackenzie_highlanders/pipes.ly
diff --git a/music/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/side.alt.ly
rename to 2-4_marches/mackenzie_highlanders/side.alt.ly
diff --git a/music/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly
similarity index 100%
rename from music/2-4_marches/mackenzie_highlanders/side.ly
rename to 2-4_marches/mackenzie_highlanders/side.ly
diff --git a/music/2-4_marches/pipers_cave/config.ily b/2-4_marches/pipers_cave/config.ily
similarity index 100%
rename from music/2-4_marches/pipers_cave/config.ily
rename to 2-4_marches/pipers_cave/config.ily
diff --git a/music/2-4_marches/pipers_cave/notes.pipes.ily b/2-4_marches/pipers_cave/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/pipers_cave/notes.pipes.ily
rename to 2-4_marches/pipers_cave/notes.pipes.ily
diff --git a/music/2-4_marches/pipers_cave/pipes.ly b/2-4_marches/pipers_cave/pipes.ly
similarity index 100%
rename from music/2-4_marches/pipers_cave/pipes.ly
rename to 2-4_marches/pipers_cave/pipes.ly
diff --git a/music/2-4_marches/teribus/config.ily b/2-4_marches/teribus/config.ily
similarity index 100%
rename from music/2-4_marches/teribus/config.ily
rename to 2-4_marches/teribus/config.ily
diff --git a/music/2-4_marches/teribus/notes.pipes.ily b/2-4_marches/teribus/notes.pipes.ily
similarity index 100%
rename from music/2-4_marches/teribus/notes.pipes.ily
rename to 2-4_marches/teribus/notes.pipes.ily
diff --git a/music/2-4_marches/teribus/pipes.ly b/2-4_marches/teribus/pipes.ly
similarity index 100%
rename from music/2-4_marches/teribus/pipes.ly
rename to 2-4_marches/teribus/pipes.ly
diff --git a/music/3-4_marches/ballad_of_the_green_berets/config.ily b/3-4_marches/ballad_of_the_green_berets/config.ily
similarity index 100%
rename from music/3-4_marches/ballad_of_the_green_berets/config.ily
rename to 3-4_marches/ballad_of_the_green_berets/config.ily
diff --git a/music/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily b/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
rename to 3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
diff --git a/music/3-4_marches/ballad_of_the_green_berets/pipes.ly b/3-4_marches/ballad_of_the_green_berets/pipes.ly
similarity index 100%
rename from music/3-4_marches/ballad_of_the_green_berets/pipes.ly
rename to 3-4_marches/ballad_of_the_green_berets/pipes.ly
diff --git a/music/3-4_marches/balmoral/config.ily b/3-4_marches/balmoral/config.ily
similarity index 100%
rename from music/3-4_marches/balmoral/config.ily
rename to 3-4_marches/balmoral/config.ily
diff --git a/music/3-4_marches/balmoral/first.bww b/3-4_marches/balmoral/first.bww
similarity index 100%
rename from music/3-4_marches/balmoral/first.bww
rename to 3-4_marches/balmoral/first.bww
diff --git a/music/3-4_marches/balmoral/notes.pipes.ily b/3-4_marches/balmoral/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/balmoral/notes.pipes.ily
rename to 3-4_marches/balmoral/notes.pipes.ily
diff --git a/music/3-4_marches/balmoral/notes.pipes.seconds.ily b/3-4_marches/balmoral/notes.pipes.seconds.ily
similarity index 100%
rename from music/3-4_marches/balmoral/notes.pipes.seconds.ily
rename to 3-4_marches/balmoral/notes.pipes.seconds.ily
diff --git a/music/3-4_marches/balmoral/notes.pipes.thirds.ily b/3-4_marches/balmoral/notes.pipes.thirds.ily
similarity index 100%
rename from music/3-4_marches/balmoral/notes.pipes.thirds.ily
rename to 3-4_marches/balmoral/notes.pipes.thirds.ily
diff --git a/music/3-4_marches/balmoral/pipes.full.ly b/3-4_marches/balmoral/pipes.full.ly
similarity index 100%
rename from music/3-4_marches/balmoral/pipes.full.ly
rename to 3-4_marches/balmoral/pipes.full.ly
diff --git a/music/3-4_marches/balmoral/pipes.ly b/3-4_marches/balmoral/pipes.ly
similarity index 100%
rename from music/3-4_marches/balmoral/pipes.ly
rename to 3-4_marches/balmoral/pipes.ly
diff --git a/music/3-4_marches/balmoral/pipes.seconds.ly b/3-4_marches/balmoral/pipes.seconds.ly
similarity index 100%
rename from music/3-4_marches/balmoral/pipes.seconds.ly
rename to 3-4_marches/balmoral/pipes.seconds.ly
diff --git a/music/3-4_marches/balmoral/pipes.thirds.ly b/3-4_marches/balmoral/pipes.thirds.ly
similarity index 100%
rename from music/3-4_marches/balmoral/pipes.thirds.ly
rename to 3-4_marches/balmoral/pipes.thirds.ly
diff --git a/music/3-4_marches/balmoral/seconds.bww b/3-4_marches/balmoral/seconds.bww
similarity index 100%
rename from music/3-4_marches/balmoral/seconds.bww
rename to 3-4_marches/balmoral/seconds.bww
diff --git a/music/3-4_marches/balmoral/thirds.bww b/3-4_marches/balmoral/thirds.bww
similarity index 100%
rename from music/3-4_marches/balmoral/thirds.bww
rename to 3-4_marches/balmoral/thirds.bww
diff --git a/music/3-4_marches/castle_dangerous/config.ily b/3-4_marches/castle_dangerous/config.ily
similarity index 100%
rename from music/3-4_marches/castle_dangerous/config.ily
rename to 3-4_marches/castle_dangerous/config.ily
diff --git a/music/3-4_marches/castle_dangerous/notes.tenor.ily b/3-4_marches/castle_dangerous/notes.tenor.ily
similarity index 100%
rename from music/3-4_marches/castle_dangerous/notes.tenor.ily
rename to 3-4_marches/castle_dangerous/notes.tenor.ily
diff --git a/music/3-4_marches/castle_dangerous/tenor.ly b/3-4_marches/castle_dangerous/tenor.ly
similarity index 100%
rename from music/3-4_marches/castle_dangerous/tenor.ly
rename to 3-4_marches/castle_dangerous/tenor.ly
diff --git a/music/3-4_marches/collins_cattle/config.ily b/3-4_marches/collins_cattle/config.ily
similarity index 100%
rename from music/3-4_marches/collins_cattle/config.ily
rename to 3-4_marches/collins_cattle/config.ily
diff --git a/music/3-4_marches/collins_cattle/notes.pipes.ily b/3-4_marches/collins_cattle/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/collins_cattle/notes.pipes.ily
rename to 3-4_marches/collins_cattle/notes.pipes.ily
diff --git a/music/3-4_marches/collins_cattle/pipes.ly b/3-4_marches/collins_cattle/pipes.ly
similarity index 100%
rename from music/3-4_marches/collins_cattle/pipes.ly
rename to 3-4_marches/collins_cattle/pipes.ly
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/config.ily b/3-4_marches/on_the_road_to_passchendaele/config.ily
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/config.ily
rename to 3-4_marches/on_the_road_to_passchendaele/config.ily
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/full.ly b/3-4_marches/on_the_road_to_passchendaele/full.ly
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/full.ly
rename to 3-4_marches/on_the_road_to_passchendaele/full.ly
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
rename to 3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
rename to 3-4_marches/on_the_road_to_passchendaele/notes.side.ily
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/pipes.ly b/3-4_marches/on_the_road_to_passchendaele/pipes.ly
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/pipes.ly
rename to 3-4_marches/on_the_road_to_passchendaele/pipes.ly
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/side.ly b/3-4_marches/on_the_road_to_passchendaele/side.ly
similarity index 100%
rename from music/3-4_marches/on_the_road_to_passchendaele/side.ly
rename to 3-4_marches/on_the_road_to_passchendaele/side.ly
diff --git a/music/3-4_marches/red_hackle/config.ily b/3-4_marches/red_hackle/config.ily
similarity index 100%
rename from music/3-4_marches/red_hackle/config.ily
rename to 3-4_marches/red_hackle/config.ily
diff --git a/music/3-4_marches/red_hackle/notes.pipes.ily b/3-4_marches/red_hackle/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/red_hackle/notes.pipes.ily
rename to 3-4_marches/red_hackle/notes.pipes.ily
diff --git a/music/3-4_marches/red_hackle/pipes.ly b/3-4_marches/red_hackle/pipes.ly
similarity index 100%
rename from music/3-4_marches/red_hackle/pipes.ly
rename to 3-4_marches/red_hackle/pipes.ly
diff --git a/music/3-4_marches/shoals_of_herring/config.ily b/3-4_marches/shoals_of_herring/config.ily
similarity index 100%
rename from music/3-4_marches/shoals_of_herring/config.ily
rename to 3-4_marches/shoals_of_herring/config.ily
diff --git a/music/3-4_marches/shoals_of_herring/notes.pipes.ily b/3-4_marches/shoals_of_herring/notes.pipes.ily
similarity index 100%
rename from music/3-4_marches/shoals_of_herring/notes.pipes.ily
rename to 3-4_marches/shoals_of_herring/notes.pipes.ily
diff --git a/music/3-4_marches/shoals_of_herring/pipes.ly b/3-4_marches/shoals_of_herring/pipes.ly
similarity index 100%
rename from music/3-4_marches/shoals_of_herring/pipes.ly
rename to 3-4_marches/shoals_of_herring/pipes.ly
diff --git a/music/4-4_marches/15 b  The Hills of Argyll.bww b/4-4_marches/15 b  The Hills of Argyll.bww
similarity index 100%
rename from music/4-4_marches/15 b  The Hills of Argyll.bww
rename to 4-4_marches/15 b  The Hills of Argyll.bww
diff --git a/music/4-4_marches/20 Dawning Of The Day seconds.bww b/4-4_marches/20 Dawning Of The Day seconds.bww
similarity index 100%
rename from music/4-4_marches/20 Dawning Of The Day seconds.bww
rename to 4-4_marches/20 Dawning Of The Day seconds.bww
diff --git a/music/4-4_marches/20 The Dawning of the Day.bww b/4-4_marches/20 The Dawning of the Day.bww
similarity index 100%
rename from music/4-4_marches/20 The Dawning of the Day.bww
rename to 4-4_marches/20 The Dawning of the Day.bww
diff --git a/music/4-4_marches/22  Auld Lang Syne.bww b/4-4_marches/22  Auld Lang Syne.bww
similarity index 100%
rename from music/4-4_marches/22  Auld Lang Syne.bww
rename to 4-4_marches/22  Auld Lang Syne.bww
diff --git a/music/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily
similarity index 100%
rename from music/4-4_marches/51st_highland_division/config.ily
rename to 4-4_marches/51st_highland_division/config.ily
diff --git a/music/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily
similarity index 100%
rename from music/4-4_marches/51st_highland_division/notes.side.ily
rename to 4-4_marches/51st_highland_division/notes.side.ily
diff --git a/music/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly
similarity index 100%
rename from music/4-4_marches/51st_highland_division/side.ly
rename to 4-4_marches/51st_highland_division/side.ly
diff --git a/music/4-4_marches/8  set 6 Bonnie Lass 'O Fyvie Cockney Jocks.bww b/4-4_marches/8  set 6 Bonnie Lass 'O Fyvie Cockney Jocks.bww
similarity index 100%
rename from music/4-4_marches/8  set 6 Bonnie Lass 'O Fyvie Cockney Jocks.bww
rename to 4-4_marches/8  set 6 Bonnie Lass 'O Fyvie Cockney Jocks.bww
diff --git a/music/4-4_marches/9 set 7 51st Highland Div-Scotland the Brave.bww b/4-4_marches/9 set 7 51st Highland Div-Scotland the Brave.bww
similarity index 100%
rename from music/4-4_marches/9 set 7 51st Highland Div-Scotland the Brave.bww
rename to 4-4_marches/9 set 7 51st Highland Div-Scotland the Brave.bww
diff --git a/music/4-4_marches/flett_from_flotta/config.ily b/4-4_marches/flett_from_flotta/config.ily
similarity index 100%
rename from music/4-4_marches/flett_from_flotta/config.ily
rename to 4-4_marches/flett_from_flotta/config.ily
diff --git a/music/4-4_marches/flett_from_flotta/notes.side.ily b/4-4_marches/flett_from_flotta/notes.side.ily
similarity index 100%
rename from music/4-4_marches/flett_from_flotta/notes.side.ily
rename to 4-4_marches/flett_from_flotta/notes.side.ily
diff --git a/music/4-4_marches/flett_from_flotta/side.ly b/4-4_marches/flett_from_flotta/side.ly
similarity index 100%
rename from music/4-4_marches/flett_from_flotta/side.ly
rename to 4-4_marches/flett_from_flotta/side.ly
diff --git a/music/4-4_marches/minstrel_boy/14a set 14 Minstrel Boy.bww b/4-4_marches/minstrel_boy/14a set 14 Minstrel Boy.bww
similarity index 100%
rename from music/4-4_marches/minstrel_boy/14a set 14 Minstrel Boy.bww
rename to 4-4_marches/minstrel_boy/14a set 14 Minstrel Boy.bww
diff --git a/music/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily
similarity index 100%
rename from music/4-4_marches/minstrel_boy/config.ily
rename to 4-4_marches/minstrel_boy/config.ily
diff --git a/music/4-4_marches/minstrel_boy/notes.side.ily b/4-4_marches/minstrel_boy/notes.side.ily
similarity index 100%
rename from music/4-4_marches/minstrel_boy/notes.side.ily
rename to 4-4_marches/minstrel_boy/notes.side.ily
diff --git a/music/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly
similarity index 100%
rename from music/4-4_marches/minstrel_boy/side.ly
rename to 4-4_marches/minstrel_boy/side.ly
diff --git a/music/4-4_marches/rowan_tree/config.ily b/4-4_marches/rowan_tree/config.ily
similarity index 100%
rename from music/4-4_marches/rowan_tree/config.ily
rename to 4-4_marches/rowan_tree/config.ily
diff --git a/music/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily
similarity index 100%
rename from music/4-4_marches/rowan_tree/notes.side.ily
rename to 4-4_marches/rowan_tree/notes.side.ily
diff --git a/music/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly
similarity index 100%
rename from music/4-4_marches/rowan_tree/side.ly
rename to 4-4_marches/rowan_tree/side.ly
diff --git a/music/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily
similarity index 100%
rename from music/4-4_marches/scotland_the_brave/config.ily
rename to 4-4_marches/scotland_the_brave/config.ily
diff --git a/music/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily
similarity index 100%
rename from music/4-4_marches/scotland_the_brave/notes.side.ily
rename to 4-4_marches/scotland_the_brave/notes.side.ily
diff --git a/music/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly
similarity index 100%
rename from music/4-4_marches/scotland_the_brave/side.ly
rename to 4-4_marches/scotland_the_brave/side.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/config.ily
rename to 4-4_marches/the_leaving_of_liverpool/config.ily
diff --git a/music/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/drums.ly
rename to 4-4_marches/the_leaving_of_liverpool/drums.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/full.ly b/4-4_marches/the_leaving_of_liverpool/full.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/full.ly
rename to 4-4_marches/the_leaving_of_liverpool/full.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/leav.bww b/4-4_marches/the_leaving_of_liverpool/leav.bww
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/leav.bww
rename to 4-4_marches/the_leaving_of_liverpool/leav.bww
diff --git a/music/4-4_marches/the_leaving_of_liverpool/leav.ly b/4-4_marches/the_leaving_of_liverpool/leav.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/leav.ly
rename to 4-4_marches/the_leaving_of_liverpool/leav.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily b/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
rename to 4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
diff --git a/music/4-4_marches/the_leaving_of_liverpool/notes.side.ily b/4-4_marches/the_leaving_of_liverpool/notes.side.ily
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/notes.side.ily
rename to 4-4_marches/the_leaving_of_liverpool/notes.side.ily
diff --git a/music/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
rename to 4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
diff --git a/music/4-4_marches/the_leaving_of_liverpool/pipes.ly b/4-4_marches/the_leaving_of_liverpool/pipes.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/pipes.ly
rename to 4-4_marches/the_leaving_of_liverpool/pipes.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/side.ly
rename to 4-4_marches/the_leaving_of_liverpool/side.ly
diff --git a/music/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly
similarity index 100%
rename from music/4-4_marches/the_leaving_of_liverpool/tenor.ly
rename to 4-4_marches/the_leaving_of_liverpool/tenor.ly
diff --git a/music/4-4_marches/the_old_rustic_bridge/12b set 12  Old Rustic Bridge The.bww b/4-4_marches/the_old_rustic_bridge/12b set 12  Old Rustic Bridge The.bww
similarity index 100%
rename from music/4-4_marches/the_old_rustic_bridge/12b set 12  Old Rustic Bridge The.bww
rename to 4-4_marches/the_old_rustic_bridge/12b set 12  Old Rustic Bridge The.bww
diff --git a/music/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily
similarity index 100%
rename from music/4-4_marches/the_old_rustic_bridge/config.ily
rename to 4-4_marches/the_old_rustic_bridge/config.ily
diff --git a/music/4-4_marches/the_old_rustic_bridge/notes.tenor.ily b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily
similarity index 100%
rename from music/4-4_marches/the_old_rustic_bridge/notes.tenor.ily
rename to 4-4_marches/the_old_rustic_bridge/notes.tenor.ily
diff --git a/music/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly
similarity index 100%
rename from music/4-4_marches/the_old_rustic_bridge/tenor.ly
rename to 4-4_marches/the_old_rustic_bridge/tenor.ly
diff --git a/music/4-4_marches/the_pikemans_march/bass.ly b/4-4_marches/the_pikemans_march/bass.ly
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/bass.ly
rename to 4-4_marches/the_pikemans_march/bass.ly
diff --git a/music/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/config.ily
rename to 4-4_marches/the_pikemans_march/config.ily
diff --git a/music/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/drums.ly
rename to 4-4_marches/the_pikemans_march/drums.ly
diff --git a/music/4-4_marches/the_pikemans_march/notes.bass.ily b/4-4_marches/the_pikemans_march/notes.bass.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.bass.ily
rename to 4-4_marches/the_pikemans_march/notes.bass.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.side.ily
rename to 4-4_marches/the_pikemans_march/notes.side.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily
rename to 4-4_marches/the_pikemans_march/notes.side.v1.5.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily
rename to 4-4_marches/the_pikemans_march/notes.side.v1.6.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.7.ily b/4-4_marches/the_pikemans_march/notes.side.v1.7.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.side.v1.7.ily
rename to 4-4_marches/the_pikemans_march/notes.side.v1.7.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.8.ily b/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
rename to 4-4_marches/the_pikemans_march/notes.side.v1.8.ily
diff --git a/music/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/notes.tenor.ily
rename to 4-4_marches/the_pikemans_march/notes.tenor.ily
diff --git a/music/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/side.ly
rename to 4-4_marches/the_pikemans_march/side.ly
diff --git a/music/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly
similarity index 100%
rename from music/4-4_marches/the_pikemans_march/tenor.ly
rename to 4-4_marches/the_pikemans_march/tenor.ly
diff --git a/music/4-4_marches/were_no_awa_tae_bide_awa/4     set 1 BONNIE Galloway -We're No Awa'Tae Bide Awa.bww b/4-4_marches/were_no_awa_tae_bide_awa/4     set 1 BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
similarity index 100%
rename from music/4-4_marches/were_no_awa_tae_bide_awa/4     set 1 BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
rename to 4-4_marches/were_no_awa_tae_bide_awa/4     set 1 BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
diff --git a/music/4-4_marches/were_no_awa_tae_bide_awa/config.ily b/4-4_marches/were_no_awa_tae_bide_awa/config.ily
similarity index 100%
rename from music/4-4_marches/were_no_awa_tae_bide_awa/config.ily
rename to 4-4_marches/were_no_awa_tae_bide_awa/config.ily
diff --git a/music/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily
similarity index 100%
rename from music/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily
rename to 4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily
diff --git a/music/4-4_marches/were_no_awa_tae_bide_awa/side.ly b/4-4_marches/were_no_awa_tae_bide_awa/side.ly
similarity index 100%
rename from music/4-4_marches/were_no_awa_tae_bide_awa/side.ly
rename to 4-4_marches/were_no_awa_tae_bide_awa/side.ly
diff --git a/music/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily
similarity index 100%
rename from music/4-4_marches/wings/config.ily
rename to 4-4_marches/wings/config.ily
diff --git a/music/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily
similarity index 100%
rename from music/4-4_marches/wings/notes.side.ily
rename to 4-4_marches/wings/notes.side.ily
diff --git a/music/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
similarity index 100%
rename from music/4-4_marches/wings/side.ly
rename to 4-4_marches/wings/side.ly
diff --git a/music/5-4_marches/26  cullen bay hmpd.bww b/5-4_marches/26  cullen bay hmpd.bww
similarity index 100%
rename from music/5-4_marches/26  cullen bay hmpd.bww
rename to 5-4_marches/26  cullen bay hmpd.bww
diff --git a/music/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly
similarity index 100%
rename from music/5-4_marches/cullen_bay/bass.ly
rename to 5-4_marches/cullen_bay/bass.ly
diff --git a/music/5-4_marches/cullen_bay/config.ily b/5-4_marches/cullen_bay/config.ily
similarity index 100%
rename from music/5-4_marches/cullen_bay/config.ily
rename to 5-4_marches/cullen_bay/config.ily
diff --git a/music/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly
similarity index 100%
rename from music/5-4_marches/cullen_bay/drums.ly
rename to 5-4_marches/cullen_bay/drums.ly
diff --git a/music/5-4_marches/cullen_bay/notes.bass.ily b/5-4_marches/cullen_bay/notes.bass.ily
similarity index 100%
rename from music/5-4_marches/cullen_bay/notes.bass.ily
rename to 5-4_marches/cullen_bay/notes.bass.ily
diff --git a/music/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily
similarity index 100%
rename from music/5-4_marches/cullen_bay/notes.side.ily
rename to 5-4_marches/cullen_bay/notes.side.ily
diff --git a/music/5-4_marches/cullen_bay/notes.tenor.ily b/5-4_marches/cullen_bay/notes.tenor.ily
similarity index 100%
rename from music/5-4_marches/cullen_bay/notes.tenor.ily
rename to 5-4_marches/cullen_bay/notes.tenor.ily
diff --git a/music/5-4_marches/cullen_bay/side.ly b/5-4_marches/cullen_bay/side.ly
similarity index 100%
rename from music/5-4_marches/cullen_bay/side.ly
rename to 5-4_marches/cullen_bay/side.ly
diff --git a/music/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly
similarity index 100%
rename from music/5-4_marches/cullen_bay/tenor.ly
rename to 5-4_marches/cullen_bay/tenor.ly
diff --git a/music/6-8_marches/16  10th HLI Crossing the Rhine.bww b/6-8_marches/16  10th HLI Crossing the Rhine.bww
similarity index 100%
rename from music/6-8_marches/16  10th HLI Crossing the Rhine.bww
rename to 6-8_marches/16  10th HLI Crossing the Rhine.bww
diff --git a/music/6-8_marches/19   Piobaireachd of Donald Dubh.bww b/6-8_marches/19   Piobaireachd of Donald Dubh.bww
similarity index 100%
rename from music/6-8_marches/19   Piobaireachd of Donald Dubh.bww
rename to 6-8_marches/19   Piobaireachd of Donald Dubh.bww
diff --git a/music/6-8_marches/Cock of the North The.bww b/6-8_marches/Cock of the North The.bww
similarity index 100%
rename from music/6-8_marches/Cock of the North The.bww
rename to 6-8_marches/Cock of the North The.bww
diff --git a/music/6-8_marches/Kilaloe.bww b/6-8_marches/Kilaloe.bww
similarity index 100%
rename from music/6-8_marches/Kilaloe.bww
rename to 6-8_marches/Kilaloe.bww
diff --git a/music/6-8_marches/Steamboat The.bww b/6-8_marches/Steamboat The.bww
similarity index 100%
rename from music/6-8_marches/Steamboat The.bww
rename to 6-8_marches/Steamboat The.bww
diff --git a/music/6-8_marches/hills_of_glenorchy/config.ily b/6-8_marches/hills_of_glenorchy/config.ily
similarity index 100%
rename from music/6-8_marches/hills_of_glenorchy/config.ily
rename to 6-8_marches/hills_of_glenorchy/config.ily
diff --git a/music/6-8_marches/hills_of_glenorchy/notes.side.ily b/6-8_marches/hills_of_glenorchy/notes.side.ily
similarity index 100%
rename from music/6-8_marches/hills_of_glenorchy/notes.side.ily
rename to 6-8_marches/hills_of_glenorchy/notes.side.ily
diff --git a/music/6-8_marches/hills_of_glenorchy/side.ly b/6-8_marches/hills_of_glenorchy/side.ly
similarity index 100%
rename from music/6-8_marches/hills_of_glenorchy/side.ly
rename to 6-8_marches/hills_of_glenorchy/side.ly
diff --git a/music/airs/10 set 9   The Mist Covered Mountains my home.bww b/airs/10 set 9   The Mist Covered Mountains my home.bww
similarity index 100%
rename from music/airs/10 set 9   The Mist Covered Mountains my home.bww
rename to airs/10 set 9   The Mist Covered Mountains my home.bww
diff --git a/music/airs/11  set 10  Morag of Dunvegan- BONNIE Galloway -We're No Awa'Tae Bide Awa.bww b/airs/11  set 10  Morag of Dunvegan- BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
similarity index 100%
rename from music/airs/11  set 10  Morag of Dunvegan- BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
rename to airs/11  set 10  Morag of Dunvegan- BONNIE Galloway -We're No Awa'Tae Bide Awa.bww
diff --git a/music/airs/21  Highland Cathedral (2).bww b/airs/21  Highland Cathedral (2).bww
similarity index 100%
rename from music/airs/21  Highland Cathedral (2).bww
rename to airs/21  Highland Cathedral (2).bww
diff --git a/music/airs/23  Abide with Me .bww b/airs/23  Abide with Me .bww
similarity index 100%
rename from music/airs/23  Abide with Me .bww
rename to airs/23  Abide with Me .bww
diff --git a/music/airs/24  Mull of Kintyre incl. brug.bww b/airs/24  Mull of Kintyre incl. brug.bww
similarity index 100%
rename from music/airs/24  Mull of Kintyre incl. brug.bww
rename to airs/24  Mull of Kintyre incl. brug.bww
diff --git a/music/airs/25  Amazing Grace .bww b/airs/25  Amazing Grace .bww
similarity index 100%
rename from music/airs/25  Amazing Grace .bww
rename to airs/25  Amazing Grace .bww
diff --git a/music/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily
similarity index 100%
rename from music/airs/abide_with_me/config.ily
rename to airs/abide_with_me/config.ily
diff --git a/music/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily
similarity index 100%
rename from music/airs/abide_with_me/notes.side.ily
rename to airs/abide_with_me/notes.side.ily
diff --git a/music/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly
similarity index 100%
rename from music/airs/abide_with_me/side.ly
rename to airs/abide_with_me/side.ly
diff --git a/music/airs/alexander_mackenzie/30 Alexander MacKenzie.bww b/airs/alexander_mackenzie/30 Alexander MacKenzie.bww
similarity index 100%
rename from music/airs/alexander_mackenzie/30 Alexander MacKenzie.bww
rename to airs/alexander_mackenzie/30 Alexander MacKenzie.bww
diff --git a/music/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily
similarity index 100%
rename from music/airs/alexander_mackenzie/config.ily
rename to airs/alexander_mackenzie/config.ily
diff --git a/music/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily
similarity index 100%
rename from music/airs/alexander_mackenzie/notes.side.ily
rename to airs/alexander_mackenzie/notes.side.ily
diff --git a/music/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly
similarity index 100%
rename from music/airs/alexander_mackenzie/side.ly
rename to airs/alexander_mackenzie/side.ly
diff --git a/music/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily
similarity index 100%
rename from music/airs/amazing_grace/config.ily
rename to airs/amazing_grace/config.ily
diff --git a/music/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily
similarity index 100%
rename from music/airs/amazing_grace/notes.side.ily
rename to airs/amazing_grace/notes.side.ily
diff --git a/music/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly
similarity index 100%
rename from music/airs/amazing_grace/side.ly
rename to airs/amazing_grace/side.ly
diff --git a/music/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily
similarity index 100%
rename from music/airs/farewell_to_camraw/config.ily
rename to airs/farewell_to_camraw/config.ily
diff --git a/music/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly
similarity index 100%
rename from music/airs/farewell_to_camraw/drums.ly
rename to airs/farewell_to_camraw/drums.ly
diff --git a/music/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily
similarity index 100%
rename from music/airs/farewell_to_camraw/notes.side.ily
rename to airs/farewell_to_camraw/notes.side.ily
diff --git a/music/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily
similarity index 100%
rename from music/airs/farewell_to_camraw/notes.tenor.ily
rename to airs/farewell_to_camraw/notes.tenor.ily
diff --git a/music/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly
similarity index 100%
rename from music/airs/farewell_to_camraw/side.ly
rename to airs/farewell_to_camraw/side.ly
diff --git a/music/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly
similarity index 100%
rename from music/airs/farewell_to_camraw/tenor.ly
rename to airs/farewell_to_camraw/tenor.ly
diff --git a/music/airs/flower_of_scotland/5 Flower Of Scotland.bww b/airs/flower_of_scotland/5 Flower Of Scotland.bww
similarity index 100%
rename from music/airs/flower_of_scotland/5 Flower Of Scotland.bww
rename to airs/flower_of_scotland/5 Flower Of Scotland.bww
diff --git a/music/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily
similarity index 100%
rename from music/airs/flower_of_scotland/config.ily
rename to airs/flower_of_scotland/config.ily
diff --git a/music/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily
similarity index 100%
rename from music/airs/flower_of_scotland/notes.side.ily
rename to airs/flower_of_scotland/notes.side.ily
diff --git a/music/airs/flower_of_scotland/side.ly b/airs/flower_of_scotland/side.ly
similarity index 100%
rename from music/airs/flower_of_scotland/side.ly
rename to airs/flower_of_scotland/side.ly
diff --git a/music/airs/loch_duich/Loch Duich.bww b/airs/loch_duich/Loch Duich.bww
similarity index 100%
rename from music/airs/loch_duich/Loch Duich.bww
rename to airs/loch_duich/Loch Duich.bww
diff --git a/music/airs/loch_duich/config.ily b/airs/loch_duich/config.ily
similarity index 100%
rename from music/airs/loch_duich/config.ily
rename to airs/loch_duich/config.ily
diff --git a/music/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily
similarity index 100%
rename from music/airs/loch_duich/notes.side.ily
rename to airs/loch_duich/notes.side.ily
diff --git a/music/airs/loch_duich/side.ly b/airs/loch_duich/side.ly
similarity index 100%
rename from music/airs/loch_duich/side.ly
rename to airs/loch_duich/side.ly
diff --git a/music/airs/miss_kirkwood/MISSKIRK.bww b/airs/miss_kirkwood/MISSKIRK.bww
similarity index 100%
rename from music/airs/miss_kirkwood/MISSKIRK.bww
rename to airs/miss_kirkwood/MISSKIRK.bww
diff --git a/music/airs/miss_kirkwood/Mrs Kirkwood-and-seconds.bww b/airs/miss_kirkwood/Mrs Kirkwood-and-seconds.bww
similarity index 100%
rename from music/airs/miss_kirkwood/Mrs Kirkwood-and-seconds.bww
rename to airs/miss_kirkwood/Mrs Kirkwood-and-seconds.bww
diff --git a/music/airs/miss_kirkwood/Mrs Kirkwood.bww b/airs/miss_kirkwood/Mrs Kirkwood.bww
similarity index 100%
rename from music/airs/miss_kirkwood/Mrs Kirkwood.bww
rename to airs/miss_kirkwood/Mrs Kirkwood.bww
diff --git a/music/airs/miss_kirkwood/config.ily b/airs/miss_kirkwood/config.ily
similarity index 100%
rename from music/airs/miss_kirkwood/config.ily
rename to airs/miss_kirkwood/config.ily
diff --git a/music/airs/miss_kirkwood/notes.side.ily b/airs/miss_kirkwood/notes.side.ily
similarity index 100%
rename from music/airs/miss_kirkwood/notes.side.ily
rename to airs/miss_kirkwood/notes.side.ily
diff --git a/music/airs/miss_kirkwood/side.ly b/airs/miss_kirkwood/side.ly
similarity index 100%
rename from music/airs/miss_kirkwood/side.ly
rename to airs/miss_kirkwood/side.ly
diff --git a/music/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly
similarity index 100%
rename from music/airs/morag_of_dunvegan/bass.ly
rename to airs/morag_of_dunvegan/bass.ly
diff --git a/music/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily
similarity index 100%
rename from music/airs/morag_of_dunvegan/config.ily
rename to airs/morag_of_dunvegan/config.ily
diff --git a/music/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly
similarity index 100%
rename from music/airs/morag_of_dunvegan/drums.ly
rename to airs/morag_of_dunvegan/drums.ly
diff --git a/music/airs/morag_of_dunvegan/notes.bass.ily b/airs/morag_of_dunvegan/notes.bass.ily
similarity index 100%
rename from music/airs/morag_of_dunvegan/notes.bass.ily
rename to airs/morag_of_dunvegan/notes.bass.ily
diff --git a/music/airs/morag_of_dunvegan/notes.side.ily b/airs/morag_of_dunvegan/notes.side.ily
similarity index 100%
rename from music/airs/morag_of_dunvegan/notes.side.ily
rename to airs/morag_of_dunvegan/notes.side.ily
diff --git a/music/airs/morag_of_dunvegan/notes.tenor.ily b/airs/morag_of_dunvegan/notes.tenor.ily
similarity index 100%
rename from music/airs/morag_of_dunvegan/notes.tenor.ily
rename to airs/morag_of_dunvegan/notes.tenor.ily
diff --git a/music/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly
similarity index 100%
rename from music/airs/morag_of_dunvegan/side.ly
rename to airs/morag_of_dunvegan/side.ly
diff --git a/music/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly
similarity index 100%
rename from music/airs/morag_of_dunvegan/tenor.ly
rename to airs/morag_of_dunvegan/tenor.ly
diff --git a/music/airs/my_home/config.ily b/airs/my_home/config.ily
similarity index 100%
rename from music/airs/my_home/config.ily
rename to airs/my_home/config.ily
diff --git a/music/airs/my_home/drums.ly b/airs/my_home/drums.ly
similarity index 100%
rename from music/airs/my_home/drums.ly
rename to airs/my_home/drums.ly
diff --git a/music/airs/my_home/notes.bass.ily b/airs/my_home/notes.bass.ily
similarity index 100%
rename from music/airs/my_home/notes.bass.ily
rename to airs/my_home/notes.bass.ily
diff --git a/music/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily
similarity index 100%
rename from music/airs/my_home/notes.side.ily
rename to airs/my_home/notes.side.ily
diff --git a/music/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily
similarity index 100%
rename from music/airs/my_home/notes.tenor.ily
rename to airs/my_home/notes.tenor.ily
diff --git a/music/airs/my_home/side.ly b/airs/my_home/side.ly
similarity index 100%
rename from music/airs/my_home/side.ly
rename to airs/my_home/side.ly
diff --git a/music/airs/my_home/tenor.ly b/airs/my_home/tenor.ly
similarity index 100%
rename from music/airs/my_home/tenor.ly
rename to airs/my_home/tenor.ly
diff --git a/music/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily
similarity index 100%
rename from music/airs/the_mist_covered_mountains/config.ily
rename to airs/the_mist_covered_mountains/config.ily
diff --git a/music/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly
similarity index 100%
rename from music/airs/the_mist_covered_mountains/drums.ly
rename to airs/the_mist_covered_mountains/drums.ly
diff --git a/music/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily
similarity index 100%
rename from music/airs/the_mist_covered_mountains/notes.side.ily
rename to airs/the_mist_covered_mountains/notes.side.ily
diff --git a/music/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily
similarity index 100%
rename from music/airs/the_mist_covered_mountains/notes.tenor.ily
rename to airs/the_mist_covered_mountains/notes.tenor.ily
diff --git a/music/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly
similarity index 100%
rename from music/airs/the_mist_covered_mountains/side.ly
rename to airs/the_mist_covered_mountains/side.ly
diff --git a/music/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly
similarity index 100%
rename from music/airs/the_mist_covered_mountains/tenor.ly
rename to airs/the_mist_covered_mountains/tenor.ly
diff --git a/bagpipemusic b/bagpipemusic
deleted file mode 160000
index fdbbc7c..0000000
--- a/bagpipemusic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fdbbc7c354e6c7c03f2c987cded0d67e09d688aa
diff --git a/build b/build
deleted file mode 100644
index 2d70610..0000000
--- a/build
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-MKDRUMCOMMAND="./lilydrum/makedrum"
-MKDRUMOPTIONS="--no-log -i ./defs/defs.ly -i ./defs/header_default.ily --drumfile ./lilydrum/lilydrum.ly --pipefile ./bagpipemusic/bagpipe_new.ly -s 18"
-MUSIC_DIR="./music/"
-OUT_DIR="./pdf"
-MKDRUMOPTIONS="$MKDRUMOPTIONS -d $OUT_DIR"
-
-trap "echo Aborted!; exit;" SIGINT SIGTERM
-
-another_dir() {
-	d=$1
-	for f in $d/*
-	do
-		if [ -d "$f" ]; then
-			if [ "$f" == "template" ]; then
-				continue
-			fi
-
-			another_dir $f
-			continue
-		fi
-		if [ ! -f "$f" ]; then
-			continue
-		fi
-
-		if [[ ! "$f" == *.ly ]]; then
-			continue
-		fi
-
-		$MKDRUMCOMMAND $MKDRUMOPTIONS "$f"
-	done;
-}
-
-if [ "$1" == "--all" ]; then
-	echo "Build all"
-	another_dir $MUSIC_DIR
-elif [ -f "$1" ]; then
-	echo "Build file"
-	$MKDRUMCOMMAND $MKDRUMOPTIONS "$1"
-elif [ -d "$1" ]; then
-	echo "Build files in directory"
-	another_dir "$1"
-fi
-
-# Fix naming
-for f in $OUT_DIR/music-* ;
-do
-#if [[ ! "$f" == *music-* ]]; then
-#	continue;
-#fi
-mv "$f" "${f/"music-"}";
-done;
diff --git a/bwwtolily/README.md b/bwwtolily/README.md
deleted file mode 100644
index 6a51a5e..0000000
--- a/bwwtolily/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-bwwtolily will attempt to convert a .bww or .bmw file to a lilypond
-(http://lilypond.org) parsable file. Not all of the embellishments 
-get converted properly, this is espessially true with piobaireachd,
-and the program will list the embellishments that were not converted.
-
-If you recognize an embellishment that isn't being parsed, please 
-send an email regarding the embellishment to jezra@jezra.net and I
-will try to add the embellishment to the application.
-
-usage:
->bwwtolily -i /path/to/a/bww/file
-
-optionally, using the "-l" flag will try to run lilypond on the
-created .ly file
-example:
->bwwtolily -i /path/to/bww/file -l
-
diff --git a/bwwtolily/bwwtolily.py b/bwwtolily/bwwtolily.py
deleted file mode 100644
index ae235d5..0000000
--- a/bwwtolily/bwwtolily.py
+++ /dev/null
@@ -1,391 +0,0 @@
-#!/usr/bin/env python
-#
-#bwwtolily: will convert a bww file to a lilypond file
-#copyright: 2008 Jezra Lickter
-#GPL v3
-
-from optparse import OptionParser
-import sys,os,re,subprocess
-
-version = "0.4.2"
-
-#make a print function to handle various version of python
-def do_print(string):
-	try:
-		eval("print "+string)
-	except:
-		print(string)
-
-#define the class that will convert a bww file to a lilypond file
-class bwwtolily :
-	def __init__(self,addmidi=False):
-			self.tune_elements = []
-			self.most_recent_note = 0
-			self.in_note_group=False
-			self.slur_tie_pending = False
-			self.last_group_close=0
-			'''compile a few regex queries'''
-			#make a regex to determine if something is a lilypond note
-			self.regex_lilynote= re.compile("[abcdefgAG][0-9]*")
-			#try to determine the time signature
-			self.sig_regex = re.compile("([0-9])_([0-9])")
-			#a regex to find notes
-			self.regex_note_info=re.compile("(?P<note>[A-Z]+)(?P<dir>[a-z]*)_(?P<time>[0-9]{1,2})")
-			#a regex to find grace notes
-			self.regex_grace_note = re.compile("([h|l]*[abcdefgt])g")
-			#a regex to parse doublings
-			self.regex_doubling = re.compile("^db([h|l]*[g|a|b|c|d|e|f]{1})")
-			#a regex to parse half_doublings
-			self.regex_half_doubling = re.compile("^hdb([h|l]*[g|a|b|c|d|e|f]{1})")
-			#a regex for finding strikes
-			self.regex_strike = re.compile("str([h|l]*[abcdefg])")
-			#a regex to find dots
-			self.regex_dot = re.compile("'[h|l]*[abcdefg]")
-			#a regex to find sub repeats
-			self.regex_sub_repeat = re.compile("'([0-9]+)")
-			#a regex to find note slurs, not slur embellishments
-			self.regex_slur = re.compile("\^(?P<note_count>[0-9])(?P<end_note>[a-z]*)")
-			#a regex to find ties
-			self.regex_tie = re.compile("\^ts(.*)*\^te")
-			#we need a list to ignore
-			self.ignore_elements = ("sharpf","sharpc","space","&")
-			#create a dictionary of common bww elements and their lily counterparts
-			self.transpose_dict = {
-			"!":"\\bar \"|\"\n",
-			"!I":"\\bar \".|\" \\break \n",
-			#"''!I":"\\set Score.repeatCommands = #'( end-repeat ) \\break \n",
-			"''!I":"\\bar \":|\" \\break\n",
-			#"''!I":"} \\break \n",
-			"I!''":"\\bar \"|:\"",
-			"I!":"\\bar \"|.\"",
-			#"I!''":"\\set Score.repeatCommands = #'( start-repeat )\n",
-
-			#"I!''":"\n\\repeat volta 2 {\n",
-			"_'":"\\set Score.repeatCommands = #'((volta #f)) \\bar \"|\"\n",
-			"!t":"\\bar \"|\" \\break\n\n",
-			"thrd":"\\thrwd",
-			"gbr":"\\gbirl",
-			"brl":"\\wbirl",
-			"abr":"\\birl",
-			"lgstd":"\\dbld",
-			"gste":"\\slure",
-			"grp":"\\grip",
-			"tar":"\\taor",
-			"gstd":"\\slurd",
-			"tdbf":"\\tdblf"
-			}
-			#are we adding midi?
-			if addmidi:
-				self.lily_midi="\midi{}"
-			else:
-				self.lily_midi=''
-
-	def set_file(self,file_path):
-			#determine the absolute path to the file
-			abs_file = os.path.join(os.getcwd(),file_path)
-			file_name = os.path.basename(abs_file)
-			(self.name,ext) = file_name.split(".")
-
-			#does the file exist?
-			if os.path.isfile(abs_file):
-				self.original_file = abs_file
-				self.file_dir = os.path.dirname(abs_file)
-			else:
-				raise Exception(bww_file_path+" is not a file")
-
-	def quit(self,string=""):
-			if string!="":
-				do_print( string)
-			sys.exit()
-
-	def parse(self):
-			'''reate a string that represents the converted
-			contents of the file'''
-			#open the file read only
-			file_handle = open(self.original_file,"r")
-			#read the contents of the file
-			file_text = file_handle.read()
-			#get the title,type,author of the file, these are in quotes
-			quote_regex = re.compile("\"(.*)\"")
-			tune_info = quote_regex.findall(file_text)
-			self.tune_title = tune_info[0]
-			self.tune_type = tune_info[1]
-			self.tune_author = tune_info[2]
-			#try to determine the time signature
-			result = self.sig_regex.search(file_text)
-			if result:
-				self.tune_time_sig = result.group(1)+"/"+result.group(2)
-			else:
-				self.tune_time_sig = "4/4"
-
-			#get the tunes note info
-			'''greedy, multiline, from first ampersand to !'''
-			notes_regex = re.compile("&.*!I",re.S)
-			result = notes_regex.search(file_text)
-			try:
-				tune_notes = result.group()
-			except:
-				#no notes were found, what kind of file is this
-				self.quit("No notes were found.\nIs this a valid input file?")
-			#replace all whitespace characters with spaces
-			tune_notes = tune_notes.replace("\r"," ")
-			tune_notes = tune_notes.replace("\n"," ")
-			tune_notes = tune_notes.replace("\t"," ")
-
-			#split the string into it's constituents elements
-			elements = tune_notes.split()
-			for element in elements:
-				self.transpose(element)
-
-	def lilynote(self,bwwname):
-			#convert a bww notename to a lilypond notename
-			#make the notename lowercase
-			notename = bwwname.lower()
-
-			if notename =="lg":
-				lilynote = "G"
-			elif notename == "la":
-				lilynote ="a"
-			elif notename == "hg":
-				lilynote = "g"
-			elif notename == "ha" or notename =="t":
-				lilynote = "A"
-			else:
-				lilynote = notename
-			return lilynote
-
-	def transpose(self,element):
-			#receive a bww element and return a lilypond equivelent
-
-			#is the element a note?
-			note_result = self.regex_note_info.search(element)
-			if note_result:
-				note = self.lilynote( note_result.group("note") )+note_result.group("time")
-				#is a tie slur pending?
-				if self.slur_tie_pending:
-					self.slur_tie_pending=False
-					note+="~"
-				self.tune_elements.append(note)
-				self.most_recent_note = len(self.tune_elements)-1
-				if note_result.group("dir") == "r" and not self.in_note_group:
-					self.in_note_group=True
-					self.tune_elements.append("[")
-				elif note_result.group("dir") == "l":
-					if self.in_note_group:
-							self.in_note_group=False
-							self.tune_elements.append("]")
-							self.last_group_close = len(self.tune_elements)-1
-					else:
-							#delete the last group close
-							del(self.tune_elements[self.last_group_close])
-							#decrement the most recent note
-							self.most_recent_note-=1
-							self.tune_elements.append("]")
-				return
-			#is the element a grace note?
-			grace_result=self.regex_grace_note.search(element)
-			if grace_result:
-				grace = "\\gr"+self.lilynote( grace_result.group(1) )
-				self.tune_elements.append(grace)
-				return
-			#is the element a doubling?
-			doubling_result=self.regex_doubling.search(element)
-			if doubling_result:
-				doubling = "\\dbl"+self.lilynote( doubling_result.group(1) )
-				self.tune_elements.append(doubling)
-				return
-			#is the element a half doubling?
-			hdoubling_result=self.regex_half_doubling.search(element)
-			if hdoubling_result:
-				half_doubling = "\\hdbl"+self.lilynote( hdoubling_result.group(1) )
-				self.tune_elements.append(half_doubling)
-				return
-			#is the element a strike?
-			strike_result=self.regex_strike.search(element)
-			if strike_result:
-				strike = "\\slur"+self.lilynote( strike_result.group(1) )
-				#if the strike is on low g \\slurG
-				if strike =="\\slurG":
-					#let the strike be a low g grace note
-					strike = "\\grG"
-				#if the strike is on high G
-				elif strike =="\\slurg":
-					#let the strike be a grace note on the high g
-					strike = "\\grg"
-				#if hte strike is on low a
-				elif strike == "\\slura":
-					#let the strike be a grace not on low a
-					strike = "\\gra"
-				self.tune_elements.append(strike)
-				return
-			#is the element a dot?
-			dot_result=self.regex_dot.search(element)
-			if dot_result:
-				#add a dot to the last note
-				note = self.tune_elements[self.most_recent_note]
-				if note[-1]=="~":
-					self.tune_elements[self.most_recent_note].replace("~",".~")
-				else:
-					self.tune_elements[self.most_recent_note]+="."
-				return
-
-			#is the element a slur?
-			slur_result = self.regex_slur.search(element)
-			if slur_result:
-				#get the matching elements
-				note_count = slur_result.group("note_count")
-				end_note = slur_result.group("end_note")
-				#get the length of the slur as an integer
-				slur_len = int(note_count)
-				'''find the position of the note that is slur_len from the end'''
-				#get the tune_elements lenght
-				elem_index = len(self.tune_elements)-1
-				note_count = 0
-				while note_count<2:
-					element = self.tune_elements[elem_index]
-					#is this element a note?
-					is_note = self.regex_lilynote.search(element)
-					if is_note:
-							#increment the note count
-							note_count+=1
-					#decrease the element index
-					elem_index-=1
-
-				#add the slur start just after the start note
-				self.tune_elements.insert(elem_index+1,"(")
-				#add the slur end
-				self.tune_elements.append(")")
-				return
-			#is this a bww tie slur?
-			if element == "^ts":
-				self.slur_tie_pending = True
-				return
-			tie_result = self.regex_tie.search(element)	
-			if tie_result:
-				#get first note
-				self.do_print('Tie found')
-			#is the element the start of a sub_repeat?
-			sub_repeat_result = self.regex_sub_repeat.search(element)
-			if sub_repeat_result:
-				sub_repeat = "\\set Score.repeatCommands = #'((volta \"%s\")) " % ( sub_repeat_result.group(1) )
-				self.tune_elements.append(sub_repeat)
-				return
-			else:
-				#is the element in the ignore list?
-				if element in self.ignore_elements:
-					return
-
-				#if the element is a start double,
-				#check if the previous element was a end double
-				if len(self.tune_elements):
-					last_element = self.tune_elements[-1]
-					if element=="I!''" and last_element.find(":|"):
-							#replace the last element with a double double
-							self.tune_elements[-1] = "\\bar \":|:\" \\break\n\n"
-							return
-				#is this a time sig?
-				result = self.sig_regex.search(element)
-				if result:
-					return
-				try:
-
-					dict_result = self.transpose_dict[element]
-					if dict_result:
-							self.tune_elements.append(dict_result)
-							return
-				except:
-					do_print( "unparsed: "+element)
-			return
-
-	#handle writing the output
-	def create_output_file(self):
-			#determine the output file
-			output_file = os.path.join(self.file_dir,self.name+".ly")
-			#open the file for writing
-			file_handle = open(output_file,"w")
-			#write the data to the file
-			text = self.get_lilypond_text()
-			file_handle.write(text)
-			#close the handle
-			file_handle.close()
-			#return the string of the path to the file
-			return output_file
-
-	def get_lilypond_text(self):
-			tune_text = " ".join(self.tune_elements)
-			lptext ='''\\include "bagpipe.ly"
-melody = {
-		\\set Staff.midiInstrument = #"bagpipe"
-		\\hideKeySignature
-		\\cadenzaOn
-		\\once \\override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\\time %s
-		%s
-			}
-
-\\score {
-	\\melody
-	\\layout {
-	indent = 0.0\\cm
-	\\context { \\Score \\remove "Bar_number_engraver" }
-	}
-	\\header {
-	title = "%s"
-	meter = "%s"
-	arranger = "%s"
-	}
-	%s
-}
-
-''' % (self.tune_time_sig,
-			tune_text,
-			self.tune_title,
-			self.tune_type,
-			self.tune_author,
-			self.lily_midi
-			)
-			return lptext
-
-#use the bww2lily class
-if __name__ == "__main__" :
-	parser = OptionParser()
-	parser.add_option("-i", "--in", dest="input",
-			help="the FILE to convert", metavar="FILE")
-	parser.add_option("-l", "--lilypond",
-			action="store_true", dest="runlilypond",default=False,
-			help="run lilypond after converting the file")
-	parser.add_option("-m", "--midi",
-			action="store_true", dest="addmidi",default=False,
-			help="add midi output to the lilypond file")
-	parser.add_option("-v","--version",dest='version',default=False,
-			action="store_true",help="print version information and quit")
-
-	#parse the args
-	(options, args) = parser.parse_args()
-	if options.version:
-			do_print( "bwwtolily: "+version)
-			sys.exit()
-
-	if options.input!=None:
-			b2l = bwwtolily(options.addmidi)
-			b2l.set_file(options.input)
-			b2l.parse()
-			new_file = b2l.create_output_file()
-			#are we running lilypond?
-			if options.runlilypond:
-				#try to run lilypond as a subprocess
-				subprocess.check_call("lilypond \""+new_file+"\"",shell=True)
-	else:
-		parser.print_help()
-sys.exit()
diff --git a/defs/defs.ly b/defs/defs.ly
deleted file mode 100644
index c2bb2f9..0000000
--- a/defs/defs.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-% ===================================================	%
-% 	*Shorts* for Naming									%
-% ===================================================	%
-
-instrumentSide = "Side"
-instrumentTenor = "Tenor"
-instrumentBass = "Bass"
-instrumentPipes = "Pipes"
-instrumentPipessecnd = "Seconds"
-instrumentPipesthrd = "Thirds"
-shortInstrumentSide = "S.D."
-shortInstrumentTenor = "T.D."
-shortInstrumentBass = "B.D."
-shortInstrumentPipes = "P."
-shortInstrumentPipessecnd = "P.2"
-shortInstrumentPipesthrd = "P.3"
-composerSide  = ""
-composerTenor = ""
-composerBass  = ""
-composerPipes = ""
-composerPipessecnd = ""
-composerPipesthrd = ""
diff --git a/defs/header_book.ily b/defs/header_book.ily
deleted file mode 100644
index 1225132..0000000
--- a/defs/header_book.ily
+++ /dev/null
@@ -1,42 +0,0 @@
-%{
-    Header formatting for tunes. Customize to get your name in the tag line.
-%}
-
-\version "2.16.0"
-
-today = #(strftime "%B %e, %Y" (localtime (current-time)))
-
-\paper {
-    raggedbottom = ##t
-    tagline = \markup {
-        \line {
-            "ET de Boone, Seaforths of Holland,"
-            \concat { "(rev. " \today ")" }
-        }
-    }
-    bookTitleMarkup = \markup {
-      \override #'(baseline-skip . 3.5)
-      \column {
-        \fill-line { \fromproperty #'header:dedication }
-        \override #'(baseline-skip . 3.5)
-        \column {
-          \huge \larger \bold
-          \fill-line {
-            \larger \fromproperty #'header:title
-          }
-          \fill-line {
-            \large \smaller \bold
-            \larger \fromproperty #'header:subtitle
-          }
-          \fill-line {
-            \smaller \bold
-            \fromproperty #'header:source
-          }
-          \fill-line {
-          \line { \fromproperty #'header:meter }
-          \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
-          }
-        }
-      }
-    }
-}
diff --git a/defs/header_default.ily b/defs/header_default.ily
deleted file mode 100644
index c9a5fd3..0000000
--- a/defs/header_default.ily
+++ /dev/null
@@ -1,39 +0,0 @@
-%{
-    Header formatting for tunes. Customize to get your name in the tag line.
-%}
-
-\version "2.16.0"
-
-today = #(strftime "%B %e, %Y" (localtime (current-time)))
-
-\paper {
-    tagline = \markup {
-        \line {
-	"ET de Boone, Seaforths of Holland,"
-            \concat { "(rev. " \today ")" }
-        }
-    }
-    scoreTitleMarkup = \markup {
-        \override #'(baseline-skip . 3)
-        \column {
-            \fill-line {
-                \column {
-                    \large \bold \fromproperty #'header:title
-                    \bold \fromproperty #'header:subtitle
-                }
-                \fromproperty #'header:meter
-                \column \right-align {
-					\fromproperty #'header:instrument
-					\line {
-						\fromproperty #'header:composer
-						$(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger))
-							(markup " "))
-						\italic \fromproperty #'header:arranger }
-				}
-            }
-            $(if (not (ly:get-option 'without-comment))
-                 (markup #:justify-field 'header:comment)
-                 (markup))
-        }
-    }
-}
diff --git a/music/hornpipes/itchy_fingers/config.ily b/hornpipes/itchy_fingers/config.ily
similarity index 100%
rename from music/hornpipes/itchy_fingers/config.ily
rename to hornpipes/itchy_fingers/config.ily
diff --git a/music/hornpipes/itchy_fingers/notes.side.ily b/hornpipes/itchy_fingers/notes.side.ily
similarity index 100%
rename from music/hornpipes/itchy_fingers/notes.side.ily
rename to hornpipes/itchy_fingers/notes.side.ily
diff --git a/music/hornpipes/itchy_fingers/side.ly b/hornpipes/itchy_fingers/side.ly
similarity index 100%
rename from music/hornpipes/itchy_fingers/side.ly
rename to hornpipes/itchy_fingers/side.ly
diff --git a/music/hornpipes/the_walrus/Walrus The.bww b/hornpipes/the_walrus/Walrus The.bww
similarity index 100%
rename from music/hornpipes/the_walrus/Walrus The.bww
rename to hornpipes/the_walrus/Walrus The.bww
diff --git a/music/hornpipes/the_walrus/bass.ly b/hornpipes/the_walrus/bass.ly
similarity index 100%
rename from music/hornpipes/the_walrus/bass.ly
rename to hornpipes/the_walrus/bass.ly
diff --git a/music/hornpipes/the_walrus/config.ily b/hornpipes/the_walrus/config.ily
similarity index 100%
rename from music/hornpipes/the_walrus/config.ily
rename to hornpipes/the_walrus/config.ily
diff --git a/music/hornpipes/the_walrus/full.ly b/hornpipes/the_walrus/full.ly
similarity index 100%
rename from music/hornpipes/the_walrus/full.ly
rename to hornpipes/the_walrus/full.ly
diff --git a/music/hornpipes/the_walrus/notes.bass.ily b/hornpipes/the_walrus/notes.bass.ily
similarity index 100%
rename from music/hornpipes/the_walrus/notes.bass.ily
rename to hornpipes/the_walrus/notes.bass.ily
diff --git a/music/hornpipes/the_walrus/notes.pipes.ily b/hornpipes/the_walrus/notes.pipes.ily
similarity index 100%
rename from music/hornpipes/the_walrus/notes.pipes.ily
rename to hornpipes/the_walrus/notes.pipes.ily
diff --git a/music/hornpipes/the_walrus/notes.side.ily b/hornpipes/the_walrus/notes.side.ily
similarity index 100%
rename from music/hornpipes/the_walrus/notes.side.ily
rename to hornpipes/the_walrus/notes.side.ily
diff --git a/music/hornpipes/the_walrus/pipes.ly b/hornpipes/the_walrus/pipes.ly
similarity index 100%
rename from music/hornpipes/the_walrus/pipes.ly
rename to hornpipes/the_walrus/pipes.ly
diff --git a/music/hornpipes/the_walrus/side.ly b/hornpipes/the_walrus/side.ly
similarity index 100%
rename from music/hornpipes/the_walrus/side.ly
rename to hornpipes/the_walrus/side.ly
diff --git a/music/jigs/seaforth_sticks/config.ily b/jigs/seaforth_sticks/config.ily
similarity index 100%
rename from music/jigs/seaforth_sticks/config.ily
rename to jigs/seaforth_sticks/config.ily
diff --git a/music/jigs/seaforth_sticks/drums.ly b/jigs/seaforth_sticks/drums.ly
similarity index 100%
rename from music/jigs/seaforth_sticks/drums.ly
rename to jigs/seaforth_sticks/drums.ly
diff --git a/music/jigs/seaforth_sticks/notes.bass.ily b/jigs/seaforth_sticks/notes.bass.ily
similarity index 100%
rename from music/jigs/seaforth_sticks/notes.bass.ily
rename to jigs/seaforth_sticks/notes.bass.ily
diff --git a/music/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily
similarity index 100%
rename from music/jigs/seaforth_sticks/notes.side.ily
rename to jigs/seaforth_sticks/notes.side.ily
diff --git a/music/jigs/seaforth_sticks/notes.tenor.ily b/jigs/seaforth_sticks/notes.tenor.ily
similarity index 100%
rename from music/jigs/seaforth_sticks/notes.tenor.ily
rename to jigs/seaforth_sticks/notes.tenor.ily
diff --git a/music/jigs/seaforth_sticks/side.ly b/jigs/seaforth_sticks/side.ly
similarity index 100%
rename from music/jigs/seaforth_sticks/side.ly
rename to jigs/seaforth_sticks/side.ly
diff --git a/music/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly
similarity index 100%
rename from music/jigs/seaforth_sticks/tenor.ly
rename to jigs/seaforth_sticks/tenor.ly
diff --git a/lilydrum b/lilydrum
deleted file mode 160000
index c6a9c95..0000000
--- a/lilydrum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6a9c956321a175e33e1668cea8e8e3e19cb7a0e
diff --git a/music/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly
similarity index 100%
rename from music/other/band_of_brothers.snare.ly
rename to other/band_of_brothers.snare.ly
diff --git a/music/reels/the_mackenzies_reel/config.ily b/reels/the_mackenzies_reel/config.ily
similarity index 100%
rename from music/reels/the_mackenzies_reel/config.ily
rename to reels/the_mackenzies_reel/config.ily
diff --git a/music/reels/the_mackenzies_reel/notes.pipes.ily b/reels/the_mackenzies_reel/notes.pipes.ily
similarity index 100%
rename from music/reels/the_mackenzies_reel/notes.pipes.ily
rename to reels/the_mackenzies_reel/notes.pipes.ily
diff --git a/music/reels/the_mackenzies_reel/pipes.ly b/reels/the_mackenzies_reel/pipes.ly
similarity index 100%
rename from music/reels/the_mackenzies_reel/pipes.ly
rename to reels/the_mackenzies_reel/pipes.ly
diff --git a/music/standards/24_standards.side.ly b/standards/24_standards.side.ly
similarity index 100%
rename from music/standards/24_standards.side.ly
rename to standards/24_standards.side.ly
diff --git a/music/standards/34_standards1.side.ly b/standards/34_standards1.side.ly
similarity index 100%
rename from music/standards/34_standards1.side.ly
rename to standards/34_standards1.side.ly
diff --git a/music/standards/34_standards2.side.ly b/standards/34_standards2.side.ly
similarity index 100%
rename from music/standards/34_standards2.side.ly
rename to standards/34_standards2.side.ly
diff --git a/music/standards/34_standards3.side.ly b/standards/34_standards3.side.ly
similarity index 100%
rename from music/standards/34_standards3.side.ly
rename to standards/34_standards3.side.ly
diff --git a/music/standards/44_standards.side.ly b/standards/44_standards.side.ly
similarity index 100%
rename from music/standards/44_standards.side.ly
rename to standards/44_standards.side.ly
diff --git a/music/standards/68_standards.side.ly b/standards/68_standards.side.ly
similarity index 100%
rename from music/standards/68_standards.side.ly
rename to standards/68_standards.side.ly
diff --git a/music/standards/standards.bass.ly b/standards/standards.bass.ly
similarity index 100%
rename from music/standards/standards.bass.ly
rename to standards/standards.bass.ly
diff --git a/music/standards/standards.tenor.ly b/standards/standards.tenor.ly
similarity index 100%
rename from music/standards/standards.tenor.ly
rename to standards/standards.tenor.ly
diff --git a/music/strathspeys/aa_camerons/config.ily b/strathspeys/aa_camerons/config.ily
similarity index 100%
rename from music/strathspeys/aa_camerons/config.ily
rename to strathspeys/aa_camerons/config.ily
diff --git a/music/strathspeys/aa_camerons/notes.side.ily b/strathspeys/aa_camerons/notes.side.ily
similarity index 100%
rename from music/strathspeys/aa_camerons/notes.side.ily
rename to strathspeys/aa_camerons/notes.side.ily
diff --git a/music/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly
similarity index 100%
rename from music/strathspeys/aa_camerons/side.ly
rename to strathspeys/aa_camerons/side.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww b/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww
rename to strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/bass.ly
rename to strathspeys/lady_mackenzie_of_fairburn/bass.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/config.ily
rename to strathspeys/lady_mackenzie_of_fairburn/config.ily
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/drums.ly
rename to strathspeys/lady_mackenzie_of_fairburn/drums.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/full.ly
rename to strathspeys/lady_mackenzie_of_fairburn/full.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily
rename to strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
rename to strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
rename to strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
rename to strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
rename to strathspeys/lady_mackenzie_of_fairburn/pipes.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/side.ly
rename to strathspeys/lady_mackenzie_of_fairburn/side.ly
diff --git a/music/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly
similarity index 100%
rename from music/strathspeys/lady_mackenzie_of_fairburn/tenor.ly
rename to strathspeys/lady_mackenzie_of_fairburn/tenor.ly
diff --git a/music/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly
similarity index 100%
rename from music/strathspeys/molly_connell/bass.ly
rename to strathspeys/molly_connell/bass.ly
diff --git a/music/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily
similarity index 100%
rename from music/strathspeys/molly_connell/config.ily
rename to strathspeys/molly_connell/config.ily
diff --git a/music/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly
similarity index 100%
rename from music/strathspeys/molly_connell/drums.ly
rename to strathspeys/molly_connell/drums.ly
diff --git a/music/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily
similarity index 100%
rename from music/strathspeys/molly_connell/notes.bass.ily
rename to strathspeys/molly_connell/notes.bass.ily
diff --git a/music/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily
similarity index 100%
rename from music/strathspeys/molly_connell/notes.side.ily
rename to strathspeys/molly_connell/notes.side.ily
diff --git a/music/strathspeys/molly_connell/notes.side.v1.1.ily b/strathspeys/molly_connell/notes.side.v1.1.ily
similarity index 100%
rename from music/strathspeys/molly_connell/notes.side.v1.1.ily
rename to strathspeys/molly_connell/notes.side.v1.1.ily
diff --git a/music/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily
similarity index 100%
rename from music/strathspeys/molly_connell/notes.tenor.ily
rename to strathspeys/molly_connell/notes.tenor.ily
diff --git a/music/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly
similarity index 100%
rename from music/strathspeys/molly_connell/side.ly
rename to strathspeys/molly_connell/side.ly
diff --git a/music/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly
similarity index 100%
rename from music/strathspeys/molly_connell/tenor.ly
rename to strathspeys/molly_connell/tenor.ly
diff --git a/music/template/bass.ly b/template/bass.ly
similarity index 100%
rename from music/template/bass.ly
rename to template/bass.ly
diff --git a/music/template/config.ily b/template/config.ily
similarity index 100%
rename from music/template/config.ily
rename to template/config.ily
diff --git a/music/template/drums.ly b/template/drums.ly
similarity index 100%
rename from music/template/drums.ly
rename to template/drums.ly
diff --git a/music/template/full.ly b/template/full.ly
similarity index 100%
rename from music/template/full.ly
rename to template/full.ly
diff --git a/music/template/notes.bass.ily b/template/notes.bass.ily
similarity index 100%
rename from music/template/notes.bass.ily
rename to template/notes.bass.ily
diff --git a/music/template/notes.pipes.ily b/template/notes.pipes.ily
similarity index 100%
rename from music/template/notes.pipes.ily
rename to template/notes.pipes.ily
diff --git a/music/template/notes.side.ily b/template/notes.side.ily
similarity index 100%
rename from music/template/notes.side.ily
rename to template/notes.side.ily
diff --git a/music/template/notes.tenor.ily b/template/notes.tenor.ily
similarity index 100%
rename from music/template/notes.tenor.ily
rename to template/notes.tenor.ily
diff --git a/music/template/pipes.ly b/template/pipes.ly
similarity index 100%
rename from music/template/pipes.ly
rename to template/pipes.ly
diff --git a/music/template/side.ly b/template/side.ly
similarity index 100%
rename from music/template/side.ly
rename to template/side.ly
diff --git a/music/template/tenor.ly b/template/tenor.ly
similarity index 100%
rename from music/template/tenor.ly
rename to template/tenor.ly