diff --git a/patacrep/songs/chordpro/test/00.sgc.sgc b/patacrep/songs/chordpro/test/00.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/00.sgc.sgc
rename to patacrep/songs/chordpro/test/00.sgc
diff --git a/patacrep/songs/chordpro/test/00.sgc.source b/patacrep/songs/chordpro/test/00.source
similarity index 100%
rename from patacrep/songs/chordpro/test/00.sgc.source
rename to patacrep/songs/chordpro/test/00.source
diff --git a/patacrep/songs/chordpro/test/01.sgc.sgc b/patacrep/songs/chordpro/test/01.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/01.sgc.sgc
rename to patacrep/songs/chordpro/test/01.sgc
diff --git a/patacrep/songs/chordpro/test/01.sgc.source b/patacrep/songs/chordpro/test/01.source
similarity index 100%
rename from patacrep/songs/chordpro/test/01.sgc.source
rename to patacrep/songs/chordpro/test/01.source
diff --git a/patacrep/songs/chordpro/test/02.sgc.sgc b/patacrep/songs/chordpro/test/02.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/02.sgc.sgc
rename to patacrep/songs/chordpro/test/02.sgc
diff --git a/patacrep/songs/chordpro/test/02.sgc.source b/patacrep/songs/chordpro/test/02.source
similarity index 100%
rename from patacrep/songs/chordpro/test/02.sgc.source
rename to patacrep/songs/chordpro/test/02.source
diff --git a/patacrep/songs/chordpro/test/02.sgc.tex b/patacrep/songs/chordpro/test/02.tex
similarity index 100%
rename from patacrep/songs/chordpro/test/02.sgc.tex
rename to patacrep/songs/chordpro/test/02.tex
diff --git a/patacrep/songs/chordpro/test/03.sgc.sgc b/patacrep/songs/chordpro/test/03.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/03.sgc.sgc
rename to patacrep/songs/chordpro/test/03.sgc
diff --git a/patacrep/songs/chordpro/test/03.sgc.source b/patacrep/songs/chordpro/test/03.source
similarity index 100%
rename from patacrep/songs/chordpro/test/03.sgc.source
rename to patacrep/songs/chordpro/test/03.source
diff --git a/patacrep/songs/chordpro/test/04.sgc.sgc b/patacrep/songs/chordpro/test/04.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/04.sgc.sgc
rename to patacrep/songs/chordpro/test/04.sgc
diff --git a/patacrep/songs/chordpro/test/04.sgc.source b/patacrep/songs/chordpro/test/04.source
similarity index 100%
rename from patacrep/songs/chordpro/test/04.sgc.source
rename to patacrep/songs/chordpro/test/04.source
diff --git a/patacrep/songs/chordpro/test/05.sgc.sgc b/patacrep/songs/chordpro/test/05.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/05.sgc.sgc
rename to patacrep/songs/chordpro/test/05.sgc
diff --git a/patacrep/songs/chordpro/test/05.sgc.source b/patacrep/songs/chordpro/test/05.source
similarity index 100%
rename from patacrep/songs/chordpro/test/05.sgc.source
rename to patacrep/songs/chordpro/test/05.source
diff --git a/patacrep/songs/chordpro/test/06.sgc.sgc b/patacrep/songs/chordpro/test/06.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/06.sgc.sgc
rename to patacrep/songs/chordpro/test/06.sgc
diff --git a/patacrep/songs/chordpro/test/06.sgc.source b/patacrep/songs/chordpro/test/06.source
similarity index 100%
rename from patacrep/songs/chordpro/test/06.sgc.source
rename to patacrep/songs/chordpro/test/06.source
diff --git a/patacrep/songs/chordpro/test/07.sgc.sgc b/patacrep/songs/chordpro/test/07.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/07.sgc.sgc
rename to patacrep/songs/chordpro/test/07.sgc
diff --git a/patacrep/songs/chordpro/test/07.sgc.source b/patacrep/songs/chordpro/test/07.source
similarity index 100%
rename from patacrep/songs/chordpro/test/07.sgc.source
rename to patacrep/songs/chordpro/test/07.source
diff --git a/patacrep/songs/chordpro/test/08.sgc.sgc b/patacrep/songs/chordpro/test/08.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/08.sgc.sgc
rename to patacrep/songs/chordpro/test/08.sgc
diff --git a/patacrep/songs/chordpro/test/08.sgc.source b/patacrep/songs/chordpro/test/08.source
similarity index 100%
rename from patacrep/songs/chordpro/test/08.sgc.source
rename to patacrep/songs/chordpro/test/08.source
diff --git a/patacrep/songs/chordpro/test/09.sgc.sgc b/patacrep/songs/chordpro/test/09.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/09.sgc.sgc
rename to patacrep/songs/chordpro/test/09.sgc
diff --git a/patacrep/songs/chordpro/test/09.sgc.source b/patacrep/songs/chordpro/test/09.source
similarity index 100%
rename from patacrep/songs/chordpro/test/09.sgc.source
rename to patacrep/songs/chordpro/test/09.source
diff --git a/patacrep/songs/chordpro/test/10.sgc.sgc b/patacrep/songs/chordpro/test/10.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/10.sgc.sgc
rename to patacrep/songs/chordpro/test/10.sgc
diff --git a/patacrep/songs/chordpro/test/10.sgc.source b/patacrep/songs/chordpro/test/10.source
similarity index 100%
rename from patacrep/songs/chordpro/test/10.sgc.source
rename to patacrep/songs/chordpro/test/10.source
diff --git a/patacrep/songs/chordpro/test/11.sgc.sgc b/patacrep/songs/chordpro/test/11.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/11.sgc.sgc
rename to patacrep/songs/chordpro/test/11.sgc
diff --git a/patacrep/songs/chordpro/test/11.sgc.source b/patacrep/songs/chordpro/test/11.source
similarity index 100%
rename from patacrep/songs/chordpro/test/11.sgc.source
rename to patacrep/songs/chordpro/test/11.source
diff --git a/patacrep/songs/chordpro/test/12.sgc.sgc b/patacrep/songs/chordpro/test/12.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/12.sgc.sgc
rename to patacrep/songs/chordpro/test/12.sgc
diff --git a/patacrep/songs/chordpro/test/12.sgc.source b/patacrep/songs/chordpro/test/12.source
similarity index 100%
rename from patacrep/songs/chordpro/test/12.sgc.source
rename to patacrep/songs/chordpro/test/12.source
diff --git a/patacrep/songs/chordpro/test/13.sgc.sgc b/patacrep/songs/chordpro/test/13.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/13.sgc.sgc
rename to patacrep/songs/chordpro/test/13.sgc
diff --git a/patacrep/songs/chordpro/test/13.sgc.source b/patacrep/songs/chordpro/test/13.source
similarity index 100%
rename from patacrep/songs/chordpro/test/13.sgc.source
rename to patacrep/songs/chordpro/test/13.source
diff --git a/patacrep/songs/chordpro/test/21.sgc.sgc b/patacrep/songs/chordpro/test/21.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/21.sgc.sgc
rename to patacrep/songs/chordpro/test/21.sgc
diff --git a/patacrep/songs/chordpro/test/21.sgc.source b/patacrep/songs/chordpro/test/21.source
similarity index 100%
rename from patacrep/songs/chordpro/test/21.sgc.source
rename to patacrep/songs/chordpro/test/21.source
diff --git a/patacrep/songs/chordpro/test/22.sgc.sgc b/patacrep/songs/chordpro/test/22.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/22.sgc.sgc
rename to patacrep/songs/chordpro/test/22.sgc
diff --git a/patacrep/songs/chordpro/test/22.sgc.source b/patacrep/songs/chordpro/test/22.source
similarity index 100%
rename from patacrep/songs/chordpro/test/22.sgc.source
rename to patacrep/songs/chordpro/test/22.source
diff --git a/patacrep/songs/chordpro/test/23.sgc.sgc b/patacrep/songs/chordpro/test/23.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/23.sgc.sgc
rename to patacrep/songs/chordpro/test/23.sgc
diff --git a/patacrep/songs/chordpro/test/23.sgc.source b/patacrep/songs/chordpro/test/23.source
similarity index 100%
rename from patacrep/songs/chordpro/test/23.sgc.source
rename to patacrep/songs/chordpro/test/23.source
diff --git a/patacrep/songs/chordpro/test/24.sgc.sgc b/patacrep/songs/chordpro/test/24.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/24.sgc.sgc
rename to patacrep/songs/chordpro/test/24.sgc
diff --git a/patacrep/songs/chordpro/test/24.sgc.source b/patacrep/songs/chordpro/test/24.source
similarity index 100%
rename from patacrep/songs/chordpro/test/24.sgc.source
rename to patacrep/songs/chordpro/test/24.source
diff --git a/patacrep/songs/chordpro/test/25.sgc.sgc b/patacrep/songs/chordpro/test/25.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/25.sgc.sgc
rename to patacrep/songs/chordpro/test/25.sgc
diff --git a/patacrep/songs/chordpro/test/25.sgc.source b/patacrep/songs/chordpro/test/25.source
similarity index 100%
rename from patacrep/songs/chordpro/test/25.sgc.source
rename to patacrep/songs/chordpro/test/25.source
diff --git a/patacrep/songs/chordpro/test/26.sgc.sgc b/patacrep/songs/chordpro/test/26.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/26.sgc.sgc
rename to patacrep/songs/chordpro/test/26.sgc
diff --git a/patacrep/songs/chordpro/test/26.sgc.source b/patacrep/songs/chordpro/test/26.source
similarity index 100%
rename from patacrep/songs/chordpro/test/26.sgc.source
rename to patacrep/songs/chordpro/test/26.source
diff --git a/patacrep/songs/chordpro/test/27.sgc.sgc b/patacrep/songs/chordpro/test/27.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/27.sgc.sgc
rename to patacrep/songs/chordpro/test/27.sgc
diff --git a/patacrep/songs/chordpro/test/27.sgc.source b/patacrep/songs/chordpro/test/27.source
similarity index 100%
rename from patacrep/songs/chordpro/test/27.sgc.source
rename to patacrep/songs/chordpro/test/27.source
diff --git a/patacrep/songs/chordpro/test/28.sgc.sgc b/patacrep/songs/chordpro/test/28.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/28.sgc.sgc
rename to patacrep/songs/chordpro/test/28.sgc
diff --git a/patacrep/songs/chordpro/test/28.sgc.source b/patacrep/songs/chordpro/test/28.source
similarity index 100%
rename from patacrep/songs/chordpro/test/28.sgc.source
rename to patacrep/songs/chordpro/test/28.source
diff --git a/patacrep/songs/chordpro/test/29.sgc.sgc b/patacrep/songs/chordpro/test/29.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/29.sgc.sgc
rename to patacrep/songs/chordpro/test/29.sgc
diff --git a/patacrep/songs/chordpro/test/29.sgc.source b/patacrep/songs/chordpro/test/29.source
similarity index 100%
rename from patacrep/songs/chordpro/test/29.sgc.source
rename to patacrep/songs/chordpro/test/29.source
diff --git a/patacrep/songs/chordpro/test/chords.sgc.sgc b/patacrep/songs/chordpro/test/chords.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/chords.sgc.sgc
rename to patacrep/songs/chordpro/test/chords.sgc
diff --git a/patacrep/songs/chordpro/test/chords.sgc.source b/patacrep/songs/chordpro/test/chords.source
similarity index 100%
rename from patacrep/songs/chordpro/test/chords.sgc.source
rename to patacrep/songs/chordpro/test/chords.source
diff --git a/patacrep/songs/chordpro/test/customchords.sgc.sgc b/patacrep/songs/chordpro/test/customchords.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/customchords.sgc.sgc
rename to patacrep/songs/chordpro/test/customchords.sgc
diff --git a/patacrep/songs/chordpro/test/customchords.sgc.source b/patacrep/songs/chordpro/test/customchords.source
similarity index 100%
rename from patacrep/songs/chordpro/test/customchords.sgc.source
rename to patacrep/songs/chordpro/test/customchords.source
diff --git a/patacrep/songs/chordpro/test/greensleeves.sgc.sgc b/patacrep/songs/chordpro/test/greensleeves.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/greensleeves.sgc.sgc
rename to patacrep/songs/chordpro/test/greensleeves.sgc
diff --git a/patacrep/songs/chordpro/test/greensleeves.sgc.source b/patacrep/songs/chordpro/test/greensleeves.source
similarity index 100%
rename from patacrep/songs/chordpro/test/greensleeves.sgc.source
rename to patacrep/songs/chordpro/test/greensleeves.source
diff --git a/patacrep/songs/chordpro/test/invalid_chord.sgc.sgc b/patacrep/songs/chordpro/test/invalid_chord.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/invalid_chord.sgc.sgc
rename to patacrep/songs/chordpro/test/invalid_chord.sgc
diff --git a/patacrep/songs/chordpro/test/invalid_chord.sgc.source b/patacrep/songs/chordpro/test/invalid_chord.source
similarity index 100%
rename from patacrep/songs/chordpro/test/invalid_chord.sgc.source
rename to patacrep/songs/chordpro/test/invalid_chord.source
diff --git a/patacrep/songs/chordpro/test/invalid_customchord.sgc.sgc b/patacrep/songs/chordpro/test/invalid_customchord.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/invalid_customchord.sgc.sgc
rename to patacrep/songs/chordpro/test/invalid_customchord.sgc
diff --git a/patacrep/songs/chordpro/test/invalid_customchord.sgc.source b/patacrep/songs/chordpro/test/invalid_customchord.source
similarity index 100%
rename from patacrep/songs/chordpro/test/invalid_customchord.sgc.source
rename to patacrep/songs/chordpro/test/invalid_customchord.source
diff --git a/patacrep/songs/chordpro/test/metadata.sgc.sgc b/patacrep/songs/chordpro/test/metadata.sgc
similarity index 100%
rename from patacrep/songs/chordpro/test/metadata.sgc.sgc
rename to patacrep/songs/chordpro/test/metadata.sgc
diff --git a/patacrep/songs/chordpro/test/metadata.sgc.source b/patacrep/songs/chordpro/test/metadata.source
similarity index 100%
rename from patacrep/songs/chordpro/test/metadata.sgc.source
rename to patacrep/songs/chordpro/test/metadata.source