Rename directories.

parts -> music
instr -> parts

30 files changed, 659 insertions, 661 deletions

diff --git a/01-song1/01-song1.ly b/01-song1/01-song1.ly
index acd4036..bd9262e 100644
--- a/01-song1/01-song1.ly
+++ b/01-song1/01-song1.ly
@@ -12,10 +12,10 @@ nastyPause = {
 }
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/click.ly"
 
 AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
diff --git a/01-song1/parts/bass.ly b/01-song1/music/bass.ly
index 3d67d23..3d67d23 100644
--- a/01-song1/parts/bass.ly
+++ b/01-song1/music/bass.ly
diff --git a/01-song1/parts/click.ly b/01-song1/music/click.ly
index 4c91b8f..4c91b8f 100644
--- a/01-song1/parts/click.ly
+++ b/01-song1/music/click.ly
diff --git a/01-song1/parts/keys.ly b/01-song1/music/keys.ly
index 232dfed..232dfed 100644
--- a/01-song1/parts/keys.ly
+++ b/01-song1/music/keys.ly
diff --git a/01-song1/parts/stick.ly b/01-song1/music/stick.ly
index c10b8c5..c10b8c5 100644
--- a/01-song1/parts/stick.ly
+++ b/01-song1/music/stick.ly
diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index 72fdc5f..28f9db7 100644
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -7,11 +7,11 @@
 }
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/guitar.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/guitar.ly"
+\include "music/click.ly"
 
 \layout {
   ragged-last = ##t
diff --git a/02-song2/instr/bass.ly b/02-song2/instr/bass.ly
deleted file mode 100644
index cb38427..0000000
--- a/02-song2/instr/bass.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-\version "2.19.27"
-
-\header {
-  title = "Song 2"
-  subtitle = "Bass"
-  composer = "The very pretentious elephlies"
-  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
-}
-
-\include "../settings.ly"
-\include "parts/bass.ly"
-
-\score {
-  \compressMMRests { \bass }
-
-  \layout {
-    indent = #0
-    short-indent = #0
-    \context {
-      \Score
-      \numericTimeSignature
-    }
-  }
-}
diff --git a/02-song2/instr/guitar.ly b/02-song2/instr/guitar.ly
deleted file mode 100644
index c5bb6dc..0000000
--- a/02-song2/instr/guitar.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-\version "2.19.27"
-
-\header {
-  title = "Song 2"
-  subtitle = "Acoustic Guitar"
-  composer = "The very pretentious elephlies"
-  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
-}
-
-\include "../settings.ly"
-\include "parts/guitar.ly"
-
-\score {
-  \new TabStaff = "acoustic guitar"
-  \with {
-    stringTunings = #guitar-tuning
-    \RemoveEmptyStaves
-    \tabFullNotation
-  } {
-    \tabChordRepeats
-    \compressMMRests
-    \guitar
-  }
-
-  \layout {
-    indent = #0
-    short-indent = #0
-    \context {
-      \Score
-      \numericTimeSignature
-    }
-  }
-}
diff --git a/02-song2/instr/keys.ly b/02-song2/instr/keys.ly
deleted file mode 100644
index 2c25d04..0000000
--- a/02-song2/instr/keys.ly
+++ /dev/null
@@ -1,28 +0,0 @@
-\version "2.19.27"
-
-\header {
-  title = "Song 2"
-  subtitle = "Keyboard"
-  composer = "The very pretentious elephlies"
-  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
-}
-
-\include "../settings.ly"
-\include "parts/keys.ly"
-
-\score {
-  \new Staff \with {
-    pedalSustainStyle = #'bracket
-  } {
-    \tempo 4 = 90
-    \compressMMRests { \keyboard }
-  }
-  \layout {
-    indent = #0
-    short-indent = #0
-    \context {
-      \Score
-      \numericTimeSignature
-    }
-  }
-}
diff --git a/02-song2/instr/stick.ly b/02-song2/instr/stick.ly
deleted file mode 100644
index 18b3f32..0000000
--- a/02-song2/instr/stick.ly
+++ /dev/null
@@ -1,28 +0,0 @@
-\version "2.19.27"
-
-\header {
-  title = "Song 2"
-  subtitle = "Grand Stick"
-  composer = "The very pretentious elephlies"
-  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
-}
-
-\include "../settings.ly"
-\include "parts/stick.ly"
-
-\score {
-  \new PianoStaff = "grand stick" \with {
-    pedalSustainStyle = #'bracket
-  } {
-    \compressMMRests \stick
-  }
-  \layout {
-    \tempo 4 = 90
-    indent = #0
-    short-indent = #0
-    \context {
-      \Score
-      \numericTimeSignature
-    }
-  }
-}
diff --git a/02-song2/music/bass.ly b/02-song2/music/bass.ly
new file mode 100644
index 0000000..d6f378a
--- /dev/null
+++ b/02-song2/music/bass.ly
@@ -0,0 +1,158 @@
+bassA = \relative c {
+  \repeat unfold 2 {
+    b,8 a16 b8 a16 b4 r8 e,16 fis a8     |
+    b a16 b8 a16 b4 r8
+    \ottava #1 d''4\flageolet \ottava #0 |
+    b,,8 a16 b8 a16 e4 r8 e16 fis a8     |
+  } \alternative {
+    { g g16 g8 fis16 b,8 r8 d''16 r d e d8 |}
+    { g,, r16 a8 r16 d8 ~ d2               |}
+  }
+}
+
+%% key change!
+bassB = \relative c {
+  cis,8 r16 cis8 r16 fis,4. fis4 |
+  a16 a8 a b16 e,4 e8 e fis'     |
+  gis8. e fis8 fis,2             |
+}
+
+bassBWithHarmonic = \relative c {
+  \bassB
+  a,8. b8 r16 e,2
+  \ottava #1 d'''8\flageolet \ottava #0 |
+}
+
+bassBWithoutHarmonic = \relative c {
+  \bassB
+  a,8. b8 r16 e,2 f8 |
+}
+
+bassTransition = \relative fis,, {
+  \repeat volta 2 {
+    fis16 r8. fis16 r8 e16 fis fis fis8 r4    |
+    fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
+    fis16 r8. fis16 r8 e16 fis fis fis8 r4    |
+    fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
+  }
+
+  \repeat volta 4 {
+    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
+    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
+  }
+}
+
+bassThree = \relative fis,, {
+  \time 6/8
+  \repeat unfold 2 {
+    e16   fis8 fis fis16
+    fis16 gis8 gis gis16 |
+    gis16 a8   a   r16
+    b,8 b b              |
+  }
+
+  d'8. d8 d16    e8. e8 e16    |
+  r16 d r d r d  e8. e16 fis e |
+  d8. d8 d16     e8. e8 e16    |
+  r16 cis8 cis r16 cis8 cis a16 b |
+}
+
+bassMartaRekado = \relative fis,, {
+  \time 5/8
+  fis8 fis fis fis fis  |
+  \time 7/8
+  fis8 fis fis fis fis fis fis |
+  \time 2/4
+  fis8. r16 b a gis a |
+
+  \time 5/8
+  fis8 fis fis fis fis |
+  \time 7/8
+  fis8 fis fis fis fis fis fis |
+  \time 2/4
+  fis8. r16 b a gis a |
+
+  \time 3/4
+  d,8. d8 d16    e8. e8 e16    |
+  r16 d r d r d  e8. e16 fis e |
+  fis16 fis8 fis fis16  fis fis8 fis fis16 |
+  \time 7/8
+  fis fis8 fis d' d r r8. |
+}
+
+bassReprise = \relative fis,, {
+  \time 4/4
+  fis1                                |
+  f'8. cis8 a16 fis'4. fis,8 a16 gis  |
+  fis4. b4 a8 gis fis                 |
+  d' a e' fis fis, fis fis fis        |
+
+  %% TODO: simplify
+  fis fis16 fis fis8 fis16 fis fis fis fis8 fis e' |
+  f8. cis8 a16 fis'4 fis,16 fis a' fis, b' cis     |
+  fis,,8 fis16 fis fis8 b16 b b b b8 b16 b b b     |
+  d   d,  d   d'  d,  d   fis' fis,
+  fis fis fis fis fis fis fis  fis  |
+}
+
+bassFinal = \relative fis,, {
+  \time 4/4
+  \repeat volta 4 {
+    fis8. fis16 r2 r16 fis16 e' fis |
+    f8. cis8 d16 fis,2 e'16 fis     |
+    fis,8. fis16 r2 r8 b16 cis |
+    d8. d8 e16 fis,2 r8 |
+  }
+
+  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
+  d8 d d d16 a8. a8 a ais              |
+  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
+  f8 f' r8 f,16 c gis2 ~               |
+  gis1 |
+}
+
+bassMusic = {
+  \set Staff.midiInstrument = #"electric bass (finger)"
+  \set Staff.pedalSustainStyle = #'bracket
+  \set Staff.midiMinimumVolume = #1.0
+  \clef "bass_8"
+
+  %% Intro
+  \time 4/4
+  R1*8
+
+  \key b \minor
+  \bassA
+  \key e \major
+  \bassBWithHarmonic
+
+  \key b \minor
+  \bassA
+  \key e \major
+  \bassBWithoutHarmonic
+
+  \key fis \minor
+  \bassTransition
+  \bassThree
+
+  \bassMartaRekado
+
+  \bassReprise
+  \bassFinal
+}
+
+bass = <<
+  \new Staff \with {
+    \RemoveEmptyStaves
+  } {
+    \bassMusic
+  }
+  \new TabStaff \with {
+    stringTunings = #bass-five-string-tuning
+    \RemoveEmptyStaves
+  } {
+    \override Stem #'transparent = ##t
+    \override Beam #'transparent = ##t
+    \bassMusic
+  }
+>>
diff --git a/02-song2/parts/click.ly b/02-song2/music/click.ly
index 36ff547..36ff547 100644
--- a/02-song2/parts/click.ly
+++ b/02-song2/music/click.ly
diff --git a/02-song2/music/guitar.ly b/02-song2/music/guitar.ly
new file mode 100644
index 0000000..1b86e5b
--- /dev/null
+++ b/02-song2/music/guitar.ly
@@ -0,0 +1,58 @@
+\include "music/stick.ly"
+guitarBreak = {
+  \stickIntroLeft
+  \stickStanzaLeft
+  \stickBLeft
+  \stickStanzaLeft
+  \stickBLeft
+}
+
+%% capo 2nd fret
+guitar = \relative c {
+  \transposition d'
+  \time 4/4
+  #(mmrest-of-length guitarBreak)
+
+  %% transition
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 {
+    r16 <b e>8 <a d>16 <b e>8 <a d>16
+    <b e>8 <b e>8 r16 r4           |
+    r16 <b e>8 <a d>16 <b e>8 <a d>16
+    <b e>16 r16 <b e>16 <a d>4 r8 |
+  }
+
+  %% three
+  \time 6/8
+  \repeat unfold 2 {
+    <d\5 fis\4>16  <e\5 g\4>8 q q16   q16 <fis\5 a\4>8 q q16 |
+    q16 <g\5 b\4>8 q r16 a,8\5 <a\5 a'\4 cis\3 g'\2> q |
+  }
+
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <c\5 e\4 g\3 d'\2> r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <b\5 es\4 a\3 d\2>8 q r16 q8 q r8 |
+
+  %% marta rekado
+  \repeat unfold 2 {
+    \time 5/8 <d\5 fis\4>16 <e\5 g\4>8 q q q16 q16 <fis\5 a\4>16 ~ |
+    \time 7/8 q16 q8 q q <e\5 g\4> q q16 q16 <fis\5 a\4> |
+  } \alternative {
+    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
+    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
+  }
+  \time 3/4
+  <c\5 e\4 g\3 d'\2>16 q r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  r16 <c\5 e\4 g\3 d'\2> r q r q
+  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
+  %% TODO
+  <e,\6 e'\5 d\4 g\3 g'\2 e\1>2.\arpeggio |
+  \time 7/8
+  r16 r8 r <c'\5 e\4 g\3 c'\2> q r r8. |
+}
diff --git a/02-song2/music/keys.ly b/02-song2/music/keys.ly
new file mode 100644
index 0000000..c25a5b8
--- /dev/null
+++ b/02-song2/music/keys.ly
@@ -0,0 +1,99 @@
+keysA = { R1*8 }
+keysB = { R1*4 }
+
+keysTransition = \relative c' {
+  \repeat volta 2 {
+    <cis fis a>1 | <b e gis>1   |
+    <a d fis>1   | <a cis fis>1 |
+  }
+
+  %% TODO
+  \repeat volta 4 { R1 | R1 |}
+}
+
+keysThree = {
+  \time 6/8
+  \repeat unfold 2 { R2. | R2. |}
+  R2. | R2. | R2. |
+  R8*6 |
+}
+
+keysMartaRekado = \relative c' {
+  \repeat unfold 2 {
+    \time 5/8
+    cis''16 a fis cis r cis8 fis a16  |
+    \time 7/8
+    gis8 e b e16 e8 fis16 r16 b,8 e16 |
+  } \alternative {
+    { \time 2/4 cis8. a16 b a gis a |}
+    { \time 2/4 cis8. a16 b a gis a |}
+  }
+
+  \time 3/4
+  d,16 a fis a fis' a
+  gis e b e gis b  |
+  a fis d fis a cis
+  b gis e gis e' d |
+
+  %% TODE simplify
+  fis cis a gis a cis
+  b e e, a b cis  |
+
+  %% TODO
+  \time 7/8
+  a a' fis cis cis d8 d8 r r8. |
+}
+
+keysReprise = \relative c' {
+  \time 4/4
+  \repeat unfold 2 {
+    <cis fis a cis>2 ~               <cis es a cis>2  |
+    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
+    <cis fis a fis'>2 ~              <cis es a fis'>2 |
+    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
+  }
+}
+
+keysFinal = \relative c' {
+  \ottava #-1
+  \repeat volta 4 {
+    \tuplet 6/2 { a'8\sustainOn fis dis cis a fis ~ } fis2   cis16\sustainOff dis gis8 |
+    a16 d fis d fis gis a8 ~ a2 |
+
+    \tuplet 6/2 { cis8\sustainOn a fis dis cis fis, }
+    b8.\sustainOff dis,16\sustainOn a' cis fis\sustainOff gis a-. b-. cis-. d-.
+    <cis a>16 r8 <b gis>16 r8 a16 gis fis\sustainOn cis a gis fis4\sustainOff
+  }
+
+  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
+  <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |
+  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
+  f8 b r8 d16 f gis1.\trill
+}
+
+keyboard = \relative c' {
+    %% Intro
+    \time 4/4
+    \key b \minor
+    R1*8
+
+    \repeat unfold 2 {
+      \key b \minor
+      \keysA
+      \key e \major
+      \keysB
+    }
+
+    \set Staff.midiInstrument = #"pad 2 (warm)"
+    \key fis \minor
+    \keysTransition
+    \keysThree
+
+    \set Staff.midiInstrument = #"lead 8 (bass+lead)"
+    \keysMartaRekado
+
+    \set Staff.midiInstrument = #"string ensemble 1"
+    \keysReprise
+    \set Staff.midiInstrument = #"electric piano 1"
+    \keysFinal
+  }
diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
new file mode 100644
index 0000000..7c6ec22
--- /dev/null
+++ b/02-song2/music/stick.ly
@@ -0,0 +1,239 @@
+stickIntroLeft = \relative c {
+  \repeat unfold 2 {
+    <b a' d>8 r16 <b a' d>8 r16
+    <b gis' d'>4 b8 ~ <b gis' d'> b |
+    <b g' d'>8 r16 <b g' d'>8 r16
+    <b fis' d'>4 b8 ~ <b fis' d'>4  |
+
+    <b a' d>8 r16 <b a' d>8 r16
+    <b gis' d'>4 b8 ~ <b gis' d'> b |
+    <b g' d'>8 r16 <b g' d'>8 r16
+    <b fis' d'>8 ~ <b fis' d'>2     |
+  }
+}
+
+stickIntroRight = \relative c' {
+  fis8. fis e4 r16 ais,16 b cis d gis, |
+  e'8.  e   d4 ~ d4 r8                 |
+  \grace{e16} fis8. fis e4 ~ e4 fis8   |
+  d8.   cis b4 r4.                     |
+
+  \grace{e16} fis8. a8 fis16 e4 r16 ais,16 b cis d gis, |
+  fis'8. fis8 r16 e d e d8.  r4            |
+  \grace{ e8 \glissando s8 } fis8 ~ <fis d'>16 r8 <e cis'>16 r8 <d b'>2 |
+  \grace{d32 g32} b16 r8 g r16 fis8 ~ fis2 |
+}
+
+stickStanzaLeft = \relative c {
+  \repeat unfold 2 {
+    <b fis'>8 r16 <b fis'>8 r16
+    <b fis'>4 <b fis'>8 r <b fis'>  |
+    <b g'>8 r16 <b g'>8 r16
+    <b fis'>4 <b fis'>8 ~ <b fis'>4 |
+
+    <b fis'>8 r16 <b fis'>8 r16
+    <e b>4 <e b>8 r <e b> |
+  } \alternative {
+    { <b g'>8 r16 <b g'>8 r16  <b fis'>2 r8 |}
+    { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
+  }
+}
+
+stickStanzaRight = \relative c' {
+  \repeat unfold 2 {
+    <a d>8 r16 <a d>8 r16
+    <gis d'>4 r8 <gis d'> r |
+    <d' g>8 r16 <d g>8 r16
+    <d fis>4 r8 <d fis> r |
+
+    <a d>8 r16 <a d>8 r16
+    <gis d'>4 r8 <gis d'> r |
+  } \alternative {
+    { <d' g>8 r16 <d g>8 r16 <d fis>2 r8 |}
+    { <d  g>8 r16 <d g>8 r16 <d fis>8 ~ <d fis>2 |}
+  }
+}
+
+stickBLeft = \relative c {
+  \repeat unfold 2 {
+    <cis gis'>4.\arpeggio <fis, cis'>4\arpeggio\sustainOn fis4 cis'8\sustainOff |
+  } \alternative {
+    { a,8 cis'4 e,4\sustainOn b'8 gis' e,\sustainOff |}
+    { cis' r16 dis8 r16 e8 ~ e2 |}
+  }
+}
+
+stickBRight = \relative c' {
+  <b e>8\arpeggio r16 <b e>8 r16
+  <ais e'>4 r8 <ais e'> r |
+  a8. ~ <a e'>8 a16 gis2 r8 |
+
+  <b e>8 r16 <b e>8 r16 <ais e'>4 r8 <ais e'> r |
+  <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
+}
+
+%% switch to acoustic guitar here
+stickTransitionLeft = \relative c, {
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 { R1*2 }
+}
+
+stickTransitionRight = \relative c' {
+  \repeat volta 2 { R1*4 }
+  \repeat volta 4 { R1*2 }
+}
+
+stickThreeLeft = \relative c, {
+  \time 6/8
+  \repeat unfold 2 { R2.*2 }
+  R2.*4
+}
+
+stickThreeRight = \relative c' {
+  \time 6/8
+  \repeat unfold 2 { R2.*2 }
+  R2.*4
+}
+
+stickMartaRekadoLeft = \relative c, {
+  \time 5/8 R8*5 |
+  \time 7/8 R8*7 |
+  \time 2/4 R4*2 |
+
+  \time 5/8 R8*5 |
+  \time 7/8 R8*7 |
+  \time 2/4 R4*2 |
+
+  \time 3/4
+  R4*3 | R4*3 | R4*3 |
+  \time 7/8 R8*7 |
+}
+
+stickMartaRekadoRight = \relative c' {
+  \time 5/8 R8*5 |
+  \time 7/8 R8*7 |
+  \time 2/4 R4*2 |
+
+  \time 5/8 R8*5 |
+  \time 7/8 R8*7 |
+  \time 2/4 R4*2 |
+
+  \time 3/4
+  R4*3 | R4*3 | R4*3 |
+  \time 7/8 R8*7 |
+}
+
+stickRepriseLeft = \relative c, {
+  \time 4/4
+  \repeat unfold 2 {
+    <fis cis'>8 r16 <b fis'>16 r16 <fis cis'> <fis dis' a'>8 ~
+    <fis dis' a'>8 fis <dis' a'> fis, <f d' a'> r16 <f d' a'>8 r16 <fis cis' a'>8 ~
+    <fis cis' a'>2 |
+  } \alternative {
+    %% TODO: some notes are too low
+    { <fis cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> cis,
+      <d d' a'>8 r16 a8 r16 fis4. ~ fis4 | }
+    { <fis' cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> r
+      <f d' a'>8 r16 <f d' a'>8 r16 <fis cis' a'>4. ~ <fis cis' a'>4 | }
+  }
+}
+
+stickRepriseRight = \relative c' {
+  \time 4/4
+  \repeat unfold 2 {
+    r8 <a cis fis>16-. r r r <a cis fis>8 ~
+    <a cis fis>4 ~ <a cis fis>4
+    <f' a d>8 r16 <f a d>8 r16 <fis gis cis>8 ~ <fis a cis>2 |
+
+    r8 <a, cis fis>16-. r r r <dis fis b>8 ~
+    <dis fis b>4 ~ <dis fis b>4
+    <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
+  }
+}
+
+stickFinalLeft = \relative c, {
+  \time 4/4
+  \repeat volta 4 { r1 | r1 | r1 | r1 |}
+}
+
+stickFinalRight = \relative c' {
+  \time 4/4
+  \repeat volta 4 { r1 | r1 | r1 | r1 |}
+
+  b'16 a fis dis b' fis dis fis
+  dis b fis b fis dis b fis
+
+  \tuplet 6/4 { d'' a fis  a fis d }
+  \tuplet 6/4 { fis d a    d a e' }
+  \tuplet 6/4 { fis a cis  a cis e }
+  \tuplet 3/2 { cis e fis }
+  gis16 a |
+
+  b16 a fis dis b' fis dis fis
+  dis b fis b fis dis b fis
+
+  f8 b' r8 d16 f gis1.
+}
+
+stick = <<
+  \new Staff = "stick right" \relative c' {
+    \clef "treble_8"
+    \set Staff.midiPanPosition = #-0.5
+    \key b \minor
+
+    %% intro
+    \time 4/4
+    \stickIntroRight
+    \stickStanzaRight
+
+    \key e \major
+    \stickBRight
+
+    \key b \minor
+    \stickStanzaRight
+
+    \key e \major
+    \stickBRight
+
+    \key fis \minor
+    \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
+    \stickTransitionRight
+    \stickThreeRight
+
+    \stickMartaRekadoRight
+
+    \set PianoStaff.midiInstrument = #"clav"
+    \stickRepriseRight
+    \stickFinalRight
+  }
+
+  %% staff for left hand side
+  \new Staff = "stick left" \relative c  {
+    \clef "bass"
+    \set Staff.midiPanPosition = #0.5
+    \key b \minor
+
+    %% intro
+    \time 4/4
+    \stickIntroLeft
+    \stickStanzaLeft
+
+    \key e \major
+    \stickBLeft
+
+    \key b \minor
+    \stickStanzaLeft
+
+    \key e \major
+    \stickBLeft
+
+    \key fis \minor
+    \stickTransitionLeft
+    \stickThreeLeft
+
+    \stickMartaRekadoLeft
+
+    \stickRepriseLeft
+    \stickFinalLeft
+  }
+>>
diff --git a/02-song2/parts/bass.ly b/02-song2/parts/bass.ly
index d6f378a..b323323 100644
--- a/02-song2/parts/bass.ly
+++ b/02-song2/parts/bass.ly
@@ -1,158 +1,24 @@
-bassA = \relative c {
-  \repeat unfold 2 {
-    b,8 a16 b8 a16 b4 r8 e,16 fis a8     |
-    b a16 b8 a16 b4 r8
-    \ottava #1 d''4\flageolet \ottava #0 |
-    b,,8 a16 b8 a16 e4 r8 e16 fis a8     |
-  } \alternative {
-    { g g16 g8 fis16 b,8 r8 d''16 r d e d8 |}
-    { g,, r16 a8 r16 d8 ~ d2               |}
-  }
-}
-
-%% key change!
-bassB = \relative c {
-  cis,8 r16 cis8 r16 fis,4. fis4 |
-  a16 a8 a b16 e,4 e8 e fis'     |
-  gis8. e fis8 fis,2             |
-}
-
-bassBWithHarmonic = \relative c {
-  \bassB
-  a,8. b8 r16 e,2
-  \ottava #1 d'''8\flageolet \ottava #0 |
-}
-
-bassBWithoutHarmonic = \relative c {
-  \bassB
-  a,8. b8 r16 e,2 f8 |
-}
-
-bassTransition = \relative fis,, {
-  \repeat volta 2 {
-    fis16 r8. fis16 r8 e16 fis fis fis8 r4    |
-    fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
-    fis16 r8. fis16 r8 e16 fis fis fis8 r4    |
-    fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
-  }
-
-  \repeat volta 4 {
-    r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4      |
-    r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
-  }
-}
-
-bassThree = \relative fis,, {
-  \time 6/8
-  \repeat unfold 2 {
-    e16   fis8 fis fis16
-    fis16 gis8 gis gis16 |
-    gis16 a8   a   r16
-    b,8 b b              |
-  }
-
-  d'8. d8 d16    e8. e8 e16    |
-  r16 d r d r d  e8. e16 fis e |
-  d8. d8 d16     e8. e8 e16    |
-  r16 cis8 cis r16 cis8 cis a16 b |
-}
-
-bassMartaRekado = \relative fis,, {
-  \time 5/8
-  fis8 fis fis fis fis  |
-  \time 7/8
-  fis8 fis fis fis fis fis fis |
-  \time 2/4
-  fis8. r16 b a gis a |
+\version "2.19.27"
 
-  \time 5/8
-  fis8 fis fis fis fis |
-  \time 7/8
-  fis8 fis fis fis fis fis fis |
-  \time 2/4
-  fis8. r16 b a gis a |
-
-  \time 3/4
-  d,8. d8 d16    e8. e8 e16    |
-  r16 d r d r d  e8. e16 fis e |
-  fis16 fis8 fis fis16  fis fis8 fis fis16 |
-  \time 7/8
-  fis fis8 fis d' d r r8. |
+\header {
+  title = "Song 2"
+  subtitle = "Bass"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-bassReprise = \relative fis,, {
-  \time 4/4
-  fis1                                |
-  f'8. cis8 a16 fis'4. fis,8 a16 gis  |
-  fis4. b4 a8 gis fis                 |
-  d' a e' fis fis, fis fis fis        |
+\include "../settings.ly"
+\include "music/bass.ly"
 
-  %% TODO: simplify
-  fis fis16 fis fis8 fis16 fis fis fis fis8 fis e' |
-  f8. cis8 a16 fis'4 fis,16 fis a' fis, b' cis     |
-  fis,,8 fis16 fis fis8 b16 b b b b8 b16 b b b     |
-  d   d,  d   d'  d,  d   fis' fis,
-  fis fis fis fis fis fis fis  fis  |
-}
+\score {
+  \compressMMRests { \bass }
 
-bassFinal = \relative fis,, {
-  \time 4/4
-  \repeat volta 4 {
-    fis8. fis16 r2 r16 fis16 e' fis |
-    f8. cis8 d16 fis,2 e'16 fis     |
-    fis,8. fis16 r2 r8 b16 cis |
-    d8. d8 e16 fis,2 r8 |
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
   }
-
-  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
-  d8 d d d16 a8. a8 a ais              |
-  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
-  f8 f' r8 f,16 c gis2 ~               |
-  gis1 |
-}
-
-bassMusic = {
-  \set Staff.midiInstrument = #"electric bass (finger)"
-  \set Staff.pedalSustainStyle = #'bracket
-  \set Staff.midiMinimumVolume = #1.0
-  \clef "bass_8"
-
-  %% Intro
-  \time 4/4
-  R1*8
-
-  \key b \minor
-  \bassA
-  \key e \major
-  \bassBWithHarmonic
-
-  \key b \minor
-  \bassA
-  \key e \major
-  \bassBWithoutHarmonic
-
-  \key fis \minor
-  \bassTransition
-  \bassThree
-
-  \bassMartaRekado
-
-  \bassReprise
-  \bassFinal
 }
-
-bass = <<
-  \new Staff \with {
-    \RemoveEmptyStaves
-  } {
-    \bassMusic
-  }
-  \new TabStaff \with {
-    stringTunings = #bass-five-string-tuning
-    \RemoveEmptyStaves
-  } {
-    \override Stem #'transparent = ##t
-    \override Beam #'transparent = ##t
-    \bassMusic
-  }
->>
diff --git a/02-song2/parts/guitar.ly b/02-song2/parts/guitar.ly
index 5ea1680..3da82f7 100644
--- a/02-song2/parts/guitar.ly
+++ b/02-song2/parts/guitar.ly
@@ -1,58 +1,33 @@
-\include "parts/stick.ly"
-guitarBreak = {
-  \stickIntroLeft
-  \stickStanzaLeft
-  \stickBLeft
-  \stickStanzaLeft
-  \stickBLeft
-}
+\version "2.19.27"
 
-%% capo 2nd fret
-guitar = \relative c {
-  \transposition d'
-  \time 4/4
-  #(mmrest-of-length guitarBreak)
+\header {
+  title = "Song 2"
+  subtitle = "Acoustic Guitar"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
+}
 
-  %% transition
-  \repeat volta 2 { R1*4 }
-  \repeat volta 4 {
-    r16 <b e>8 <a d>16 <b e>8 <a d>16
-    <b e>8 <b e>8 r16 r4           |
-    r16 <b e>8 <a d>16 <b e>8 <a d>16
-    <b e>16 r16 <b e>16 <a d>4 r8 |
-  }
+\include "../settings.ly"
+\include "music/guitar.ly"
 
-  %% three
-  \time 6/8
-  \repeat unfold 2 {
-    <d\5 fis\4>16  <e\5 g\4>8 q q16   q16 <fis\5 a\4>8 q q16 |
-    q16 <g\5 b\4>8 q r16 a,8\5 <a\5 a'\4 cis\3 g'\2> q |
+\score {
+  \new TabStaff = "acoustic guitar"
+  \with {
+    stringTunings = #guitar-tuning
+    \RemoveEmptyStaves
+    \tabFullNotation
+  } {
+    \tabChordRepeats
+    \compressMMRests
+    \guitar
   }
 
-  <c\5 e\4 g\3 d'\2>16 q r q r q
-  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
-  r16 <c\5 e\4 g\3 d'\2> r q r q
-  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
-
-  <c\5 e\4 g\3 d'\2>16 q r q r q
-  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
-  r16 <b\5 es\4 a\3 d\2>8 q r16 q8 q r8 |
-
-  %% marta rekado
-  \repeat unfold 2 {
-    \time 5/8 <d\5 fis\4>16 <e\5 g\4>8 q q q16 q16 <fis\5 a\4>16 ~ |
-    \time 7/8 q16 q8 q q <e\5 g\4> q q16 q16 <fis\5 a\4> |
-  } \alternative {
-    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
-    { \time 2/4 r16 <fis\5 a\4>8 q r r16 |}
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
   }
-  \time 3/4
-  <c\5 e\4 g\3 d'\2>16 q r q r q
-  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
-  r16 <c\5 e\4 g\3 d'\2> r q r q
-  q16 <d\5 fis\4 g\3 e'\2>8 q8 q16 |
-  %% TODO
-  <e,\6 e'\5 d\4 g\3 g'\2 e\1>2.\arpeggio |
-  \time 7/8
-  r16 r8 r <c'\5 e\4 g\3 c'\2> q r r8. |
 }
diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index c25a5b8..df4da9b 100644
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -1,99 +1,28 @@
-keysA = { R1*8 }
-keysB = { R1*4 }
+\version "2.19.27"
 
-keysTransition = \relative c' {
-  \repeat volta 2 {
-    <cis fis a>1 | <b e gis>1   |
-    <a d fis>1   | <a cis fis>1 |
-  }
-
-  %% TODO
-  \repeat volta 4 { R1 | R1 |}
+\header {
+  title = "Song 2"
+  subtitle = "Keyboard"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-keysThree = {
-  \time 6/8
-  \repeat unfold 2 { R2. | R2. |}
-  R2. | R2. | R2. |
-  R8*6 |
-}
+\include "../settings.ly"
+\include "music/keys.ly"
 
-keysMartaRekado = \relative c' {
-  \repeat unfold 2 {
-    \time 5/8
-    cis''16 a fis cis r cis8 fis a16  |
-    \time 7/8
-    gis8 e b e16 e8 fis16 r16 b,8 e16 |
-  } \alternative {
-    { \time 2/4 cis8. a16 b a gis a |}
-    { \time 2/4 cis8. a16 b a gis a |}
+\score {
+  \new Staff \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \tempo 4 = 90
+    \compressMMRests { \keyboard }
   }
-
-  \time 3/4
-  d,16 a fis a fis' a
-  gis e b e gis b  |
-  a fis d fis a cis
-  b gis e gis e' d |
-
-  %% TODE simplify
-  fis cis a gis a cis
-  b e e, a b cis  |
-
-  %% TODO
-  \time 7/8
-  a a' fis cis cis d8 d8 r r8. |
-}
-
-keysReprise = \relative c' {
-  \time 4/4
-  \repeat unfold 2 {
-    <cis fis a cis>2 ~               <cis es a cis>2  |
-    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
-    <cis fis a fis'>2 ~              <cis es a fis'>2 |
-    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
-  }
-}
-
-keysFinal = \relative c' {
-  \ottava #-1
-  \repeat volta 4 {
-    \tuplet 6/2 { a'8\sustainOn fis dis cis a fis ~ } fis2   cis16\sustainOff dis gis8 |
-    a16 d fis d fis gis a8 ~ a2 |
-
-    \tuplet 6/2 { cis8\sustainOn a fis dis cis fis, }
-    b8.\sustainOff dis,16\sustainOn a' cis fis\sustainOff gis a-. b-. cis-. d-.
-    <cis a>16 r8 <b gis>16 r8 a16 gis fis\sustainOn cis a gis fis4\sustainOff
-  }
-
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  f8 b r8 d16 f gis1.\trill
-}
-
-keyboard = \relative c' {
-    %% Intro
-    \time 4/4
-    \key b \minor
-    R1*8
-
-    \repeat unfold 2 {
-      \key b \minor
-      \keysA
-      \key e \major
-      \keysB
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
     }
-
-    \set Staff.midiInstrument = #"pad 2 (warm)"
-    \key fis \minor
-    \keysTransition
-    \keysThree
-
-    \set Staff.midiInstrument = #"lead 8 (bass+lead)"
-    \keysMartaRekado
-
-    \set Staff.midiInstrument = #"string ensemble 1"
-    \keysReprise
-    \set Staff.midiInstrument = #"electric piano 1"
-    \keysFinal
   }
+}
diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index 17b1c5c..5358c59 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -1,241 +1,28 @@
-stickIntroLeft = \relative c {
-  \repeat unfold 2 {
-    <b a' d>8 r16 <b a' d>8 r16
-    <b gis' d'>4 b8 ~ <b gis' d'> b |
-    <b g' d'>8 r16 <b g' d'>8 r16
-    <b fis' d'>4 b8 ~ <b fis' d'>4  |
+\version "2.19.27"
 
-    <b a' d>8 r16 <b a' d>8 r16
-    <b gis' d'>4 b8 ~ <b gis' d'> b |
-    <b g' d'>8 r16 <b g' d'>8 r16
-    <b fis' d'>8 ~ <b fis' d'>2     |
-  }
-}
-
-stickIntroRight = \relative c' {
-  fis8. fis e4 r16 ais,16 b cis d gis, |
-  e'8.  e   d4 ~ d4 r8                 |
-  \grace{e16} fis8. fis e4 ~ e4 fis8   |
-  d8.   cis b4 r4.                     |
-
-  \grace{e16} fis8. a8 fis16 e4 r16 ais,16 b cis d gis, |
-  fis'8. fis8 r16 e d e d8.  r4            |
-  \grace{ e8 \glissando s8 } fis8 ~ <fis d'>16 r8 <e cis'>16 r8 <d b'>2 |
-  \grace{d32 g32} b16 r8 g r16 fis8 ~ fis2 |
-}
-
-stickStanzaLeft = \relative c {
-  \repeat unfold 2 {
-    <b fis'>8 r16 <b fis'>8 r16
-    <b fis'>4 <b fis'>8 r <b fis'>  |
-    <b g'>8 r16 <b g'>8 r16
-    <b fis'>4 <b fis'>8 ~ <b fis'>4 |
-
-    <b fis'>8 r16 <b fis'>8 r16
-    <e b>4 <e b>8 r <e b> |
-  } \alternative {
-    { <b g'>8 r16 <b g'>8 r16  <b fis'>2 r8 |}
-    { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
-  }
+\header {
+  title = "Song 2"
+  subtitle = "Grand Stick"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-stickStanzaRight = \relative c' {
-  \repeat unfold 2 {
-    <a d>8 r16 <a d>8 r16
-    <gis d'>4 r8 <gis d'> r |
-    <d' g>8 r16 <d g>8 r16
-    <d fis>4 r8 <d fis> r |
-
-    <a d>8 r16 <a d>8 r16
-    <gis d'>4 r8 <gis d'> r |
-  } \alternative {
-    { <d' g>8 r16 <d g>8 r16 <d fis>2 r8 |}
-    { <d  g>8 r16 <d g>8 r16 <d fis>8 ~ <d fis>2 |}
-  }
-}
-
-stickBLeft = \relative c {
-  \repeat unfold 2 {
-    <cis gis'>4.\arpeggio <fis, cis'>4\arpeggio\sustainOn fis4 cis'8\sustainOff |
-  } \alternative {
-    { a,8 cis'4 e,4\sustainOn b'8 gis' e,\sustainOff |}
-    { cis' r16 dis8 r16 e8 ~ e2 |}
-  }
-}
-
-stickBRight = \relative c' {
-  <b e>8\arpeggio r16 <b e>8 r16
-  <ais e'>4 r8 <ais e'> r |
-  a8. ~ <a e'>8 a16 gis2 r8 |
-
-  <b e>8 r16 <b e>8 r16 <ais e'>4 r8 <ais e'> r |
-  <e' a>8 r16 <fis a>8 r16 <e gis>2 r8 |
-}
-
-%% switch to acoustic guitar here
-stickTransitionLeft = \relative c, {
-  \repeat volta 2 { R1*4 }
-  \repeat volta 4 { R1*2 }
-}
-
-stickTransitionRight = \relative c' {
-  \repeat volta 2 { R1*4 }
-  \repeat volta 4 { R1*2 }
-}
-
-%% TODO: this should be played by the acoustic guitar
-stickThreeLeft = \relative c, {
-  \time 6/8
-  \repeat unfold 2 { R2.*2 }
-  R2.*4
-}
-
-%% TODO: this should be played by the acoustic guitar
-stickThreeRight = \relative c' {
-  \time 6/8
-  \repeat unfold 2 { R2.*2 }
-  R2.*4
-}
-
-%% TODO: this should be played by the acoustic guitar
-stickMartaRekadoLeft = \relative c, {
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 3/4
-  R4*3 | R4*3 | R4*3 |
-  \time 7/8 R8*7 |
-}
-
-stickMartaRekadoRight = \relative c' {
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
-
-  \time 5/8 R8*5 |
-  \time 7/8 R8*7 |
-  \time 2/4 R4*2 |
+\include "../settings.ly"
+\include "music/stick.ly"
 
-  \time 3/4
-  R4*3 | R4*3 | R4*3 |
-  \time 7/8 R8*7 |
-}
-
-stickRepriseLeft = \relative c, {
-  \time 4/4
-  \repeat unfold 2 {
-    <fis cis'>8 r16 <b fis'>16 r16 <fis cis'> <fis dis' a'>8 ~
-    <fis dis' a'>8 fis <dis' a'> fis, <f d' a'> r16 <f d' a'>8 r16 <fis cis' a'>8 ~
-    <fis cis' a'>2 |
-  } \alternative {
-    { <fis cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> cis,
-      <d d' a'>8 r16 a8 r16 fis4. ~ fis4 | }
-    { <fis' cis'>8 r16 <b fis'>16 r16 a, b4 fis'8 <b fis'> r
-      <f d' a'>8 r16 <f d' a'>8 r16 <fis cis' a'>4. ~ <fis cis' a'>4 | }
+\score {
+  \new PianoStaff = "grand stick" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \compressMMRests \stick
   }
-}
-
-stickRepriseRight = \relative c' {
-  \time 4/4
-  \repeat unfold 2 {
-    r8 <a cis fis>16-. r r r <a cis fis>8 ~
-    <a cis fis>4 ~ <a cis fis>4
-    <f' a d>8 r16 <f a d>8 r16 <fis gis cis>8 ~ <fis a cis>2 |
-
-    r8 <a, cis fis>16-. r r r <dis fis b>8 ~
-    <dis fis b>4 ~ <dis fis b>4
-    <a d f>8 r16 <a d f>8 r16 <a cis fis>4. ~ <a cis fis>4 |
+  \layout {
+    \tempo 4 = 90
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
+    }
   }
 }
-
-stickFinalLeft = \relative c, {
-  \time 4/4
-  \repeat volta 4 { r1 | r1 | r1 | r1 |}
-}
-
-stickFinalRight = \relative c' {
-  \time 4/4
-  \repeat volta 4 { r1 | r1 | r1 | r1 |}
-
-  b'16 a fis dis b' fis dis fis
-  dis b fis b fis dis b fis
-
-  \tuplet 6/4 { d'' a fis  a fis d }
-  \tuplet 6/4 { fis d a    d a e' }
-  \tuplet 6/4 { fis a cis  a cis e }
-  \tuplet 3/2 { cis e fis }
-  gis16 a |
-
-  b16 a fis dis b' fis dis fis
-  dis b fis b fis dis b fis
-
-  f8 b' r8 d16 f gis1.
-}
-
-stick = <<
-  \new Staff = "stick right" \relative c' {
-    \clef "treble_8"
-    \set Staff.midiPanPosition = #-0.5
-    \key b \minor
-
-    %% intro
-    \time 4/4
-    \stickIntroRight
-    \stickStanzaRight
-
-    \key e \major
-    \stickBRight
-
-    \key b \minor
-    \stickStanzaRight
-
-    \key e \major
-    \stickBRight
-
-    \key fis \minor
-    \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
-    \stickTransitionRight
-    \stickThreeRight
-
-    \stickMartaRekadoRight
-
-    \set PianoStaff.midiInstrument = #"clav"
-    \stickRepriseRight
-    \stickFinalRight
-  }
-
-  %% staff for left hand side
-  \new Staff = "stick left" \relative c  {
-    \clef "bass"
-    \set Staff.midiPanPosition = #0.5
-    \key b \minor
-
-    %% intro
-    \time 4/4
-    \stickIntroLeft
-    \stickStanzaLeft
-
-    \key e \major
-    \stickBLeft
-
-    \key b \minor
-    \stickStanzaLeft
-
-    \key e \major
-    \stickBLeft
-
-    \key fis \minor
-    \stickTransitionLeft
-    \stickThreeLeft
-
-    \stickMartaRekadoLeft
-
-    \stickRepriseLeft
-    \stickFinalLeft
-  }
->>
diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index 07e8a4a..42ad6c8 100644
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -7,10 +7,10 @@
 }
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keyboard.ly"
-\include "parts/stick.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keyboard.ly"
+\include "music/stick.ly"
+\include "music/click.ly"
 
 AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
diff --git a/03-circus/parts/bass.ly b/03-circus/music/bass.ly
index 007efe9..007efe9 100644
--- a/03-circus/parts/bass.ly
+++ b/03-circus/music/bass.ly
diff --git a/03-circus/parts/click.ly b/03-circus/music/click.ly
index 406eaf3..406eaf3 100644
--- a/03-circus/parts/click.ly
+++ b/03-circus/music/click.ly
diff --git a/03-circus/parts/keyboard.ly b/03-circus/music/keyboard.ly
index 1500866..1500866 100644
--- a/03-circus/parts/keyboard.ly
+++ b/03-circus/music/keyboard.ly
diff --git a/03-circus/parts/stick.ly b/03-circus/music/stick.ly
index 95aef9b..95aef9b 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/music/stick.ly
diff --git a/04-white-noise/04-white-noise.ly b/04-white-noise/04-white-noise.ly
index 9fcd86e..a883be1 100644
--- a/04-white-noise/04-white-noise.ly
+++ b/04-white-noise/04-white-noise.ly
@@ -9,10 +9,10 @@
 whiteNoise = \repeat unfold 3 { r2. r2 } % TODO: how long?
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/click.ly"
 
 AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
diff --git a/04-white-noise/parts/bass.ly b/04-white-noise/music/bass.ly
index 713cf97..713cf97 100644
--- a/04-white-noise/parts/bass.ly
+++ b/04-white-noise/music/bass.ly
diff --git a/04-white-noise/parts/click.ly b/04-white-noise/music/click.ly
index 0f16fe0..0f16fe0 100644
--- a/04-white-noise/parts/click.ly
+++ b/04-white-noise/music/click.ly
diff --git a/04-white-noise/parts/keys.ly b/04-white-noise/music/keys.ly
index f60cc24..f60cc24 100644
--- a/04-white-noise/parts/keys.ly
+++ b/04-white-noise/music/keys.ly
diff --git a/04-white-noise/parts/stick.ly b/04-white-noise/music/stick.ly
index 579d733..579d733 100644
--- a/04-white-noise/parts/stick.ly
+++ b/04-white-noise/music/stick.ly
diff --git a/targets.mk b/targets.mk
index e22fda4..eb3a643 100644
--- a/targets.mk
+++ b/targets.mk
@@ -5,13 +5,13 @@ CPU_CORES=`grep -m1 "cpu cores" /proc/cpuinfo | tr -cd '[:digit:]'`
 # The command to run lilypond
 LILY_CMD = lilypond -ddelete-intermediate-files -djob-count=$(CPU_CORES)
 
-instr/%.pdf: instr/%.ly parts/%.ly
+parts/%.pdf: parts/%.ly music/%.ly
 	$(LILY_CMD) $<
 
-%.pdf: %.ly parts/*.ly
+%.pdf: %.ly music/*.ly
 	$(LILY_CMD) $<
 
-%.midi: %.ly parts/*.ly
+%.midi: %.ly music/*.ly
 	$(LILY_CMD) $<
 
 %.wav: %.midi