diff --git a/PianoBooster/BUILD.txt b/BUILD.txt
similarity index 100%
rename from PianoBooster/BUILD.txt
rename to BUILD.txt
diff --git a/PianoBooster/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from PianoBooster/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/PianoBooster/README-OSX.txt b/README-OSX.txt
similarity index 100%
rename from PianoBooster/README-OSX.txt
rename to README-OSX.txt
diff --git a/PianoBooster/README.md b/README.md
similarity index 100%
rename from PianoBooster/README.md
rename to README.md
diff --git a/PianoBooster/TODO.md b/TODO.md
similarity index 100%
rename from PianoBooster/TODO.md
rename to TODO.md
diff --git a/PianoBooster/doc/README.md b/doc/README.md
similarity index 100%
rename from PianoBooster/doc/README.md
rename to doc/README.md
diff --git a/PianoBooster/doc/download.md b/doc/download.md
similarity index 100%
rename from PianoBooster/doc/download.md
rename to doc/download.md
diff --git a/PianoBooster/doc/faq.md b/doc/faq.md
similarity index 100%
rename from PianoBooster/doc/faq.md
rename to doc/faq.md
diff --git a/PianoBooster/doc/images/LinuxScreenShot.png b/doc/images/LinuxScreenShot.png
similarity index 100%
rename from PianoBooster/doc/images/LinuxScreenShot.png
rename to doc/images/LinuxScreenShot.png
diff --git a/PianoBooster/doc/images/LinuxScreenShot50.png b/doc/images/LinuxScreenShot50.png
similarity index 100%
rename from PianoBooster/doc/images/LinuxScreenShot50.png
rename to doc/images/LinuxScreenShot50.png
diff --git a/PianoBooster/doc/images/LinuxScreenShotAnnotated.png b/doc/images/LinuxScreenShotAnnotated.png
similarity index 100%
rename from PianoBooster/doc/images/LinuxScreenShotAnnotated.png
rename to doc/images/LinuxScreenShotAnnotated.png
diff --git a/PianoBooster/doc/images/LinuxScreenShotAnnotated50.png b/doc/images/LinuxScreenShotAnnotated50.png
similarity index 100%
rename from PianoBooster/doc/images/LinuxScreenShotAnnotated50.png
rename to doc/images/LinuxScreenShotAnnotated50.png
diff --git a/PianoBooster/doc/images/WindowsScreenShot.jpeg b/doc/images/WindowsScreenShot.jpeg
similarity index 100%
rename from PianoBooster/doc/images/WindowsScreenShot.jpeg
rename to doc/images/WindowsScreenShot.jpeg
diff --git a/PianoBooster/doc/images/WindowsScreenShot50.jpeg b/doc/images/WindowsScreenShot50.jpeg
similarity index 100%
rename from PianoBooster/doc/images/WindowsScreenShot50.jpeg
rename to doc/images/WindowsScreenShot50.jpeg
diff --git a/PianoBooster/doc/images/keyboardsetup.png b/doc/images/keyboardsetup.png
similarity index 100%
rename from PianoBooster/doc/images/keyboardsetup.png
rename to doc/images/keyboardsetup.png
diff --git a/PianoBooster/doc/images/logo64x64.png b/doc/images/logo64x64.png
similarity index 100%
rename from PianoBooster/doc/images/logo64x64.png
rename to doc/images/logo64x64.png
diff --git a/PianoBooster/doc/images/midisetup.png b/doc/images/midisetup.png
similarity index 100%
rename from PianoBooster/doc/images/midisetup.png
rename to doc/images/midisetup.png
diff --git a/PianoBooster/doc/images/pianobooster-note-chart.pdf b/doc/images/pianobooster-note-chart.pdf
similarity index 100%
rename from PianoBooster/doc/images/pianobooster-note-chart.pdf
rename to doc/images/pianobooster-note-chart.pdf
diff --git a/PianoBooster/doc/images/pianobooster-note-chart.png b/doc/images/pianobooster-note-chart.png
similarity index 100%
rename from PianoBooster/doc/images/pianobooster-note-chart.png
rename to doc/images/pianobooster-note-chart.png
diff --git a/PianoBooster/doc/images/pianolines.png b/doc/images/pianolines.png
similarity index 100%
rename from PianoBooster/doc/images/pianolines.png
rename to doc/images/pianolines.png
diff --git a/PianoBooster/doc/images/timingmarkers.jpeg b/doc/images/timingmarkers.jpeg
similarity index 100%
rename from PianoBooster/doc/images/timingmarkers.jpeg
rename to doc/images/timingmarkers.jpeg
diff --git a/PianoBooster/doc/images/timingmarkers.png b/doc/images/timingmarkers.png
similarity index 100%
rename from PianoBooster/doc/images/timingmarkers.png
rename to doc/images/timingmarkers.png
diff --git a/PianoBooster/doc/images/version_0_6_1.png b/doc/images/version_0_6_1.png
similarity index 100%
rename from PianoBooster/doc/images/version_0_6_1.png
rename to doc/images/version_0_6_1.png
diff --git a/PianoBooster/doc/pianohints.md b/doc/pianohints.md
similarity index 100%
rename from PianoBooster/doc/pianohints.md
rename to doc/pianohints.md
diff --git a/PianoBooster/gplv3.txt b/gplv3.txt
similarity index 100%
rename from PianoBooster/gplv3.txt
rename to gplv3.txt
diff --git a/PianoBooster/license.txt b/license.txt
similarity index 100%
rename from PianoBooster/license.txt
rename to license.txt
diff --git a/Music/BeginnerCourse/Booster34Lib.mma b/music-src/BeginnerCourse/Booster34Lib.mma
similarity index 100%
rename from Music/BeginnerCourse/Booster34Lib.mma
rename to music-src/BeginnerCourse/Booster34Lib.mma
diff --git a/Music/BeginnerCourse/Booster44Lib.mma b/music-src/BeginnerCourse/Booster44Lib.mma
similarity index 100%
rename from Music/BeginnerCourse/Booster44Lib.mma
rename to music-src/BeginnerCourse/Booster44Lib.mma
diff --git a/Music/BeginnerCourse/ChordOfCMajor.abc b/music-src/BeginnerCourse/ChordOfCMajor.abc
similarity index 100%
rename from Music/BeginnerCourse/ChordOfCMajor.abc
rename to music-src/BeginnerCourse/ChordOfCMajor.abc
diff --git a/Music/BeginnerCourse/ChordOfCMajor.mma b/music-src/BeginnerCourse/ChordOfCMajor.mma
similarity index 100%
rename from Music/BeginnerCourse/ChordOfCMajor.mma
rename to music-src/BeginnerCourse/ChordOfCMajor.mma
diff --git a/Music/BeginnerCourse/ChordOfCMajor_en.md b/music-src/BeginnerCourse/ChordOfCMajor_en.md
similarity index 100%
rename from Music/BeginnerCourse/ChordOfCMajor_en.md
rename to music-src/BeginnerCourse/ChordOfCMajor_en.md
diff --git a/Music/BeginnerCourse/ChordOfFMajor.abc b/music-src/BeginnerCourse/ChordOfFMajor.abc
similarity index 100%
rename from Music/BeginnerCourse/ChordOfFMajor.abc
rename to music-src/BeginnerCourse/ChordOfFMajor.abc
diff --git a/Music/BeginnerCourse/ChordOfFMajor.mma b/music-src/BeginnerCourse/ChordOfFMajor.mma
similarity index 100%
rename from Music/BeginnerCourse/ChordOfFMajor.mma
rename to music-src/BeginnerCourse/ChordOfFMajor.mma
diff --git a/Music/BeginnerCourse/ChordOfFMajor_en.md b/music-src/BeginnerCourse/ChordOfFMajor_en.md
similarity index 100%
rename from Music/BeginnerCourse/ChordOfFMajor_en.md
rename to music-src/BeginnerCourse/ChordOfFMajor_en.md
diff --git a/Music/BeginnerCourse/ClairDeLaLune.abc b/music-src/BeginnerCourse/ClairDeLaLune.abc
similarity index 100%
rename from Music/BeginnerCourse/ClairDeLaLune.abc
rename to music-src/BeginnerCourse/ClairDeLaLune.abc
diff --git a/Music/BeginnerCourse/ClairDeLaLune.mma b/music-src/BeginnerCourse/ClairDeLaLune.mma
similarity index 100%
rename from Music/BeginnerCourse/ClairDeLaLune.mma
rename to music-src/BeginnerCourse/ClairDeLaLune.mma
diff --git a/Music/BeginnerCourse/ClairDeLaLune_en.md b/music-src/BeginnerCourse/ClairDeLaLune_en.md
similarity index 100%
rename from Music/BeginnerCourse/ClairDeLaLune_en.md
rename to music-src/BeginnerCourse/ClairDeLaLune_en.md
diff --git a/Music/BeginnerCourse/DownAndUp.abc b/music-src/BeginnerCourse/DownAndUp.abc
similarity index 100%
rename from Music/BeginnerCourse/DownAndUp.abc
rename to music-src/BeginnerCourse/DownAndUp.abc
diff --git a/Music/BeginnerCourse/DownAndUp.mma b/music-src/BeginnerCourse/DownAndUp.mma
similarity index 100%
rename from Music/BeginnerCourse/DownAndUp.mma
rename to music-src/BeginnerCourse/DownAndUp.mma
diff --git a/Music/BeginnerCourse/DownAndUp_en.md b/music-src/BeginnerCourse/DownAndUp_en.md
similarity index 100%
rename from Music/BeginnerCourse/DownAndUp_en.md
rename to music-src/BeginnerCourse/DownAndUp_en.md
diff --git a/Music/BeginnerCourse/StartWithMiddleC.abc b/music-src/BeginnerCourse/StartWithMiddleC.abc
similarity index 100%
rename from Music/BeginnerCourse/StartWithMiddleC.abc
rename to music-src/BeginnerCourse/StartWithMiddleC.abc
diff --git a/Music/BeginnerCourse/StartWithMiddleC.mma b/music-src/BeginnerCourse/StartWithMiddleC.mma
similarity index 100%
rename from Music/BeginnerCourse/StartWithMiddleC.mma
rename to music-src/BeginnerCourse/StartWithMiddleC.mma
diff --git a/Music/BeginnerCourse/StartWithMiddleC_en.md b/music-src/BeginnerCourse/StartWithMiddleC_en.md
similarity index 100%
rename from Music/BeginnerCourse/StartWithMiddleC_en.md
rename to music-src/BeginnerCourse/StartWithMiddleC_en.md
diff --git a/Music/BeginnerCourse/UpAndDown.abc b/music-src/BeginnerCourse/UpAndDown.abc
similarity index 100%
rename from Music/BeginnerCourse/UpAndDown.abc
rename to music-src/BeginnerCourse/UpAndDown.abc
diff --git a/Music/BeginnerCourse/UpAndDown.mma b/music-src/BeginnerCourse/UpAndDown.mma
similarity index 100%
rename from Music/BeginnerCourse/UpAndDown.mma
rename to music-src/BeginnerCourse/UpAndDown.mma
diff --git a/Music/BeginnerCourse/UpAndDown_en.md b/music-src/BeginnerCourse/UpAndDown_en.md
similarity index 100%
rename from Music/BeginnerCourse/UpAndDown_en.md
rename to music-src/BeginnerCourse/UpAndDown_en.md
diff --git a/Music/BoosterMusic/AmazingGraceMid.abc b/music-src/BoosterMusic/AmazingGraceMid.abc
similarity index 100%
rename from Music/BoosterMusic/AmazingGraceMid.abc
rename to music-src/BoosterMusic/AmazingGraceMid.abc
diff --git a/Music/BoosterMusic/AmazingGraceMid.mma b/music-src/BoosterMusic/AmazingGraceMid.mma
similarity index 100%
rename from Music/BoosterMusic/AmazingGraceMid.mma
rename to music-src/BoosterMusic/AmazingGraceMid.mma
diff --git a/Music/BoosterMusic/AmazingGracePs.abc b/music-src/BoosterMusic/AmazingGracePs.abc
similarity index 100%
rename from Music/BoosterMusic/AmazingGracePs.abc
rename to music-src/BoosterMusic/AmazingGracePs.abc
diff --git a/Music/BoosterMusic/ClairDeLaLune.abc b/music-src/BoosterMusic/ClairDeLaLune.abc
similarity index 100%
rename from Music/BoosterMusic/ClairDeLaLune.abc
rename to music-src/BoosterMusic/ClairDeLaLune.abc
diff --git a/Music/BoosterMusic/ClairDeLaLune.mma b/music-src/BoosterMusic/ClairDeLaLune.mma
similarity index 100%
rename from Music/BoosterMusic/ClairDeLaLune.mma
rename to music-src/BoosterMusic/ClairDeLaLune.mma
diff --git a/Music/BoosterMusic/ClairDeLaLune_en.md b/music-src/BoosterMusic/ClairDeLaLune_en.md
similarity index 100%
rename from Music/BoosterMusic/ClairDeLaLune_en.md
rename to music-src/BoosterMusic/ClairDeLaLune_en.md
diff --git a/Music/BoosterMusic/FrereJacques.abc b/music-src/BoosterMusic/FrereJacques.abc
similarity index 100%
rename from Music/BoosterMusic/FrereJacques.abc
rename to music-src/BoosterMusic/FrereJacques.abc
diff --git a/Music/BoosterMusic/FrereJacques.mma b/music-src/BoosterMusic/FrereJacques.mma
similarity index 100%
rename from Music/BoosterMusic/FrereJacques.mma
rename to music-src/BoosterMusic/FrereJacques.mma
diff --git a/Music/BoosterMusic/Greensleeves.abc b/music-src/BoosterMusic/Greensleeves.abc
similarity index 100%
rename from Music/BoosterMusic/Greensleeves.abc
rename to music-src/BoosterMusic/Greensleeves.abc
diff --git a/Music/BoosterMusic/Greensleeves.mma b/music-src/BoosterMusic/Greensleeves.mma
similarity index 100%
rename from Music/BoosterMusic/Greensleeves.mma
rename to music-src/BoosterMusic/Greensleeves.mma
diff --git a/Music/BoosterMusic/LavendersBlue.abc b/music-src/BoosterMusic/LavendersBlue.abc
similarity index 100%
rename from Music/BoosterMusic/LavendersBlue.abc
rename to music-src/BoosterMusic/LavendersBlue.abc
diff --git a/Music/BoosterMusic/LavendersBlue.mma b/music-src/BoosterMusic/LavendersBlue.mma
similarity index 100%
rename from Music/BoosterMusic/LavendersBlue.mma
rename to music-src/BoosterMusic/LavendersBlue.mma
diff --git a/Music/BoosterMusic/LavendersBlue_en.md b/music-src/BoosterMusic/LavendersBlue_en.md
similarity index 100%
rename from Music/BoosterMusic/LavendersBlue_en.md
rename to music-src/BoosterMusic/LavendersBlue_en.md
diff --git a/Music/BoosterMusic/ScarboroughFair.abc b/music-src/BoosterMusic/ScarboroughFair.abc
similarity index 100%
rename from Music/BoosterMusic/ScarboroughFair.abc
rename to music-src/BoosterMusic/ScarboroughFair.abc
diff --git a/Music/BoosterMusic/ScarboroughFair.mma b/music-src/BoosterMusic/ScarboroughFair.mma
similarity index 100%
rename from Music/BoosterMusic/ScarboroughFair.mma
rename to music-src/BoosterMusic/ScarboroughFair.mma
diff --git a/Music/BoosterMusic/SkipToMyLoo.abc b/music-src/BoosterMusic/SkipToMyLoo.abc
similarity index 100%
rename from Music/BoosterMusic/SkipToMyLoo.abc
rename to music-src/BoosterMusic/SkipToMyLoo.abc
diff --git a/Music/BoosterMusic/SkipToMyLoo.mma b/music-src/BoosterMusic/SkipToMyLoo.mma
similarity index 100%
rename from Music/BoosterMusic/SkipToMyLoo.mma
rename to music-src/BoosterMusic/SkipToMyLoo.mma
diff --git a/Music/BoosterMusic/SkipToMyLoo_en.md b/music-src/BoosterMusic/SkipToMyLoo_en.md
similarity index 100%
rename from Music/BoosterMusic/SkipToMyLoo_en.md
rename to music-src/BoosterMusic/SkipToMyLoo_en.md
diff --git a/Music/Makefile b/music-src/Makefile
similarity index 100%
rename from Music/Makefile
rename to music-src/Makefile
diff --git a/Music/music.md.end b/music-src/music.md.end
similarity index 100%
rename from Music/music.md.end
rename to music-src/music.md.end
diff --git a/Music/music.md.start b/music-src/music.md.start
similarity index 100%
rename from Music/music.md.start
rename to music-src/music.md.start
diff --git a/PianoBooster/music/BoosterMusicBooks.zip b/music/BoosterMusicBooks.zip
similarity index 100%
rename from PianoBooster/music/BoosterMusicBooks.zip
rename to music/BoosterMusicBooks.zip
diff --git a/PianoBooster/music/CMakeLists.txt b/music/CMakeLists.txt
similarity index 100%
rename from PianoBooster/music/CMakeLists.txt
rename to music/CMakeLists.txt
diff --git a/PianoBooster/src/Bar.cpp b/src/Bar.cpp
similarity index 100%
rename from PianoBooster/src/Bar.cpp
rename to src/Bar.cpp
diff --git a/PianoBooster/src/Bar.h b/src/Bar.h
similarity index 100%
rename from PianoBooster/src/Bar.h
rename to src/Bar.h
diff --git a/PianoBooster/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from PianoBooster/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/PianoBooster/src/Cfg.cpp b/src/Cfg.cpp
similarity index 100%
rename from PianoBooster/src/Cfg.cpp
rename to src/Cfg.cpp
diff --git a/PianoBooster/src/Cfg.h b/src/Cfg.h
similarity index 100%
rename from PianoBooster/src/Cfg.h
rename to src/Cfg.h
diff --git a/PianoBooster/src/Chord.cpp b/src/Chord.cpp
similarity index 100%
rename from PianoBooster/src/Chord.cpp
rename to src/Chord.cpp
diff --git a/PianoBooster/src/Chord.h b/src/Chord.h
similarity index 100%
rename from PianoBooster/src/Chord.h
rename to src/Chord.h
diff --git a/PianoBooster/src/Conductor.cpp b/src/Conductor.cpp
similarity index 100%
rename from PianoBooster/src/Conductor.cpp
rename to src/Conductor.cpp
diff --git a/PianoBooster/src/Conductor.h b/src/Conductor.h
similarity index 100%
rename from PianoBooster/src/Conductor.h
rename to src/Conductor.h
diff --git a/PianoBooster/src/Doxyfile b/src/Doxyfile
similarity index 100%
rename from PianoBooster/src/Doxyfile
rename to src/Doxyfile
diff --git a/PianoBooster/src/Draw.cpp b/src/Draw.cpp
similarity index 100%
rename from PianoBooster/src/Draw.cpp
rename to src/Draw.cpp
diff --git a/PianoBooster/src/Draw.h b/src/Draw.h
similarity index 100%
rename from PianoBooster/src/Draw.h
rename to src/Draw.h
diff --git a/PianoBooster/src/GlView.cpp b/src/GlView.cpp
similarity index 100%
rename from PianoBooster/src/GlView.cpp
rename to src/GlView.cpp
diff --git a/PianoBooster/src/GlView.h b/src/GlView.h
similarity index 100%
rename from PianoBooster/src/GlView.h
rename to src/GlView.h
diff --git a/PianoBooster/src/GuiHighScoreWindow.ui b/src/GuiHighScoreWindow.ui
similarity index 100%
rename from PianoBooster/src/GuiHighScoreWindow.ui
rename to src/GuiHighScoreWindow.ui
diff --git a/PianoBooster/src/GuiKeyboardSetupDialog.cpp b/src/GuiKeyboardSetupDialog.cpp
similarity index 100%
rename from PianoBooster/src/GuiKeyboardSetupDialog.cpp
rename to src/GuiKeyboardSetupDialog.cpp
diff --git a/PianoBooster/src/GuiKeyboardSetupDialog.h b/src/GuiKeyboardSetupDialog.h
similarity index 100%
rename from PianoBooster/src/GuiKeyboardSetupDialog.h
rename to src/GuiKeyboardSetupDialog.h
diff --git a/PianoBooster/src/GuiKeyboardSetupDialog.ui b/src/GuiKeyboardSetupDialog.ui
similarity index 100%
rename from PianoBooster/src/GuiKeyboardSetupDialog.ui
rename to src/GuiKeyboardSetupDialog.ui
diff --git a/PianoBooster/src/GuiLoopingPopup.cpp b/src/GuiLoopingPopup.cpp
similarity index 100%
rename from PianoBooster/src/GuiLoopingPopup.cpp
rename to src/GuiLoopingPopup.cpp
diff --git a/PianoBooster/src/GuiLoopingPopup.h b/src/GuiLoopingPopup.h
similarity index 100%
rename from PianoBooster/src/GuiLoopingPopup.h
rename to src/GuiLoopingPopup.h
diff --git a/PianoBooster/src/GuiLoopingPopup.ui b/src/GuiLoopingPopup.ui
similarity index 100%
rename from PianoBooster/src/GuiLoopingPopup.ui
rename to src/GuiLoopingPopup.ui
diff --git a/PianoBooster/src/GuiMidiSetupDialog.cpp b/src/GuiMidiSetupDialog.cpp
similarity index 100%
rename from PianoBooster/src/GuiMidiSetupDialog.cpp
rename to src/GuiMidiSetupDialog.cpp
diff --git a/PianoBooster/src/GuiMidiSetupDialog.h b/src/GuiMidiSetupDialog.h
similarity index 100%
rename from PianoBooster/src/GuiMidiSetupDialog.h
rename to src/GuiMidiSetupDialog.h
diff --git a/PianoBooster/src/GuiMidiSetupDialog.ui b/src/GuiMidiSetupDialog.ui
similarity index 100%
rename from PianoBooster/src/GuiMidiSetupDialog.ui
rename to src/GuiMidiSetupDialog.ui
diff --git a/PianoBooster/src/GuiPreferencesDialog.cpp b/src/GuiPreferencesDialog.cpp
similarity index 100%
rename from PianoBooster/src/GuiPreferencesDialog.cpp
rename to src/GuiPreferencesDialog.cpp
diff --git a/PianoBooster/src/GuiPreferencesDialog.h b/src/GuiPreferencesDialog.h
similarity index 100%
rename from PianoBooster/src/GuiPreferencesDialog.h
rename to src/GuiPreferencesDialog.h
diff --git a/PianoBooster/src/GuiPreferencesDialog.ui b/src/GuiPreferencesDialog.ui
similarity index 100%
rename from PianoBooster/src/GuiPreferencesDialog.ui
rename to src/GuiPreferencesDialog.ui
diff --git a/PianoBooster/src/GuiSidePanel.cpp b/src/GuiSidePanel.cpp
similarity index 100%
rename from PianoBooster/src/GuiSidePanel.cpp
rename to src/GuiSidePanel.cpp
diff --git a/PianoBooster/src/GuiSidePanel.h b/src/GuiSidePanel.h
similarity index 100%
rename from PianoBooster/src/GuiSidePanel.h
rename to src/GuiSidePanel.h
diff --git a/PianoBooster/src/GuiSidePanel.ui b/src/GuiSidePanel.ui
similarity index 100%
rename from PianoBooster/src/GuiSidePanel.ui
rename to src/GuiSidePanel.ui
diff --git a/PianoBooster/src/GuiSongDetailsDialog.cpp b/src/GuiSongDetailsDialog.cpp
similarity index 100%
rename from PianoBooster/src/GuiSongDetailsDialog.cpp
rename to src/GuiSongDetailsDialog.cpp
diff --git a/PianoBooster/src/GuiSongDetailsDialog.h b/src/GuiSongDetailsDialog.h
similarity index 100%
rename from PianoBooster/src/GuiSongDetailsDialog.h
rename to src/GuiSongDetailsDialog.h
diff --git a/PianoBooster/src/GuiSongDetailsDialog.ui b/src/GuiSongDetailsDialog.ui
similarity index 100%
rename from PianoBooster/src/GuiSongDetailsDialog.ui
rename to src/GuiSongDetailsDialog.ui
diff --git a/PianoBooster/src/GuiTopBar.cpp b/src/GuiTopBar.cpp
similarity index 100%
rename from PianoBooster/src/GuiTopBar.cpp
rename to src/GuiTopBar.cpp
diff --git a/PianoBooster/src/GuiTopBar.h b/src/GuiTopBar.h
similarity index 100%
rename from PianoBooster/src/GuiTopBar.h
rename to src/GuiTopBar.h
diff --git a/PianoBooster/src/GuiTopBar.ui b/src/GuiTopBar.ui
similarity index 100%
rename from PianoBooster/src/GuiTopBar.ui
rename to src/GuiTopBar.ui
diff --git a/PianoBooster/src/Merge.cpp b/src/Merge.cpp
similarity index 100%
rename from PianoBooster/src/Merge.cpp
rename to src/Merge.cpp
diff --git a/PianoBooster/src/Merge.h b/src/Merge.h
similarity index 100%
rename from PianoBooster/src/Merge.h
rename to src/Merge.h
diff --git a/PianoBooster/src/MidiDevice.cpp b/src/MidiDevice.cpp
similarity index 100%
rename from PianoBooster/src/MidiDevice.cpp
rename to src/MidiDevice.cpp
diff --git a/PianoBooster/src/MidiDevice.h b/src/MidiDevice.h
similarity index 100%
rename from PianoBooster/src/MidiDevice.h
rename to src/MidiDevice.h
diff --git a/PianoBooster/src/MidiDeviceBase.h b/src/MidiDeviceBase.h
similarity index 100%
rename from PianoBooster/src/MidiDeviceBase.h
rename to src/MidiDeviceBase.h
diff --git a/PianoBooster/src/MidiDeviceFluidSynth.cpp b/src/MidiDeviceFluidSynth.cpp
similarity index 100%
rename from PianoBooster/src/MidiDeviceFluidSynth.cpp
rename to src/MidiDeviceFluidSynth.cpp
diff --git a/PianoBooster/src/MidiDeviceFluidSynth.h b/src/MidiDeviceFluidSynth.h
similarity index 100%
rename from PianoBooster/src/MidiDeviceFluidSynth.h
rename to src/MidiDeviceFluidSynth.h
diff --git a/PianoBooster/src/MidiDeviceRt.cpp b/src/MidiDeviceRt.cpp
similarity index 100%
rename from PianoBooster/src/MidiDeviceRt.cpp
rename to src/MidiDeviceRt.cpp
diff --git a/PianoBooster/src/MidiDeviceRt.h b/src/MidiDeviceRt.h
similarity index 100%
rename from PianoBooster/src/MidiDeviceRt.h
rename to src/MidiDeviceRt.h
diff --git a/PianoBooster/src/MidiEvent.h b/src/MidiEvent.h
similarity index 100%
rename from PianoBooster/src/MidiEvent.h
rename to src/MidiEvent.h
diff --git a/PianoBooster/src/MidiFile.cpp b/src/MidiFile.cpp
similarity index 100%
rename from PianoBooster/src/MidiFile.cpp
rename to src/MidiFile.cpp
diff --git a/PianoBooster/src/MidiFile.h b/src/MidiFile.h
similarity index 100%
rename from PianoBooster/src/MidiFile.h
rename to src/MidiFile.h
diff --git a/PianoBooster/src/MidiTrack.cpp b/src/MidiTrack.cpp
similarity index 100%
rename from PianoBooster/src/MidiTrack.cpp
rename to src/MidiTrack.cpp
diff --git a/PianoBooster/src/MidiTrack.h b/src/MidiTrack.h
similarity index 100%
rename from PianoBooster/src/MidiTrack.h
rename to src/MidiTrack.h
diff --git a/PianoBooster/src/Notation.cpp b/src/Notation.cpp
similarity index 100%
rename from PianoBooster/src/Notation.cpp
rename to src/Notation.cpp
diff --git a/PianoBooster/src/Notation.h b/src/Notation.h
similarity index 100%
rename from PianoBooster/src/Notation.h
rename to src/Notation.h
diff --git a/PianoBooster/src/Piano.cpp b/src/Piano.cpp
similarity index 100%
rename from PianoBooster/src/Piano.cpp
rename to src/Piano.cpp
diff --git a/PianoBooster/src/Piano.h b/src/Piano.h
similarity index 100%
rename from PianoBooster/src/Piano.h
rename to src/Piano.h
diff --git a/PianoBooster/src/QtMain.cpp b/src/QtMain.cpp
similarity index 100%
rename from PianoBooster/src/QtMain.cpp
rename to src/QtMain.cpp
diff --git a/PianoBooster/src/QtWindow.cpp b/src/QtWindow.cpp
similarity index 100%
rename from PianoBooster/src/QtWindow.cpp
rename to src/QtWindow.cpp
diff --git a/PianoBooster/src/QtWindow.h b/src/QtWindow.h
similarity index 100%
rename from PianoBooster/src/QtWindow.h
rename to src/QtWindow.h
diff --git a/PianoBooster/src/Queue.h b/src/Queue.h
similarity index 100%
rename from PianoBooster/src/Queue.h
rename to src/Queue.h
diff --git a/PianoBooster/src/Rating.cpp b/src/Rating.cpp
similarity index 100%
rename from PianoBooster/src/Rating.cpp
rename to src/Rating.cpp
diff --git a/PianoBooster/src/Rating.h b/src/Rating.h
similarity index 100%
rename from PianoBooster/src/Rating.h
rename to src/Rating.h
diff --git a/PianoBooster/src/ReleaseNote.txt b/src/ReleaseNote.txt
similarity index 100%
rename from PianoBooster/src/ReleaseNote.txt
rename to src/ReleaseNote.txt
diff --git a/PianoBooster/src/Score.cpp b/src/Score.cpp
similarity index 100%
rename from PianoBooster/src/Score.cpp
rename to src/Score.cpp
diff --git a/PianoBooster/src/Score.h b/src/Score.h
similarity index 100%
rename from PianoBooster/src/Score.h
rename to src/Score.h
diff --git a/PianoBooster/src/Scroll.cpp b/src/Scroll.cpp
similarity index 100%
rename from PianoBooster/src/Scroll.cpp
rename to src/Scroll.cpp
diff --git a/PianoBooster/src/Scroll.h b/src/Scroll.h
similarity index 100%
rename from PianoBooster/src/Scroll.h
rename to src/Scroll.h
diff --git a/PianoBooster/src/Settings.cpp b/src/Settings.cpp
similarity index 100%
rename from PianoBooster/src/Settings.cpp
rename to src/Settings.cpp
diff --git a/PianoBooster/src/Settings.h b/src/Settings.h
similarity index 100%
rename from PianoBooster/src/Settings.h
rename to src/Settings.h
diff --git a/PianoBooster/src/Song.cpp b/src/Song.cpp
similarity index 100%
rename from PianoBooster/src/Song.cpp
rename to src/Song.cpp
diff --git a/PianoBooster/src/Song.h b/src/Song.h
similarity index 100%
rename from PianoBooster/src/Song.h
rename to src/Song.h
diff --git a/PianoBooster/src/StavePosition.cpp b/src/StavePosition.cpp
similarity index 100%
rename from PianoBooster/src/StavePosition.cpp
rename to src/StavePosition.cpp
diff --git a/PianoBooster/src/StavePosition.h b/src/StavePosition.h
similarity index 100%
rename from PianoBooster/src/StavePosition.h
rename to src/StavePosition.h
diff --git a/PianoBooster/src/Symbol.h b/src/Symbol.h
similarity index 100%
rename from PianoBooster/src/Symbol.h
rename to src/Symbol.h
diff --git a/PianoBooster/src/Tempo.cpp b/src/Tempo.cpp
similarity index 100%
rename from PianoBooster/src/Tempo.cpp
rename to src/Tempo.cpp
diff --git a/PianoBooster/src/Tempo.h b/src/Tempo.h
similarity index 100%
rename from PianoBooster/src/Tempo.h
rename to src/Tempo.h
diff --git a/PianoBooster/src/TrackList.cpp b/src/TrackList.cpp
similarity index 100%
rename from PianoBooster/src/TrackList.cpp
rename to src/TrackList.cpp
diff --git a/PianoBooster/src/TrackList.h b/src/TrackList.h
similarity index 100%
rename from PianoBooster/src/TrackList.h
rename to src/TrackList.h
diff --git a/PianoBooster/src/Util.cpp b/src/Util.cpp
similarity index 100%
rename from PianoBooster/src/Util.cpp
rename to src/Util.cpp
diff --git a/PianoBooster/src/Util.h b/src/Util.h
similarity index 100%
rename from PianoBooster/src/Util.h
rename to src/Util.h
diff --git a/PianoBooster/src/application.qrc b/src/application.qrc
similarity index 100%
rename from PianoBooster/src/application.qrc
rename to src/application.qrc
diff --git a/PianoBooster/src/images/Logo32x32.png b/src/images/Logo32x32.png
similarity index 100%
rename from PianoBooster/src/images/Logo32x32.png
rename to src/images/Logo32x32.png
diff --git a/PianoBooster/src/images/README.txt b/src/images/README.txt
similarity index 100%
rename from PianoBooster/src/images/README.txt
rename to src/images/README.txt
diff --git a/PianoBooster/src/images/copy.png b/src/images/copy.png
similarity index 100%
rename from PianoBooster/src/images/copy.png
rename to src/images/copy.png
diff --git a/PianoBooster/src/images/cut.png b/src/images/cut.png
similarity index 100%
rename from PianoBooster/src/images/cut.png
rename to src/images/cut.png
diff --git a/PianoBooster/src/images/flag.png b/src/images/flag.png
similarity index 100%
rename from PianoBooster/src/images/flag.png
rename to src/images/flag.png
diff --git a/PianoBooster/src/images/logo64x64.png b/src/images/logo64x64.png
similarity index 100%
rename from PianoBooster/src/images/logo64x64.png
rename to src/images/logo64x64.png
diff --git a/PianoBooster/src/images/new.png b/src/images/new.png
similarity index 100%
rename from PianoBooster/src/images/new.png
rename to src/images/new.png
diff --git a/PianoBooster/src/images/open.png b/src/images/open.png
similarity index 100%
rename from PianoBooster/src/images/open.png
rename to src/images/open.png
diff --git a/PianoBooster/src/images/paste.png b/src/images/paste.png
similarity index 100%
rename from PianoBooster/src/images/paste.png
rename to src/images/paste.png
diff --git a/PianoBooster/src/images/pianobooster.png b/src/images/pianobooster.png
similarity index 100%
rename from PianoBooster/src/images/pianobooster.png
rename to src/images/pianobooster.png
diff --git a/PianoBooster/src/images/play-from-start.png b/src/images/play-from-start.png
similarity index 100%
rename from PianoBooster/src/images/play-from-start.png
rename to src/images/play-from-start.png
diff --git a/PianoBooster/src/images/play.png b/src/images/play.png
similarity index 100%
rename from PianoBooster/src/images/play.png
rename to src/images/play.png
diff --git a/PianoBooster/src/images/save.png b/src/images/save.png
similarity index 100%
rename from PianoBooster/src/images/save.png
rename to src/images/save.png
diff --git a/PianoBooster/src/images/stop.png b/src/images/stop.png
similarity index 100%
rename from PianoBooster/src/images/stop.png
rename to src/images/stop.png
diff --git a/PianoBooster/src/pianobooster.desktop b/src/pianobooster.desktop
similarity index 100%
rename from PianoBooster/src/pianobooster.desktop
rename to src/pianobooster.desktop
diff --git a/PianoBooster/src/pianobooster.icns b/src/pianobooster.icns
similarity index 100%
rename from PianoBooster/src/pianobooster.icns
rename to src/pianobooster.icns
diff --git a/PianoBooster/src/pianobooster.ico b/src/pianobooster.ico
similarity index 100%
rename from PianoBooster/src/pianobooster.ico
rename to src/pianobooster.ico
diff --git a/PianoBooster/src/pianobooster.pro b/src/pianobooster.pro
similarity index 100%
rename from PianoBooster/src/pianobooster.pro
rename to src/pianobooster.pro
diff --git a/PianoBooster/src/pianobooster.rc b/src/pianobooster.rc
similarity index 100%
rename from PianoBooster/src/pianobooster.rc
rename to src/pianobooster.rc
diff --git a/PianoBooster/src/precompile/PCHSupport.cmake b/src/precompile/PCHSupport.cmake
similarity index 100%
rename from PianoBooster/src/precompile/PCHSupport.cmake
rename to src/precompile/PCHSupport.cmake
diff --git a/PianoBooster/src/precompile/PCHSupport_26.cmake b/src/precompile/PCHSupport_26.cmake
similarity index 100%
rename from PianoBooster/src/precompile/PCHSupport_26.cmake
rename to src/precompile/PCHSupport_26.cmake
diff --git a/PianoBooster/src/precompile/precompile.h b/src/precompile/precompile.h
similarity index 100%
rename from PianoBooster/src/precompile/precompile.h
rename to src/precompile/precompile.h
diff --git a/PianoBooster/src/rtmidi/RtError.h b/src/rtmidi/RtError.h
similarity index 100%
rename from PianoBooster/src/rtmidi/RtError.h
rename to src/rtmidi/RtError.h
diff --git a/PianoBooster/src/rtmidi/RtMidi.cpp b/src/rtmidi/RtMidi.cpp
similarity index 100%
rename from PianoBooster/src/rtmidi/RtMidi.cpp
rename to src/rtmidi/RtMidi.cpp
diff --git a/PianoBooster/src/rtmidi/RtMidi.h b/src/rtmidi/RtMidi.h
similarity index 100%
rename from PianoBooster/src/rtmidi/RtMidi.h
rename to src/rtmidi/RtMidi.h
diff --git a/PianoBooster/translations/CMakeLists.txt b/translations/CMakeLists.txt
similarity index 100%
rename from PianoBooster/translations/CMakeLists.txt
rename to translations/CMakeLists.txt
diff --git a/PianoBooster/translations/pianobooster_blank.ts b/translations/pianobooster_blank.ts
similarity index 100%
rename from PianoBooster/translations/pianobooster_blank.ts
rename to translations/pianobooster_blank.ts
diff --git a/PianoBooster/translations/pianobooster_es.ts b/translations/pianobooster_es.ts
similarity index 100%
rename from PianoBooster/translations/pianobooster_es.ts
rename to translations/pianobooster_es.ts
diff --git a/PianoBooster/translations/pianobooster_fr.ts b/translations/pianobooster_fr.ts
similarity index 100%
rename from PianoBooster/translations/pianobooster_fr.ts
rename to translations/pianobooster_fr.ts
diff --git a/PianoBooster/translations/pianobooster_gl.ts b/translations/pianobooster_gl.ts
similarity index 100%
rename from PianoBooster/translations/pianobooster_gl.ts
rename to translations/pianobooster_gl.ts
diff --git a/PianoBooster/translations/pianobooster_ja.ts b/translations/pianobooster_ja.ts
similarity index 100%
rename from PianoBooster/translations/pianobooster_ja.ts
rename to translations/pianobooster_ja.ts
diff --git a/PianoBooster/win32/pianobooster.nsi b/win32/pianobooster.nsi
similarity index 100%
rename from PianoBooster/win32/pianobooster.nsi
rename to win32/pianobooster.nsi