diff --git a/all_base_includes.ly b/private_includes/base/all.ily
similarity index 68%
rename from all_base_includes.ly
rename to private_includes/base/all.ily
index def59c2..03a811d 100644
--- a/all_base_includes.ly
+++ b/private_includes/base/all.ily
@@ -1,3 +1,9 @@
+#(define include_dir_not_added? (if (defined? 'include_dir_not_added?) include_dir_not_added? #t))
+#(if include_dir_not_added?
+   (let* ((common-include-dir (dirname (dirname (dirname (current-filename))))))
+      (ly:parser-append-to-include-path common-include-dir)
+      (set! include_dir_not_added? #f)))
+
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
 #(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
@@ -19,15 +25,15 @@
 #(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
 #(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
 
-\include "basic_format_and_style_settings.ly"
-\include "eps_file_from_song_dir.ly"
-\include "title_with_category_images.ly"
-\include "chord_settings.ly"
-\include "transposition.ly"
-\include "verses_with_chords.ly"
-\include "arrows_in_scores.ly"
-\include "swing_style.ly"
-\include "inline_score.ly"
+\include "basic_format_and_style_settings.ily"
+\include "eps_file_from_song_dir.ily"
+\include "title_with_category_images.ily"
+\include "chord_settings.ily"
+\include "transposition.ily"
+\include "verses_with_chords.ily"
+\include "arrows_in_scores.ily"
+\include "swing_style.ily"
+\include "inline_score.ily"
 \include "custom_indentation.ily"
 \include "include_from_song.ily"
 
diff --git a/arrows_in_scores.ly b/private_includes/base/arrows_in_scores.ily
similarity index 100%
rename from arrows_in_scores.ly
rename to private_includes/base/arrows_in_scores.ily
diff --git a/basic_format_and_style_settings.ly b/private_includes/base/basic_format_and_style_settings.ily
similarity index 98%
rename from basic_format_and_style_settings.ly
rename to private_includes/base/basic_format_and_style_settings.ily
index 2f10ebb..2c4b2d9 100644
--- a/basic_format_and_style_settings.ly
+++ b/private_includes/base/basic_format_and_style_settings.ily
@@ -1,10 +1,10 @@
 \language "deutsch"
 
-\include "default_style.ly"
-\include "default_songinfo_style.ly"
-\include "footer_with_songinfo.ly"
+\include "default_style.ily"
+\include "default_songinfo_style.ily"
+\include "footer_with_songinfo.ily"
 
-\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly")
+\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "../void.ily")
 
 #(set-default-paper-size songFormatAndSize)
 #(set-global-staff-size globalSize)
diff --git a/chord_settings.ly b/private_includes/base/chord_settings.ily
similarity index 100%
rename from chord_settings.ly
rename to private_includes/base/chord_settings.ily
diff --git a/custom_indentation.ily b/private_includes/base/custom_indentation.ily
similarity index 100%
rename from custom_indentation.ily
rename to private_includes/base/custom_indentation.ily
diff --git a/default_songinfo_style.ly b/private_includes/base/default_songinfo_style.ily
similarity index 100%
rename from default_songinfo_style.ly
rename to private_includes/base/default_songinfo_style.ily
diff --git a/default_style.ly b/private_includes/base/default_style.ily
similarity index 100%
rename from default_style.ly
rename to private_includes/base/default_style.ily
diff --git a/eps_file_from_song_dir.ly b/private_includes/base/eps_file_from_song_dir.ily
similarity index 100%
rename from eps_file_from_song_dir.ly
rename to private_includes/base/eps_file_from_song_dir.ily
diff --git a/footer_with_songinfo.ly b/private_includes/base/footer_with_songinfo.ily
similarity index 100%
rename from footer_with_songinfo.ly
rename to private_includes/base/footer_with_songinfo.ily
diff --git a/include_from_song.ily b/private_includes/base/include_from_song.ily
similarity index 87%
rename from include_from_song.ily
rename to private_includes/base/include_from_song.ily
index d5034c5..6f22897 100644
--- a/include_from_song.ily
+++ b/private_includes/base/include_from_song.ily
@@ -5,7 +5,7 @@ includeFromSong =
     (ly:parser-parse-string (ly:parser-clone)
       (ly:format "\\include \"~a\""
       (string-append
-        (dirname (dirname (current-filename)))
+        (dirname (dirname (dirname (dirname (current-filename)))))
         file-name-separator-string
         "lilypond-song-includes"
         file-name-separator-string
diff --git a/inline_score.ly b/private_includes/base/inline_score.ily
similarity index 100%
rename from inline_score.ly
rename to private_includes/base/inline_score.ily
diff --git a/scm/json_parser.scm b/private_includes/base/scm/json_parser.scm
similarity index 100%
rename from scm/json_parser.scm
rename to private_includes/base/scm/json_parser.scm
diff --git a/scm/resolve_inherits.scm b/private_includes/base/scm/resolve_inherits.scm
similarity index 100%
rename from scm/resolve_inherits.scm
rename to private_includes/base/scm/resolve_inherits.scm
diff --git a/scm/yaml_parser.scm b/private_includes/base/scm/yaml_parser.scm
similarity index 100%
rename from scm/yaml_parser.scm
rename to private_includes/base/scm/yaml_parser.scm
diff --git a/swing_style.ly b/private_includes/base/swing_style.ily
similarity index 100%
rename from swing_style.ly
rename to private_includes/base/swing_style.ily
diff --git a/title_with_category_images.ly b/private_includes/base/title_with_category_images.ily
similarity index 100%
rename from title_with_category_images.ly
rename to private_includes/base/title_with_category_images.ily
diff --git a/transposition.ly b/private_includes/base/transposition.ily
similarity index 100%
rename from transposition.ly
rename to private_includes/base/transposition.ily
diff --git a/verses_with_chords.ly b/private_includes/base/verses_with_chords.ily
similarity index 100%
rename from verses_with_chords.ly
rename to private_includes/base/verses_with_chords.ily
diff --git a/appendix.ly b/private_includes/book/appendix.ily
similarity index 100%
rename from appendix.ly
rename to private_includes/book/appendix.ily
diff --git a/book_include.ly b/private_includes/book/book_include.ily
similarity index 100%
rename from book_include.ly
rename to private_includes/book/book_include.ily
diff --git a/toc_include.ly b/private_includes/book/toc_include.ily
similarity index 100%
rename from toc_include.ly
rename to private_includes/book/toc_include.ily
diff --git a/void.ly b/private_includes/void.ily
similarity index 100%
rename from void.ly
rename to private_includes/void.ily
diff --git a/public_includes/book_top.ily b/public_includes/book_top.ily
new file mode 100644
index 0000000..2dd0529
--- /dev/null
+++ b/public_includes/book_top.ily
@@ -0,0 +1,3 @@
+\include "../private_includes/book/book_include.ily"
+\include "../private_includes/book/toc_include.ily"
+\include "../private_includes/book/appendix.ily"
\ No newline at end of file
diff --git a/break_paged_output.ily b/public_includes/break_paged_output.ily
similarity index 100%
rename from break_paged_output.ily
rename to public_includes/break_paged_output.ily
diff --git a/standalone_output.ly b/public_includes/layout_bottom.ily
similarity index 100%
rename from standalone_output.ly
rename to public_includes/layout_bottom.ily
diff --git a/general_include.ly b/public_includes/layout_top.ily
similarity index 58%
rename from general_include.ly
rename to public_includes/layout_top.ily
index 3d33341..5796a1a 100644
--- a/general_include.ly
+++ b/public_includes/layout_top.ily
@@ -1,6 +1,5 @@
-\version "2.25.8"
 #(ly:set-option 'relative-includes #t)
 
 #(define noDefaultOutput #t)
 
-\include "all_base_includes.ly"
\ No newline at end of file
+\include "../private_includes/base/all.ily"
\ No newline at end of file
diff --git a/default_output.ly b/public_includes/pool_bottom.ily
similarity index 62%
rename from default_output.ly
rename to public_includes/pool_bottom.ily
index 215dd83..13010cb 100644
--- a/default_output.ly
+++ b/public_includes/pool_bottom.ily
@@ -4,4 +4,4 @@ HEADER = \bookpart {
     \basicSongInfo
   }
 }
-\include #(if noDefaultOutput "void.ly" "standalone_output.ly")
\ No newline at end of file
+\include #(if noDefaultOutput "../private_includes/void.ily" "layout_bottom.ily")
\ No newline at end of file
diff --git a/snippet_include.ly b/public_includes/pool_top.ily
similarity index 55%
rename from snippet_include.ly
rename to public_includes/pool_top.ily
index f4944a3..dd62bb0 100644
--- a/snippet_include.ly
+++ b/public_includes/pool_top.ily
@@ -2,4 +2,4 @@
 
 #(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f))
 
-\include #(if noDefaultOutput "void.ly" "all_base_includes.ly")
+\include #(if noDefaultOutput "../private_includes/void.ily" "../private_includes/base/all.ily")
diff --git a/styles.ly b/styles.ly
deleted file mode 100644
index cd0d3b4..0000000
--- a/styles.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-#(define bookStyle
-  (if (not (defined? 'bookStyle))
-      #f
-      bookStyle))
-
-#(define songStyle
-  (if (not (defined? 'songStyle))
-      (if (not (defined? 'defaultSongStyle)) 'default defaultSongStyle)
-      songStyle))
-
-#(if (not (boolean? bookStyle))
-         (set! songStyle bookStyle))
-
-#(define (bock-style layout props)
-  "Whether we have bockstyle or not"
-  (eq? songStyle 'bock))
\ No newline at end of file