Refactor: Switch to a more directory based source file structure.

Mass change all of the code to further utilize directories.
The project has gotten big enough for this to matter.
The stable API should have a relatively clean directory structure.

diff --git a/build/level_0/settings b/build/level_0/settings
index 9457746..b1d519f 100644 (file)
--- a/build/level_0/settings
+++ b/build/level_0/settings
@@ -33,27 +33,29 @@ build_objects_program_shared
 build_objects_program_static
 build_sources_library account.c private-account.c
 build_sources_library capability.c
-build_sources_library color.c color-common.c
-build_sources_library console.c console-common.c
-build_sources_library control_group.c control_group-common.c
-build_sources_library conversion.c conversion-common.c private-conversion.c
+build_sources_library color.c color/common.c
+build_sources_library console.c console/common.c
+build_sources_library control_group.c control_group/common.c
+build_sources_library conversion.c private-conversion.c conversion/common.c
 build_sources_library directory.c private-directory.c
 build_sources_library environment.c private-environment.c
 build_sources_library execute.c
-build_sources_library file.c file-common.c private-file.c
-build_sources_library fss.c private-fss.c fss-common.c fss_named.c fss_nest.c fss_set.c
-build_sources_library iki.c iki-common.c private-iki.c
+build_sources_library file.c file/common.c private-file.c
+build_sources_library fss.c private-fss.c fss/common.c fss/named.c fss/nest.c fss/set.c
+build_sources_library iki.c iki/common.c private-iki.c
 build_sources_library limit.c
-build_sources_library memory.c memory_structure.c private-memory.c
-build_sources_library path.c path-common.c private-path.c
-build_sources_library pipe.c print.c print_to.c print-common.c private-print.c private-print_to.c
-build_sources_library serialize.c serialize-common.c private-serialize.c
+build_sources_library memory.c private-memory.c memory/structure.c
+build_sources_library path.c private-path.c path/common.c
+build_sources_library pipe.c
+build_sources_library print.c private-print.c print/common.c print/to.c print/private-to.c
+build_sources_library serialize.c private-serialize.c serialize/common.c
 build_sources_library signal.c
 build_sources_library socket.c
-build_sources_library status_string.c string.c string-common.c private-string.c string_dynamic.c string_map.c string_quantity.c string_range.c string_triple.c
+build_sources_library status_string.c
+build_sources_library string.c private-string.c string/common.c string/dynamic.c string/map.c string/quantity.c string/range.c string/triple.c
 build_sources_library type_array/array_length.c type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/state.c type_array/status.c
 build_sources_library type_array/private-array_length.c type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-state.c type_array/private-status.c
-build_sources_library utf.c utf-common.c utf_dynamic.c utf_map.c utf_string.c utf_triple.c private-utf.c private-utf-is_unassigned.c private-utf_string.c
+build_sources_library utf.c private-utf.c utf/common.c utf/dynamic.c utf/map.c utf/private-is_unassigned.c utf/private-string.c utf/string.c utf/triple.c
 build_sources_library-level thread.c private-thread.c
 build_sources_library_shared
 build_sources_library_static
@@ -63,33 +65,34 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers account.h account-common.h
-build_sources_headers capability.h capability-common.h
-build_sources_headers color.h color-common.h
-build_sources_headers console.h console-common.h
-build_sources_headers control_group.h control_group-common.h
-build_sources_headers conversion.h conversion-common.h
-build_sources_headers directory.h directory_type.h directory-common.h
-build_sources_headers environment.h environment-common.h
-build_sources_headers execute.h execute-common.h
-build_sources_headers file.h file-common.h
-build_sources_headers fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h
-build_sources_headers iki.h iki-common.h
-build_sources_headers limit.h limit-common.h
-build_sources_headers memory.h memory_structure.h memory-common.h
-build_sources_headers path.h path-common.h
+build_sources_headers account.h account/common.h
+build_sources_headers capability.h capability/common.h
+build_sources_headers color.h color/common.h
+build_sources_headers console.h console/common.h
+build_sources_headers control_group.h control_group/common.h
+build_sources_headers conversion.h conversion/common.h
+build_sources_headers directory.h directory/common.h directory/type.h
+build_sources_headers environment.h environment/common.h
+build_sources_headers execute.h execute/common.h
+build_sources_headers file.h file/common.h
+build_sources_headers fss.h fss/comment.h fss/common.h fss/delimit.h fss/named.h fss/nest.h fss/quote.h fss/set.h
+build_sources_headers iki.h iki/common.h
+build_sources_headers limit.h limit/common.h
+build_sources_headers memory.h memory/structure.h memory/common.h
+build_sources_headers path.h path/common.h
 build_sources_headers pipe.h
-build_sources_headers print.h print_to.h print-common.h
-build_sources_headers serialize.h serialize-common.h
-build_sources_headers signal.h signal-common.h
-build_sources_headers socket.h socket-common.h
-build_sources_headers status.h status_string.h
-build_sources_headers string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h
+build_sources_headers print.h print/to.h print/common.h
+build_sources_headers serialize.h serialize/common.h
+build_sources_headers signal.h signal/common.h
+build_sources_headers socket.h socket/common.h
+build_sources_headers status.h
+build_sources_headers status_string.h
+build_sources_headers string.h string/common.h string/dynamic.h string/map.h string/quantity.h string/range.h string/triple.h
 build_sources_headers type.h
-build_sources_headers type_array.h type_array-common.h
+build_sources_headers type_array.h type_array/common.h
 build_sources_headers type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
-build_sources_headers utf.h utf-common.h utf_dynamic.h utf_map.h utf_string.h utf_triple.h
-build_sources_headers-level thread.h thread-common.h
+build_sources_headers utf.h utf/common.h utf/dynamic.h utf/map.h utf/string.h utf/triple.h
+build_sources_headers-level thread.h thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/build/level_1/settings b/build/level_1/settings
index 0b83f52..600e7e2 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -35,13 +35,13 @@ build_sources_library control_group.c
 build_sources_library conversion.c private-conversion.c
 build_sources_library directory.c private-directory.c
 build_sources_library environment.c
-build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c
+build_sources_library private-fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c
 build_sources_library iki.c
-build_sources_library print.c print-common.c private-print.c
+build_sources_library print.c private-print.c print/common.c
 build_sources_library signal.c
-build_sources_library string.c
-build_sources_library private-string.c
-build_sources_library utf.c private-utf.c utf_file.c private-utf_file.c
+build_sources_library string.c private-string.c
+build_sources_library utf.c private-utf.c
+build_sources_library utf_file.c private-utf_file.c
 build_sources_library-level
 build_sources_library_shared
 build_sources_library_static
@@ -53,15 +53,16 @@ build_sources_program_shared
 build_sources_program_static
 build_sources_headers control_group.h
 build_sources_headers conversion.h
-build_sources_headers directory.h directory-common.h
+build_sources_headers directory.h directory/common.h
 build_sources_headers environment.h
-build_sources_headers execute.h execute-common.h
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h
+build_sources_headers execute.h execute/common.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h
 build_sources_headers iki.h
-build_sources_headers print.h print-common.h
-build_sources_headers signal.h signal-common.h
+build_sources_headers print.h print/common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers string.h
-build_sources_headers utf.h utf_file.h
+build_sources_headers utf.h
+build_sources_headers utf_file.h
 build_sources_headers-level
 build_sources_headers_shared
 build_sources_headers_static

diff --git a/build/level_2/settings b/build/level_2/settings
index 15f8b26..f3a4196 100644 (file)
--- a/build/level_2/settings
+++ b/build/level_2/settings
@@ -32,15 +32,15 @@ build_objects_program
 build_objects_program_shared
 build_objects_program_static
 build_sources_library control_group.c
-build_sources_library error.c error-common.c private-error.c
+build_sources_library error.c private-error.c error/common.c
 build_sources_library execute.c private-execute.c
 build_sources_library file.c private-file.c
-build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c fss_payload.c
+build_sources_library fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c fss/payload.c
 build_sources_library fss_status_string.c
 build_sources_library iki.c private-iki.c
 build_sources_library path.c
 build_sources_library print.c
-build_sources_library program.c program-common.c
+build_sources_library program.c program/common.c
 build_sources_library status_string.c
 build_sources_library-level
 build_sources_library_shared
@@ -52,15 +52,15 @@ build_sources_program
 build_sources_program_shared
 build_sources_program_static
 build_sources_headers control_group.h
-build_sources_headers error.h error-common.h
+build_sources_headers error.h error/common.h
 build_sources_headers execute.h
 build_sources_headers file.h
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_payload.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h fss/payload.h
 build_sources_headers fss_status_string.h
 build_sources_headers iki.h
 build_sources_headers path.h
 build_sources_headers print.h
-build_sources_headers program.h program-common.h
+build_sources_headers program.h program/common.h
 build_sources_headers status_string.h
 build_sources_headers-level
 build_sources_headers_shared

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 217b36e..02e65af 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -33,42 +33,50 @@ build_objects_program_shared
 build_objects_program_static
 build_sources_library level_0/account.c level_0/private-account.c
 build_sources_library level_0/capability.c
-build_sources_library level_0/color.c level_0/color-common.c
-build_sources_library level_0/console.c level_0/console-common.c
-build_sources_library level_0/control_group.c level_0/control_group-common.c
-build_sources_library level_0/conversion.c level_0/conversion-common.c level_0/private-conversion.c
+build_sources_library level_0/color.c level_0/color/common.c
+build_sources_library level_0/console.c level_0/console/common.c
+build_sources_library level_0/control_group.c level_0/control_group/common.c
+build_sources_library level_0/conversion.c level_0/private-conversion.c level_0/conversion/common.c
 build_sources_library level_0/directory.c level_0/private-directory.c
 build_sources_library level_0/environment.c level_0/private-environment.c
-build_sources_library level_0/execute.c level_0/file.c level_0/file-common.c level_0/private-file.c
-build_sources_library level_0/fss.c level_0/private-fss.c level_0/fss-common.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c
-build_sources_library level_0/iki.c level_0/iki-common.c level_0/private-iki.c
+build_sources_library level_0/execute.c
+build_sources_library level_0/file.c level_0/file/common.c level_0/private-file.c
+build_sources_library level_0/fss.c level_0/private-fss.c level_0/fss/common.c level_0/fss/named.c level_0/fss/nest.c level_0/fss/set.c
+build_sources_library level_0/iki.c level_0/iki/common.c level_0/private-iki.c
 build_sources_library level_0/limit.c
-build_sources_library level_0/memory.c level_0/memory_structure.c level_0/private-memory.c
-build_sources_library level_0/path.c level_0/path-common.c level_0/private-path.c
+build_sources_library level_0/memory.c level_0/private-memory.c level_0/memory/structure.c
+build_sources_library level_0/path.c level_0/private-path.c level_0/path/common.c
 build_sources_library level_0/pipe.c
-build_sources_library level_0/print.c level_0/print_to.c level_0/print-common.c level_0/private-print.c level_0/private-print_to.c
-build_sources_library level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c
+build_sources_library level_0/print.c level_0/private-print.c level_0/print/common.c level_0/print/to.c level_0/print/private-to.c
+build_sources_library level_0/serialize.c level_0/private-serialize.c level_0/serialize/common.c
 build_sources_library level_0/signal.c
 build_sources_library level_0/socket.c
-build_sources_library level_0/status_string.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c
+build_sources_library level_0/status_string.c
+build_sources_library level_0/string.c level_0/private-string.c level_0/string/common.c level_0/string/dynamic.c level_0/string/map.c level_0/string/quantity.c level_0/string/range.c level_0/string/triple.c
 build_sources_library level_0/type_array/array_length.c level_0/type_array/cell.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/state.c level_0/type_array/status.c
 build_sources_library level_0/type_array/private-array_length.c level_0/type_array/private-cell.c level_0/type_array/private-fll_id.c level_0/type_array/private-int8.c level_0/type_array/private-int16.c level_0/type_array/private-int32.c level_0/type_array/private-int64.c level_0/type_array/private-int128.c level_0/type_array/private-state.c level_0/type_array/private-status.c
-build_sources_library level_0/utf.c level_0/utf-common.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_string.c level_0/utf_triple.c level_0/private-utf.c level_0/private-utf-is_unassigned.c level_0/private-utf_string.c
-build_sources_library level_1/control_group.c level_1/conversion.c level_1/private-conversion.c
+build_sources_library level_0/utf.c level_0/private-utf.c level_0/utf/common.c level_0/utf/dynamic.c level_0/utf/map.c level_0/utf/string.c level_0/utf/triple.c level_0/utf/private-is_unassigned.c level_0/utf/private-string.c
+build_sources_library level_1/control_group.c
+build_sources_library level_1/conversion.c level_1/private-conversion.c
 build_sources_library level_1/directory.c level_1/private-directory.c
 build_sources_library level_1/environment.c
-build_sources_library level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c
+build_sources_library level_1/private-fss.c level_1/fss/basic.c level_1/fss/basic_list.c level_1/fss/embedded_list.c level_1/fss/extended.c level_1/fss/extended_list.c
 build_sources_library level_1/iki.c
-build_sources_library level_1/print.c level_1/print-common.c level_1/private-print.c level_1/signal.c level_1/string.c level_1/private-string.c
-build_sources_library level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c
+build_sources_library level_1/print.c level_1/private-print.c level_1/print/common.c
+build_sources_library level_1/signal.c
+build_sources_library level_1/string.c level_1/private-string.c
+build_sources_library level_1/utf.c level_1/private-utf.c
+build_sources_library level_1/utf_file.c level_1/private-utf_file.c
 build_sources_library level_2/control_group.c
-build_sources_library level_2/error.c level_2/error-common.c level_2/private-error.c
+build_sources_library level_2/error.c level_2/error/common.c level_2/private-error.c
 build_sources_library level_2/execute.c level_2/private-execute.c
 build_sources_library level_2/file.c level_2/private-file.c
-build_sources_library level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_payload.c level_2/fss_status_string.c
+build_sources_library level_2/fss.c level_2/fss/basic.c level_2/fss/basic_list.c level_2/fss/embedded_list.c level_2/fss/extended.c level_2/fss/extended_list.c level_2/fss/payload.c
+build_sources_library level_2/fss_status_string.c
 build_sources_library level_2/iki.c level_2/private-iki.c
-build_sources_library level_2/path.c level_2/print.c
-build_sources_library level_2/program.c level_2/program-common.c
+build_sources_library level_2/path.c
+build_sources_library level_2/print.c
+build_sources_library level_2/program.c level_2/program/common.c
 build_sources_library level_2/status_string.c
 build_sources_library-monolithic level_0/thread.c level_0/private-thread.c
 build_sources_library_shared
@@ -79,54 +87,58 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers level_0/account.h level_0/account-common.h
-build_sources_headers level_0/capability.h level_0/capability-common.h
-build_sources_headers level_0/color.h level_0/color-common.h
-build_sources_headers level_0/console.h level_0/console-common.h
-build_sources_headers level_0/control_group.h level_0/control_group-common.h
-build_sources_headers level_0/conversion.h level_0/conversion-common.h
-build_sources_headers level_0/directory.h level_0/directory_type.h level_0/directory-common.h
-build_sources_headers level_0/environment.h level_0/environment-common.h
-build_sources_headers level_0/execute.h level_0/execute-common.h
-build_sources_headers level_0/file.h level_0/file-common.h
-build_sources_headers level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h
-build_sources_headers level_0/iki.h level_0/iki-common.h
-build_sources_headers level_0/limit.h level_0/limit-common.h
-build_sources_headers level_0/memory.h level_0/memory_structure.h level_0/memory-common.h
-build_sources_headers level_0/path.h level_0/path-common.h
+build_sources_headers level_0/account.h level_0/account/common.h
+build_sources_headers level_0/capability.h level_0/capability/common.h
+build_sources_headers level_0/color.h level_0/color/common.h
+build_sources_headers level_0/console.h level_0/console/common.h
+build_sources_headers level_0/control_group.h level_0/control_group/common.h
+build_sources_headers level_0/conversion.h level_0/conversion/common.h
+build_sources_headers level_0/directory.h level_0/directory/common.h level_0/directory/type.h
+build_sources_headers level_0/environment.h level_0/environment/common.h
+build_sources_headers level_0/execute.h level_0/execute/common.h
+build_sources_headers level_0/file.h level_0/file/common.h
+build_sources_headers level_0/fss.h level_0/fss/comment.h level_0/fss/common.h level_0/fss/delimit.h level_0/fss/named.h level_0/fss/nest.h level_0/fss/quote.h level_0/fss/set.h
+build_sources_headers level_0/iki.h level_0/iki/common.h
+build_sources_headers level_0/limit.h level_0/limit/common.h
+build_sources_headers level_0/memory.h level_0/memory/structure.h level_0/memory/common.h
+build_sources_headers level_0/path.h level_0/path/common.h
 build_sources_headers level_0/pipe.h
-build_sources_headers level_0/print.h level_0/print_to.h level_0/print-common.h
-build_sources_headers level_0/serialize.h level_0/serialize-common.h
-build_sources_headers level_0/signal.h level_0/signal-common.h
-build_sources_headers level_0/socket.h level_0/socket-common.h
-build_sources_headers level_0/status.h level_0/status_string.h
-build_sources_headers level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h
+build_sources_headers level_0/print.h level_0/print/to.h level_0/print/common.h
+build_sources_headers level_0/serialize.h level_0/serialize/common.h
+build_sources_headers level_0/signal.h level_0/signal/common.h
+build_sources_headers level_0/socket.h level_0/socket/common.h
+build_sources_headers level_0/status.h
+build_sources_headers level_0/status_string.h
+build_sources_headers level_0/string.h level_0/string/common.h level_0/string/dynamic.h level_0/string/map.h level_0/string/quantity.h level_0/string/range.h level_0/string/triple.h
 build_sources_headers level_0/type.h
-build_sources_headers level_0/type_array.h level_0/type_array-common.h
+build_sources_headers level_0/type_array.h level_0/type_array/common.h
 build_sources_headers level_0/type_array/array_length.h level_0/type_array/cell.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/state.h level_0/type_array/status.h
-build_sources_headers level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_string.h level_0/utf_triple.h
+build_sources_headers level_0/utf.h level_0/utf/common.h level_0/utf/dynamic.h level_0/utf/map.h level_0/utf/string.h level_0/utf/triple.h
 build_sources_headers level_1/control_group.h
 build_sources_headers level_1/conversion.h
-build_sources_headers level_1/directory.h level_1/directory-common.h
+build_sources_headers level_1/directory.h level_1/directory/common.h
 build_sources_headers level_1/environment.h
-build_sources_headers level_1/execute.h level_1/execute-common.h
-build_sources_headers level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h
+build_sources_headers level_1/execute.h level_1/execute/common.h
+build_sources_headers level_1/fss.h level_1/fss/basic.h level_1/fss/basic_list.h level_1/fss/embedded_list.h level_1/fss/extended.h level_1/fss/extended_list.h
 build_sources_headers level_1/iki.h
-build_sources_headers level_1/print.h level_1/print-common.h
-build_sources_headers level_1/signal.h level_1/signal-common.h
+build_sources_headers level_1/print.h level_1/print/common.h
+build_sources_headers level_1/signal.h level_1/signal/common.h
 build_sources_headers level_1/string.h
-build_sources_headers level_1/utf.h level_1/utf_file.h
+build_sources_headers level_1/utf.h
+build_sources_headers level_1/utf_file.h
 build_sources_headers level_2/control_group.h
-build_sources_headers level_2/error.h level_2/error-common.h
+build_sources_headers level_2/error.h level_2/error/common.h
 build_sources_headers level_2/execute.h
 build_sources_headers level_2/file.h
-build_sources_headers level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_payload.h level_2/fss_status_string.h
+build_sources_headers level_2/fss.h level_2/fss/basic.h level_2/fss/basic_list.h level_2/fss/embedded_list.h level_2/fss/extended.h level_2/fss/extended_list.h level_2/fss/payload.h
+build_sources_headers level_2/fss_status_string.h
 build_sources_headers level_2/iki.h
 build_sources_headers level_2/path.h
 build_sources_headers level_2/print.h
-build_sources_headers level_2/program.h level_2/program-common.h
+build_sources_headers level_2/program.h level_2/program/common.h
 build_sources_headers level_2/status_string.h
-build_sources_headers-monolithic level_0/thread.h level_0/thread-common.h
+build_sources_headers-level level_0/thread.h level_0/thread/common.h
+build_sources_headers-monolithic level_0/thread.h level_0/thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_account/c/account.h b/level_0/f_account/c/account.h
index e91038e..7be1e31 100644 (file)
--- a/level_0/f_account/c/account.h
+++ b/level_0/f_account/c/account.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 account includes.
-#include <fll/level_0/account-common.h>
+// FLL-0 account includes.
+#include <fll/level_0/account/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_account/c/account-common.h b/level_0/f_account/c/account/common.h
similarity index 100%
rename from level_0/f_account/c/account-common.h
rename to level_0/f_account/c/account/common.h

diff --git a/level_0/f_account/data/build/settings b/level_0/f_account/data/build/settings
index 90930ed..d47a10b 100644 (file)
--- a/level_0/f_account/data/build/settings
+++ b/level_0/f_account/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers account.h account-common.h
+build_sources_headers account.h account/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_account/data/build/settings-mocks b/level_0/f_account/data/build/settings-mocks
index ff84114..0cc20cc 100644 (file)
--- a/level_0/f_account/data/build/settings-mocks
+++ b/level_0/f_account/data/build/settings-mocks
@@ -27,7 +27,7 @@ build_libraries_static
 build_sources_library account.c private-account.c ../../tests/unit/c/mock-account.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers account.h account-common.h
+build_sources_headers account.h account/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_script yes

diff --git a/level_0/f_capability/c/capability.h b/level_0/f_capability/c/capability.h
index 8e36cdc..60c3fa5 100644 (file)
--- a/level_0/f_capability/c/capability.h
+++ b/level_0/f_capability/c/capability.h
@@ -41,8 +41,8 @@
 #include <fll/level_0/type_array.h>
 #include <fll/level_0/string.h>
 
-// fll-0 capability includes
-#include <fll/level_0/capability-common.h>
+// FLL-0 capability includes.
+#include <fll/level_0/capability/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_capability/c/capability-common.h b/level_0/f_capability/c/capability/common.h
similarity index 100%
rename from level_0/f_capability/c/capability-common.h
rename to level_0/f_capability/c/capability/common.h

diff --git a/level_0/f_capability/data/build/settings b/level_0/f_capability/data/build/settings
index 42ad843..1e05f6e 100644 (file)
--- a/level_0/f_capability/data/build/settings
+++ b/level_0/f_capability/data/build/settings
@@ -26,7 +26,7 @@ build_libraries_shared
 build_libraries_static
 build_objects_library
 build_objects_library_shared
-build_objects_library_staticx
+build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers capability.h capability-common.h
+build_sources_headers capability.h capability/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_capability/data/build/settings-mocks b/level_0/f_capability/data/build/settings-mocks
index a2770a6..b37ffc5 100644 (file)
--- a/level_0/f_capability/data/build/settings-mocks
+++ b/level_0/f_capability/data/build/settings-mocks
@@ -32,7 +32,7 @@ build_libraries_static
 build_sources_library capability.c ../../tests/unit/c/mock-capability.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers capability.h capability-common.h
+build_sources_headers capability.h capability/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_color/c/color.h b/level_0/f_color/c/color.h
index cee267c..3c32c29 100644 (file)
--- a/level_0/f_color/c/color.h
+++ b/level_0/f_color/c/color.h
@@ -24,8 +24,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 color includes.
-#include <fll/level_0/color-common.h>
+// FLL-0 color includes.
+#include <fll/level_0/color/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_color/c/color-common.c b/level_0/f_color/c/color/common.c
similarity index 99%
rename from level_0/f_color/c/color-common.c
rename to level_0/f_color/c/color/common.c
index 93a98bc..bf7c137 100644 (file)
--- a/level_0/f_color/c/color-common.c
+++ b/level_0/f_color/c/color/common.c
@@ -1,4 +1,4 @@
-#include "color.h"
+#include "../color.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_color/c/color-common.h b/level_0/f_color/c/color/common.h
similarity index 100%
rename from level_0/f_color/c/color-common.h
rename to level_0/f_color/c/color/common.h

diff --git a/level_0/f_color/data/build/settings b/level_0/f_color/data/build/settings
index 5508bfd..05c1b2e 100644 (file)
--- a/level_0/f_color/data/build/settings
+++ b/level_0/f_color/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library color.c color-common.c
+build_sources_library color.c color/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers color.h color-common.h
+build_sources_headers color.h color/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_color/data/build/settings-mocks b/level_0/f_color/data/build/settings-mocks
index f04b3f0..89ec405 100644 (file)
--- a/level_0/f_color/data/build/settings-mocks
+++ b/level_0/f_color/data/build/settings-mocks
@@ -24,10 +24,10 @@ build_libraries -lc
 build_libraries-individual -lf_memory -lf_string
 build_libraries_shared
 build_libraries_static
-build_sources_library color.c color-common.c ../../tests/unit/c/mock-color.c
+build_sources_library color.c color/common.c ../../tests/unit/c/mock-color.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers color.h color-common.h
+build_sources_headers color.h color/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h
index f8e0dc0..c32163a 100644 (file)
--- a/level_0/f_console/c/console.h
+++ b/level_0/f_console/c/console.h
@@ -22,7 +22,7 @@
 #include <fll/level_0/utf.h>
 
 // fll-0 console includes
-#include <fll/level_0/console-common.h>
+#include <fll/level_0/console/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_console/c/console-common.c b/level_0/f_console/c/console/common.c
similarity index 99%
rename from level_0/f_console/c/console-common.c
rename to level_0/f_console/c/console/common.c
index 0b05b64..e2b9a4e 100644 (file)
--- a/level_0/f_console/c/console-common.c
+++ b/level_0/f_console/c/console/common.c
@@ -1,4 +1,4 @@
-#include "console.h"
+#include "../console.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_console/c/console-common.h b/level_0/f_console/c/console/common.h
similarity index 100%
rename from level_0/f_console/c/console-common.h
rename to level_0/f_console/c/console/common.h

diff --git a/level_0/f_console/data/build/settings b/level_0/f_console/data/build/settings
index e4536fd..9d3792d 100644 (file)
--- a/level_0/f_console/data/build/settings
+++ b/level_0/f_console/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library console.c console-common.c
+build_sources_library console.c console/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers console.h console-common.h
+build_sources_headers console.h console/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_control_group/c/control_group.h b/level_0/f_control_group/c/control_group.h
index c409ad2..36ecce8 100644 (file)
--- a/level_0/f_control_group/c/control_group.h
+++ b/level_0/f_control_group/c/control_group.h
@@ -25,7 +25,7 @@
 #include <fll/level_0/string.h>
 
 // FLL-1 control includes.
-#include <fll/level_0/control_group-common.h>
+#include <fll/level_0/control_group/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_control_group/c/control_group-common.c b/level_0/f_control_group/c/control_group/common.c
similarity index 96%
rename from level_0/f_control_group/c/control_group-common.c
rename to level_0/f_control_group/c/control_group/common.c
index 6fbfa76..3eebb8a 100644 (file)
--- a/level_0/f_control_group/c/control_group-common.c
+++ b/level_0/f_control_group/c/control_group/common.c
@@ -1,4 +1,4 @@
-#include "control_group.h"
+#include "../control_group.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_control_group/c/control_group-common.h b/level_0/f_control_group/c/control_group/common.h
similarity index 100%
rename from level_0/f_control_group/c/control_group-common.h
rename to level_0/f_control_group/c/control_group/common.h

diff --git a/level_0/f_control_group/data/build/settings b/level_0/f_control_group/data/build/settings
index 2ec64ca..c61a6b1 100644 (file)
--- a/level_0/f_control_group/data/build/settings
+++ b/level_0/f_control_group/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library control_group.c control_group-common.c
+build_sources_library control_group.c control_group/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers control_group.h control_group-common.h
+build_sources_headers control_group.h control_group/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h
index bafef57..80f3efa 100644 (file)
--- a/level_0/f_conversion/c/conversion.h
+++ b/level_0/f_conversion/c/conversion.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 conversion includes
-#include <fll/level_0/conversion-common.h>
+// FLL-0 conversion includes.
+#include <fll/level_0/conversion/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_conversion/c/conversion-common.c b/level_0/f_conversion/c/conversion/common.c
similarity index 96%
rename from level_0/f_conversion/c/conversion-common.c
rename to level_0/f_conversion/c/conversion/common.c
index 1b7a724..5fe41c6 100644 (file)
--- a/level_0/f_conversion/c/conversion-common.c
+++ b/level_0/f_conversion/c/conversion/common.c
@@ -1,4 +1,4 @@
-#include "conversion.h"
+#include "../conversion.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_conversion/c/conversion-common.h b/level_0/f_conversion/c/conversion/common.h
similarity index 100%
rename from level_0/f_conversion/c/conversion-common.h
rename to level_0/f_conversion/c/conversion/common.h

diff --git a/level_0/f_conversion/data/build/settings b/level_0/f_conversion/data/build/settings
index 9b4614a..04da0e2 100644 (file)
--- a/level_0/f_conversion/data/build/settings
+++ b/level_0/f_conversion/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library conversion.c conversion-common.c private-conversion.c
+build_sources_library conversion.c private-conversion.c conversion/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers conversion.h conversion-common.h
+build_sources_headers conversion.h conversion/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_conversion/data/build/settings-mocks b/level_0/f_conversion/data/build/settings-mocks
index 034b591..19ce47e 100644 (file)
--- a/level_0/f_conversion/data/build/settings-mocks
+++ b/level_0/f_conversion/data/build/settings-mocks
@@ -24,10 +24,10 @@ build_libraries -lc
 build_libraries-individual -lf_memory -lf_string -lf_utf
 build_libraries_shared
 build_libraries_static
-build_sources_library conversion.c conversion-common.c private-conversion.c ../../tests/unit/c/mock-conversion.c
+build_sources_library conversion.c private-conversion.c conversion/common.c ../../tests/unit/c/mock-conversion.c
 build_sources_library_shared
 build_sources_library_static
-build_sources_headers conversion.h conversion-common.h
+build_sources_headers conversion.h conversion/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_directory/c/directory.h b/level_0/f_directory/c/directory.h
index edf692a..b7bb93a 100644 (file)
--- a/level_0/f_directory/c/directory.h
+++ b/level_0/f_directory/c/directory.h
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-// work-around for out-dated systems.
+// Work-around for systems requiring special defines to properly include ftw.h.
 #ifndef __USE_XOPEN_EXTENDED
   #define __USE_XOPEN_EXTENDED
   #include <ftw.h>
@@ -35,10 +35,10 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
-#include <fll/level_0/directory_type.h>
 
-// fll-0 directory includes
-#include <fll/level_0/directory-common.h>
+// FLL-0 directory includes.
+#include <fll/level_0/directory/common.h>
+#include <fll/level_0/directory/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_directory/c/directory-common.h b/level_0/f_directory/c/directory/common.h
similarity index 95%
rename from level_0/f_directory/c/directory-common.h
rename to level_0/f_directory/c/directory/common.h
index ccafda1..5eb3f54 100644 (file)
--- a/level_0/f_directory/c/directory-common.h
+++ b/level_0/f_directory/c/directory/common.h
@@ -70,7 +70,12 @@ extern "C" {
   #define F_directory_default_allocation_step_d F_memory_default_allocation_small_d
 
   #define F_directory_descriptors_max_d 255
-  #define F_directory_name_max_d        NAME_MAX
+
+  #ifdef NAME_MAX
+    #define F_directory_name_max_d NAME_MAX
+  #else
+    #define F_directory_name_max_d 255
+  #endif // NAME_MAX
 #endif // _di_f_directory_limitations_
 
 #ifdef __cplusplus

diff --git a/level_0/f_directory/c/directory_type.h b/level_0/f_directory/c/directory/type.h
similarity index 97%
rename from level_0/f_directory/c/directory_type.h
rename to level_0/f_directory/c/directory/type.h
index 4e33113..03cddf7 100644 (file)
--- a/level_0/f_directory/c/directory_type.h
+++ b/level_0/f_directory/c/directory/type.h
@@ -5,17 +5,13 @@
  * API Version: 0.5
  * Licenses: lgpl-2.1-or-later
  *
- * Provides directory related data types.
+ * Defines type-specific data to be used for/by project directory.
+ *
+ * This is auto-included by directory.h and should not need to be explicitly included.
  */
 #ifndef _F_directory_type_h
 #define _F_directory_type_h
 
-// FLL-0 includes.
-#include <fll/level_0/status.h>
-#include <fll/level_0/memory.h>
-#include <fll/level_0/string.h>
-#include <fll/level_0/type.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/level_0/f_directory/data/build/settings b/level_0/f_directory/data/build/settings
index 309c0ac..02e69f0 100644 (file)
--- a/level_0/f_directory/data/build/settings
+++ b/level_0/f_directory/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers directory.h directory_type.h directory-common.h
+build_sources_headers directory.h directory/common.h directory/type.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_environment/c/environment.h b/level_0/f_environment/c/environment.h
index 506e495..7f98959 100644 (file)
--- a/level_0/f_environment/c/environment.h
+++ b/level_0/f_environment/c/environment.h
@@ -20,8 +20,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 environment includes
-#include <fll/level_0/environment-common.h>
+// FLL-0 environment includes.
+#include <fll/level_0/environment/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_environment/c/environment-common.h b/level_0/f_environment/c/environment/common.h
similarity index 100%
rename from level_0/f_environment/c/environment-common.h
rename to level_0/f_environment/c/environment/common.h

diff --git a/level_0/f_environment/data/build/settings b/level_0/f_environment/data/build/settings
index 2d91bfd..a87541d 100644 (file)
--- a/level_0/f_environment/data/build/settings
+++ b/level_0/f_environment/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers environment.h environment-common.h
+build_sources_headers environment.h environment/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_execute/c/execute.h b/level_0/f_execute/c/execute.h
index a8f5b70..a2c611a 100644 (file)
--- a/level_0/f_execute/c/execute.h
+++ b/level_0/f_execute/c/execute.h
@@ -10,7 +10,7 @@
 #ifndef _F_execute_h
 #define _F_execute_h
 
-// include pre-requirements
+// Include pre-requirements.
 #define _GNU_SOURCE
 
 // Libc includes.
@@ -23,8 +23,8 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 execute includes
-#include <fll/level_0/execute-common.h>
+// FLL-0 execute includes.
+#include <fll/level_0/execute/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_execute/c/execute-common.h b/level_0/f_execute/c/execute/common.h
similarity index 100%
rename from level_0/f_execute/c/execute-common.h
rename to level_0/f_execute/c/execute/common.h

diff --git a/level_0/f_execute/data/build/settings b/level_0/f_execute/data/build/settings
index fd6d612..a45ce4d 100644 (file)
--- a/level_0/f_execute/data/build/settings
+++ b/level_0/f_execute/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers execute.h execute-common.h
+build_sources_headers execute.h execute/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h
index 61ca775..d10aaa2 100644 (file)
--- a/level_0/f_file/c/file.h
+++ b/level_0/f_file/c/file.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-// non-standard libc includs
+// Non-standard libc includes.
 #include <sys/sysmacros.h>
 
 // FLL-0 includes.
@@ -37,8 +37,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 file includes
-#include <fll/level_0/file-common.h>
+// FLL-0 file includes.
+#include <fll/level_0/file/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_file/c/file-common.c b/level_0/f_file/c/file/common.c
similarity index 99%
rename from level_0/f_file/c/file-common.c
rename to level_0/f_file/c/file/common.c
index 1bbb235..92c2b63 100644 (file)
--- a/level_0/f_file/c/file-common.c
+++ b/level_0/f_file/c/file/common.c
@@ -1,5 +1,4 @@
-#include "file.h"
-#include "private-file.h"
+#include "../file.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_file/c/file-common.h b/level_0/f_file/c/file/common.h
similarity index 100%
rename from level_0/f_file/c/file-common.h
rename to level_0/f_file/c/file/common.h

diff --git a/level_0/f_file/data/build/settings b/level_0/f_file/data/build/settings
index e2ef5ab..1fbef1d 100644 (file)
--- a/level_0/f_file/data/build/settings
+++ b/level_0/f_file/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library file.c file-common.c private-file.c
+build_sources_library file.c private-file.c file/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers file.h file-common.h
+build_sources_headers file.h file/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h
index b684a1e..db93081 100644 (file)
--- a/level_0/f_fss/c/fss.h
+++ b/level_0/f_fss/c/fss.h
@@ -23,14 +23,14 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 fss includes
-#include <fll/level_0/fss-common.h>
-#include <fll/level_0/fss_comment.h>
-#include <fll/level_0/fss_delimit.h>
-#include <fll/level_0/fss_quote.h>
-#include <fll/level_0/fss_named.h>
-#include <fll/level_0/fss_nest.h>
-#include <fll/level_0/fss_set.h>
+// FLL-0 fss includes.
+#include <fll/level_0/fss/comment.h>
+#include <fll/level_0/fss/common.h>
+#include <fll/level_0/fss/delimit.h>
+#include <fll/level_0/fss/quote.h>
+#include <fll/level_0/fss/named.h>
+#include <fll/level_0/fss/nest.h>
+#include <fll/level_0/fss/set.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_comment.c b/level_0/f_fss/c/fss/comment.c
similarity index 66%
rename from level_0/f_fss/c/fss_comment.c
rename to level_0/f_fss/c/fss/comment.c
index be126fd..6ee9a40 100644 (file)
--- a/level_0/f_fss/c/fss_comment.c
+++ b/level_0/f_fss/c/fss/comment.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_comment.h b/level_0/f_fss/c/fss/comment.h
similarity index 100%
rename from level_0/f_fss/c/fss_comment.h
rename to level_0/f_fss/c/fss/comment.h

diff --git a/level_0/f_fss/c/fss-common.c b/level_0/f_fss/c/fss/common.c
similarity index 91%
rename from level_0/f_fss/c/fss-common.c
rename to level_0/f_fss/c/fss/common.c
index e8dffa0..f5b0174 100644 (file)
--- a/level_0/f_fss/c/fss-common.c
+++ b/level_0/f_fss/c/fss/common.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss-common.h b/level_0/f_fss/c/fss/common.h
similarity index 100%
rename from level_0/f_fss/c/fss-common.h
rename to level_0/f_fss/c/fss/common.h

diff --git a/level_0/f_fss/c/fss_delimit.c b/level_0/f_fss/c/fss/delimit.c
similarity index 66%
rename from level_0/f_fss/c/fss_delimit.c
rename to level_0/f_fss/c/fss/delimit.c
index be126fd..6ee9a40 100644 (file)
--- a/level_0/f_fss/c/fss_delimit.c
+++ b/level_0/f_fss/c/fss/delimit.c
@@ -1,5 +1,4 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_delimit.h b/level_0/f_fss/c/fss/delimit.h
similarity index 100%
rename from level_0/f_fss/c/fss_delimit.h
rename to level_0/f_fss/c/fss/delimit.h

diff --git a/level_0/f_fss/c/fss_named.c b/level_0/f_fss/c/fss/named.c
similarity index 99%
rename from level_0/f_fss/c/fss_named.c
rename to level_0/f_fss/c/fss/named.c
index 2ccf8d3..9b07b64 100644 (file)
--- a/level_0/f_fss/c/fss_named.c
+++ b/level_0/f_fss/c/fss/named.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_named.h b/level_0/f_fss/c/fss/named.h
similarity index 100%
rename from level_0/f_fss/c/fss_named.h
rename to level_0/f_fss/c/fss/named.h

diff --git a/level_0/f_fss/c/fss_nest.c b/level_0/f_fss/c/fss/nest.c
similarity index 99%
rename from level_0/f_fss/c/fss_nest.c
rename to level_0/f_fss/c/fss/nest.c
index 2004b20..e3ef8c0 100644 (file)
--- a/level_0/f_fss/c/fss_nest.c
+++ b/level_0/f_fss/c/fss/nest.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_nest.h b/level_0/f_fss/c/fss/nest.h
similarity index 100%
rename from level_0/f_fss/c/fss_nest.h
rename to level_0/f_fss/c/fss/nest.h

diff --git a/level_0/f_fss/c/fss_quote.h b/level_0/f_fss/c/fss/quote.h
similarity index 100%
rename from level_0/f_fss/c/fss_quote.h
rename to level_0/f_fss/c/fss/quote.h

diff --git a/level_0/f_fss/c/fss_set.c b/level_0/f_fss/c/fss/set.c
similarity index 99%
rename from level_0/f_fss/c/fss_set.c
rename to level_0/f_fss/c/fss/set.c
index fad3db1..1562a9e 100644 (file)
--- a/level_0/f_fss/c/fss_set.c
+++ b/level_0/f_fss/c/fss/set.c
@@ -1,5 +1,5 @@
-#include "fss.h"
-#include "private-fss.h"
+#include "../fss.h"
+#include "../private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss_set.h b/level_0/f_fss/c/fss/set.h
similarity index 100%
rename from level_0/f_fss/c/fss_set.h
rename to level_0/f_fss/c/fss/set.h

diff --git a/level_0/f_fss/data/build/settings b/level_0/f_fss/data/build/settings
index cd92aef..7ee06f7 100644 (file)
--- a/level_0/f_fss/data/build/settings
+++ b/level_0/f_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library fss.c private-fss.c fss-common.c fss_named.c fss_nest.c fss_set.c
+build_sources_library fss.c private-fss.c fss/common.c fss/named.c fss/nest.c fss/set.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h
+build_sources_headers fss.h fss/comment.h fss/common.h fss/delimit.h fss/named.h fss/nest.h fss/quote.h fss/set.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_iki/c/iki.h b/level_0/f_iki/c/iki.h
index 30ee183..59965da 100644 (file)
--- a/level_0/f_iki/c/iki.h
+++ b/level_0/f_iki/c/iki.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 iki includes
-#include <fll/level_0/iki-common.h>
+// FLL-0 iki includes.
+#include <fll/level_0/iki/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_iki/c/iki-common.c b/level_0/f_iki/c/iki/common.c
similarity index 98%
rename from level_0/f_iki/c/iki-common.c
rename to level_0/f_iki/c/iki/common.c
index 90d9279..5af824e 100644 (file)
--- a/level_0/f_iki/c/iki-common.c
+++ b/level_0/f_iki/c/iki/common.c
@@ -1,5 +1,4 @@
-#include "iki.h"
-#include "private-iki.h"
+#include "../iki.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_iki/c/iki-common.h b/level_0/f_iki/c/iki/common.h
similarity index 100%
rename from level_0/f_iki/c/iki-common.h
rename to level_0/f_iki/c/iki/common.h

diff --git a/level_0/f_iki/data/build/settings b/level_0/f_iki/data/build/settings
index 489a727..3221c17 100644 (file)
--- a/level_0/f_iki/data/build/settings
+++ b/level_0/f_iki/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library iki.c iki-common.c private-iki.c
+build_sources_library iki.c private-iki.c iki/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers iki.h iki-common.h
+build_sources_headers iki.h iki/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_limit/c/limit.h b/level_0/f_limit/c/limit.h
index a2c1986..0ebcf9c 100644 (file)
--- a/level_0/f_limit/c/limit.h
+++ b/level_0/f_limit/c/limit.h
@@ -22,8 +22,8 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
 
-// fll-0 control includes
-#include <fll/level_0/limit-common.h>
+// FLL-0 control includes.
+#include <fll/level_0/limit/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_limit/c/limit-common.h b/level_0/f_limit/c/limit/common.h
similarity index 100%
rename from level_0/f_limit/c/limit-common.h
rename to level_0/f_limit/c/limit/common.h

diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings
index 05d6f04..2a24b91 100644 (file)
--- a/level_0/f_limit/data/build/settings
+++ b/level_0/f_limit/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers limit.h limit-common.h
+build_sources_headers limit.h limit/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h
index 6950923..1b74172 100644 (file)
--- a/level_0/f_memory/c/memory.h
+++ b/level_0/f_memory/c/memory.h
@@ -19,9 +19,9 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 memory includes
-#include <fll/level_0/memory-common.h>
-#include <fll/level_0/memory_structure.h>
+// FLL-0 memory includes.
+#include <fll/level_0/memory/common.h>
+#include <fll/level_0/memory/structure.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_memory/c/memory-common.h b/level_0/f_memory/c/memory/common.h
similarity index 100%
rename from level_0/f_memory/c/memory-common.h
rename to level_0/f_memory/c/memory/common.h

diff --git a/level_0/f_memory/c/memory_structure.c b/level_0/f_memory/c/memory/structure.c
similarity index 98%
rename from level_0/f_memory/c/memory_structure.c
rename to level_0/f_memory/c/memory/structure.c
index 9fc2414..a2ef196 100644 (file)
--- a/level_0/f_memory/c/memory_structure.c
+++ b/level_0/f_memory/c/memory/structure.c
@@ -1,5 +1,5 @@
-#include "memory.h"
-#include "private-memory.h"
+#include "../memory.h"
+#include "../private-memory.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_memory/c/memory_structure.h b/level_0/f_memory/c/memory/structure.h
similarity index 100%
rename from level_0/f_memory/c/memory_structure.h
rename to level_0/f_memory/c/memory/structure.h

diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings
index c1cd152..2b0b78b 100644 (file)
--- a/level_0/f_memory/data/build/settings
+++ b/level_0/f_memory/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library memory.c memory_structure.c private-memory.c
+build_sources_library memory.c private-memory.c memory/structure.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers memory.h memory_structure.h memory-common.h
+build_sources_headers memory.h memory/common.h memory/structure.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h
index b862b7c..9b4d06c 100644 (file)
--- a/level_0/f_path/c/path.h
+++ b/level_0/f_path/c/path.h
@@ -26,8 +26,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 path includes
-#include <fll/level_0/path-common.h>
+// FLL-0 path includes.
+#include <fll/level_0/path/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_path/c/path-common.c b/level_0/f_path/c/path/common.c
similarity index 99%
rename from level_0/f_path/c/path-common.c
rename to level_0/f_path/c/path/common.c
index 117d3fd..bcbf96f 100644 (file)
--- a/level_0/f_path/c/path-common.c
+++ b/level_0/f_path/c/path/common.c
@@ -1,5 +1,4 @@
-#include "path.h"
-#include "private-path.h"
+#include "../path.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_path/c/path-common.h b/level_0/f_path/c/path/common.h
similarity index 100%
rename from level_0/f_path/c/path-common.h
rename to level_0/f_path/c/path/common.h

diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings
index d6a9f92..a7c458a 100644 (file)
--- a/level_0/f_path/data/build/settings
+++ b/level_0/f_path/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library path.c path-common.c private-path.c
+build_sources_library path.c private-path.c path/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers path.h path-common.h
+build_sources_headers path.h path/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_pipe/data/build/settings b/level_0/f_pipe/data/build/settings
index ffec130..ff00b19 100644 (file)
--- a/level_0/f_pipe/data/build/settings
+++ b/level_0/f_pipe/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h
index d876e40..ea6e00b 100644 (file)
--- a/level_0/f_print/c/print.h
+++ b/level_0/f_print/c/print.h
@@ -28,9 +28,9 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 print includes
-#include <fll/level_0/print-common.h>
-#include <fll/level_0/print_to.h>
+// FLL-0 print includes.
+#include <fll/level_0/print/common.h>
+#include <fll/level_0/print/to.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print-common.c b/level_0/f_print/c/print/common.c
similarity index 99%
rename from level_0/f_print/c/print-common.c
rename to level_0/f_print/c/print/common.c
index 75946eb..e804e35 100644 (file)
--- a/level_0/f_print/c/print-common.c
+++ b/level_0/f_print/c/print/common.c
@@ -1,5 +1,4 @@
-#include "print.h"
-#include "private-print.h"
+#include "../print.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print-common.h b/level_0/f_print/c/print/common.h
similarity index 100%
rename from level_0/f_print/c/print-common.h
rename to level_0/f_print/c/print/common.h

diff --git a/level_0/f_print/c/private-print_to.c b/level_0/f_print/c/print/private-to.c
similarity index 99%
rename from level_0/f_print/c/private-print_to.c
rename to level_0/f_print/c/print/private-to.c
index b20d522..f92dd4e 100644 (file)
--- a/level_0/f_print/c/private-print_to.c
+++ b/level_0/f_print/c/print/private-to.c
@@ -1,6 +1,6 @@
-#include "print.h"
-#include "private-print.h"
-#include "private-print_to.h"
+#include "../print.h"
+#include "../private-print.h"
+#include "private-to.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/private-print_to.h b/level_0/f_print/c/print/private-to.h
similarity index 100%
rename from level_0/f_print/c/private-print_to.h
rename to level_0/f_print/c/print/private-to.h

diff --git a/level_0/f_print/c/print_to.c b/level_0/f_print/c/print/to.c
similarity index 99%
rename from level_0/f_print/c/print_to.c
rename to level_0/f_print/c/print/to.c
index 7341d48..4411acb 100644 (file)
--- a/level_0/f_print/c/print_to.c
+++ b/level_0/f_print/c/print/to.c
@@ -1,6 +1,6 @@
-#include "print.h"
-#include "private-print.h"
-#include "private-print_to.h"
+#include "../print.h"
+#include "../private-print.h"
+#include "private-to.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print_to.h b/level_0/f_print/c/print/to.h
similarity index 100%
rename from level_0/f_print/c/print_to.h
rename to level_0/f_print/c/print/to.h

diff --git a/level_0/f_print/data/build/settings b/level_0/f_print/data/build/settings
index 6b7dbed..8b415a8 100644 (file)
--- a/level_0/f_print/data/build/settings
+++ b/level_0/f_print/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library print.c print_to.c print-common.c private-print.c private-print_to.c
+build_sources_library print.c private-print.c print/common.c print/to.c print/private-to.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers print.h print_to.h print-common.h
+build_sources_headers print.h print/common.h print/to.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_serialize/c/serialize.h b/level_0/f_serialize/c/serialize.h
index 419f159..4b482ae 100644 (file)
--- a/level_0/f_serialize/c/serialize.h
+++ b/level_0/f_serialize/c/serialize.h
@@ -22,8 +22,8 @@
 #include <fll/level_0/string.h>
 #include <fll/level_0/utf.h>
 
-// fll-0 serialize includes
-#include <fll/level_0/serialize-common.h>
+// FLL-0 serialize includes.
+#include <fll/level_0/serialize/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_serialize/c/serialize-common.c b/level_0/f_serialize/c/serialize/common.c
similarity index 92%
rename from level_0/f_serialize/c/serialize-common.c
rename to level_0/f_serialize/c/serialize/common.c
index 363d047..99063dd 100644 (file)
--- a/level_0/f_serialize/c/serialize-common.c
+++ b/level_0/f_serialize/c/serialize/common.c
@@ -1,5 +1,4 @@
-#include "serialize.h"
-#include "private-serialize.h"
+#include "../serialize.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_serialize/c/serialize-common.h b/level_0/f_serialize/c/serialize/common.h
similarity index 100%
rename from level_0/f_serialize/c/serialize-common.h
rename to level_0/f_serialize/c/serialize/common.h

diff --git a/level_0/f_serialize/data/build/settings b/level_0/f_serialize/data/build/settings
index 3b0a081..74fbbea 100644 (file)
--- a/level_0/f_serialize/data/build/settings
+++ b/level_0/f_serialize/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library serialize.c serialize-common.c private-serialize.c
+build_sources_library serialize.c private-serialize.c serialize/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers serialize.h serialize-common.h
+build_sources_headers serialize.h serialize/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_signal/c/signal.h b/level_0/f_signal/c/signal.h
index 5e2d998..b736998 100644 (file)
--- a/level_0/f_signal/c/signal.h
+++ b/level_0/f_signal/c/signal.h
@@ -21,8 +21,8 @@
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 
-// fll-0 signal includes
-#include <fll/level_0/signal-common.h>
+// FLL-0 signal includes.
+#include <fll/level_0/signal/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_signal/c/signal-common.h b/level_0/f_signal/c/signal/common.h
similarity index 100%
rename from level_0/f_signal/c/signal-common.h
rename to level_0/f_signal/c/signal/common.h

diff --git a/level_0/f_signal/data/build/settings b/level_0/f_signal/data/build/settings
index a45d8fe..a04ea20 100644 (file)
--- a/level_0/f_signal/data/build/settings
+++ b/level_0/f_signal/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers signal.h signal-common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h
index 85409fd..80ca69e 100644 (file)
--- a/level_0/f_socket/c/socket.h
+++ b/level_0/f_socket/c/socket.h
@@ -25,8 +25,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 socket includes
-#include <fll/level_0/socket-common.h>
+// FLL-0 socket includes.
+#include <fll/level_0/socket/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_socket/c/socket-common.h b/level_0/f_socket/c/socket/common.h
similarity index 100%
rename from level_0/f_socket/c/socket-common.h
rename to level_0/f_socket/c/socket/common.h

diff --git a/level_0/f_socket/data/build/settings b/level_0/f_socket/data/build/settings
index f8cd04c..90f4dfe 100644 (file)
--- a/level_0/f_socket/data/build/settings
+++ b/level_0/f_socket/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers socket.h socket-common.h
+build_sources_headers socket.h socket/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_status/data/build/settings b/level_0/f_status/data/build/settings
index 493c51e..a57bf31 100644 (file)
--- a/level_0/f_status/data/build/settings
+++ b/level_0/f_status/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_status_string/data/build/settings b/level_0/f_status_string/data/build/settings
index f8a3236..aaad9ce 100644 (file)
--- a/level_0/f_status_string/data/build/settings
+++ b/level_0/f_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h
index 5bd4d0a..c72e44d 100644 (file)
--- a/level_0/f_string/c/string.h
+++ b/level_0/f_string/c/string.h
@@ -21,13 +21,13 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/type.h>
 
-// fll-0 string includes
-#include <fll/level_0/string-common.h>
-#include <fll/level_0/string_dynamic.h>
-#include <fll/level_0/string_map.h>
-#include <fll/level_0/string_quantity.h>
-#include <fll/level_0/string_range.h>
-#include <fll/level_0/string_triple.h>
+// FLL-0 string includes.
+#include <fll/level_0/string/common.h>
+#include <fll/level_0/string/range.h>
+#include <fll/level_0/string/dynamic.h>
+#include <fll/level_0/string/map.h>
+#include <fll/level_0/string/quantity.h>
+#include <fll/level_0/string/triple.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string-common.c b/level_0/f_string/c/string/common.c
similarity index 78%
rename from level_0/f_string/c/string-common.c
rename to level_0/f_string/c/string/common.c
index f1f1b2e..71f488d 100644 (file)
--- a/level_0/f_string/c/string-common.c
+++ b/level_0/f_string/c/string/common.c
@@ -1,5 +1,4 @@
 #include "string.h"
-#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string-common.h b/level_0/f_string/c/string/common.h
similarity index 100%
rename from level_0/f_string/c/string-common.h
rename to level_0/f_string/c/string/common.h

diff --git a/level_0/f_string/c/string_dynamic.c b/level_0/f_string/c/string/dynamic.c
similarity index 99%
rename from level_0/f_string/c/string_dynamic.c
rename to level_0/f_string/c/string/dynamic.c
index 8578ecf..b6aeb66 100644 (file)
--- a/level_0/f_string/c/string_dynamic.c
+++ b/level_0/f_string/c/string/dynamic.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_dynamic.h b/level_0/f_string/c/string/dynamic.h
similarity index 99%
rename from level_0/f_string/c/string_dynamic.h
rename to level_0/f_string/c/string/dynamic.h
index cf56e8d..6137103 100644 (file)
--- a/level_0/f_string/c/string_dynamic.h
+++ b/level_0/f_string/c/string/dynamic.h
@@ -16,9 +16,6 @@
 extern "C" {
 #endif
 
-// fll-0 string includes
-#include <fll/level_0/string_range.h>
-
 /**
  * A string that is analogous to f_string_dynamic_t but intended for static-only uses.
  *

diff --git a/level_0/f_string/c/string_map.c b/level_0/f_string/c/string/map.c
similarity index 99%
rename from level_0/f_string/c/string_map.c
rename to level_0/f_string/c/string/map.c
index 8e7f0cd..1aac93b 100644 (file)
--- a/level_0/f_string/c/string_map.c
+++ b/level_0/f_string/c/string/map.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_map.h b/level_0/f_string/c/string/map.h
similarity index 100%
rename from level_0/f_string/c/string_map.h
rename to level_0/f_string/c/string/map.h

diff --git a/level_0/f_string/c/string_quantity.c b/level_0/f_string/c/string/quantity.c
similarity index 99%
rename from level_0/f_string/c/string_quantity.c
rename to level_0/f_string/c/string/quantity.c
index 00d3381..8bd193e 100644 (file)
--- a/level_0/f_string/c/string_quantity.c
+++ b/level_0/f_string/c/string/quantity.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_quantity.h b/level_0/f_string/c/string/quantity.h
similarity index 100%
rename from level_0/f_string/c/string_quantity.h
rename to level_0/f_string/c/string/quantity.h

diff --git a/level_0/f_string/c/string_range.c b/level_0/f_string/c/string/range.c
similarity index 99%
rename from level_0/f_string/c/string_range.c
rename to level_0/f_string/c/string/range.c
index 7aaa09e..0cb06c9 100644 (file)
--- a/level_0/f_string/c/string_range.c
+++ b/level_0/f_string/c/string/range.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_range.h b/level_0/f_string/c/string/range.h
similarity index 100%
rename from level_0/f_string/c/string_range.h
rename to level_0/f_string/c/string/range.h

diff --git a/level_0/f_string/c/string_triple.c b/level_0/f_string/c/string/triple.c
similarity index 98%
rename from level_0/f_string/c/string_triple.c
rename to level_0/f_string/c/string/triple.c
index cbde60c..056d777 100644 (file)
--- a/level_0/f_string/c/string_triple.c
+++ b/level_0/f_string/c/string/triple.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "private-string.h"
+#include "../string.h"
+#include "../private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_string/c/string_triple.h b/level_0/f_string/c/string/triple.h
similarity index 100%
rename from level_0/f_string/c/string_triple.h
rename to level_0/f_string/c/string/triple.h

diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings
index cf3c5a1..53bbd2a 100644 (file)
--- a/level_0/f_string/data/build/settings
+++ b/level_0/f_string/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library string.c string-common.c private-string.c string_dynamic.c string_map.c string_quantity.c string_range.c string_triple.c
+build_sources_library string.c private-string.c string/common.c string/dynamic.c string/map.c string/quantity.c string/range.c string/triple.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h
+build_sources_headers string.h string/common.h string/dynamic.h string/map.h string/quantity.h string/range.h string/triple.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_thread/c/thread.h b/level_0/f_thread/c/thread.h
index d2ebd44..b81901c 100644 (file)
--- a/level_0/f_thread/c/thread.h
+++ b/level_0/f_thread/c/thread.h
@@ -10,7 +10,7 @@
 #ifndef _F_thread_h
 #define _F_thread_h
 
-// include pre-requirements
+// Include pre-requirements.
 #define _GNU_SOURCE
 
 // Libc includes.
@@ -28,8 +28,8 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/string.h>
 
-// fll-0 thread includes
-#include <fll/level_0/thread-common.h>
+// FLL-0 thread includes.
+#include <fll/level_0/thread/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_thread/c/thread-common.h b/level_0/f_thread/c/thread/common.h
similarity index 100%
rename from level_0/f_thread/c/thread-common.h
rename to level_0/f_thread/c/thread/common.h

diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings
index eb59aa7..14676dd 100644 (file)
--- a/level_0/f_thread/data/build/settings
+++ b/level_0/f_thread/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers thread.h thread-common.h
+build_sources_headers thread.h thread/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings
index 68630d0..59bf533 100644 (file)
--- a/level_0/f_type/data/build/settings
+++ b/level_0/f_type/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_0/f_type_array/c/type_array.h b/level_0/f_type_array/c/type_array.h
index eb2c807..401bb7d 100644 (file)
--- a/level_0/f_type_array/c/type_array.h
+++ b/level_0/f_type_array/c/type_array.h
@@ -18,7 +18,7 @@
 #include <fll/level_0/memory.h>
 
 // FLL-0 type_array includes.
-#include <fll/level_0/type_array-common.h>
+#include <fll/level_0/type_array/common.h>
 #include <fll/level_0/type_array/array_length.h>
 #include <fll/level_0/type_array/cell.h>
 #include <fll/level_0/type_array/fll_id.h>

diff --git a/level_0/f_type_array/c/type_array-common.h b/level_0/f_type_array/c/type_array/common.h
similarity index 100%
rename from level_0/f_type_array/c/type_array-common.h
rename to level_0/f_type_array/c/type_array/common.h

diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings
index 1378a2b..c765305 100644 (file)
--- a/level_0/f_type_array/data/build/settings
+++ b/level_0/f_type_array/data/build/settings
@@ -40,8 +40,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers type_array.h type_array-common.h
-build_sources_headers type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
+build_sources_headers type_array.h type_array/common.h type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script

diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c
index de435cd..e3a26c6 100644 (file)
--- a/level_0/f_utf/c/utf.c
+++ b/level_0/f_utf/c/utf.c
@@ -1,6 +1,6 @@
 #include "utf.h"
 #include "private-utf.h"
-#include "private-utf-is_unassigned.h"
+#include "utf/private-is_unassigned.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h
index a550bd5..4aa57ee 100644 (file)
--- a/level_0/f_utf/c/utf.h
+++ b/level_0/f_utf/c/utf.h
@@ -48,11 +48,11 @@
 #include <fll/level_0/string.h>
 
 // FLL-0 utf includes.
-#include <fll/level_0/utf-common.h>
-#include <fll/level_0/utf_dynamic.h>
-#include <fll/level_0/utf_map.h>
-#include <fll/level_0/utf_string.h>
-#include <fll/level_0/utf_triple.h>
+#include <fll/level_0/utf/common.h>
+#include <fll/level_0/utf/dynamic.h>
+#include <fll/level_0/utf/map.h>
+#include <fll/level_0/utf/string.h>
+#include <fll/level_0/utf/triple.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf-common.c b/level_0/f_utf/c/utf/common.c
similarity index 97%
rename from level_0/f_utf/c/utf-common.c
rename to level_0/f_utf/c/utf/common.c
index 8fb6b89..d59ca7b 100644 (file)
--- a/level_0/f_utf/c/utf-common.c
+++ b/level_0/f_utf/c/utf/common.c
@@ -1,6 +1,4 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf-common.h b/level_0/f_utf/c/utf/common.h
similarity index 100%
rename from level_0/f_utf/c/utf-common.h
rename to level_0/f_utf/c/utf/common.h

diff --git a/level_0/f_utf/c/utf_dynamic.c b/level_0/f_utf/c/utf/dynamic.c
similarity index 99%
rename from level_0/f_utf/c/utf_dynamic.c
rename to level_0/f_utf/c/utf/dynamic.c
index c288018..672fe3f 100644 (file)
--- a/level_0/f_utf/c/utf_dynamic.c
+++ b/level_0/f_utf/c/utf/dynamic.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_dynamic.h b/level_0/f_utf/c/utf/dynamic.h
similarity index 100%
rename from level_0/f_utf/c/utf_dynamic.h
rename to level_0/f_utf/c/utf/dynamic.h

diff --git a/level_0/f_utf/c/utf_map.c b/level_0/f_utf/c/utf/map.c
similarity index 99%
rename from level_0/f_utf/c/utf_map.c
rename to level_0/f_utf/c/utf/map.c
index 429a79c..16bc6d8 100644 (file)
--- a/level_0/f_utf/c/utf_map.c
+++ b/level_0/f_utf/c/utf/map.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_map.h b/level_0/f_utf/c/utf/map.h
similarity index 100%
rename from level_0/f_utf/c/utf_map.h
rename to level_0/f_utf/c/utf/map.h

diff --git a/level_0/f_utf/c/private-utf-is_unassigned.c b/level_0/f_utf/c/utf/private-is_unassigned.c
similarity index 99%
rename from level_0/f_utf/c/private-utf-is_unassigned.c
rename to level_0/f_utf/c/utf/private-is_unassigned.c
index 9548bcc..e84a2fb 100644 (file)
--- a/level_0/f_utf/c/private-utf-is_unassigned.c
+++ b/level_0/f_utf/c/utf/private-is_unassigned.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf-is_unassigned.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-is_unassigned.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/private-utf-is_unassigned.h b/level_0/f_utf/c/utf/private-is_unassigned.h
similarity index 100%
rename from level_0/f_utf/c/private-utf-is_unassigned.h
rename to level_0/f_utf/c/utf/private-is_unassigned.h

diff --git a/level_0/f_utf/c/private-utf_string.c b/level_0/f_utf/c/utf/private-string.c
similarity index 99%
rename from level_0/f_utf/c/private-utf_string.c
rename to level_0/f_utf/c/utf/private-string.c
index e601116..7cf38a4 100644 (file)
--- a/level_0/f_utf/c/private-utf_string.c
+++ b/level_0/f_utf/c/utf/private-string.c
@@ -1,5 +1,5 @@
-#include "utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/private-utf_string.h b/level_0/f_utf/c/utf/private-string.h
similarity index 100%
rename from level_0/f_utf/c/private-utf_string.h
rename to level_0/f_utf/c/utf/private-string.h

diff --git a/level_0/f_utf/c/utf_string.c b/level_0/f_utf/c/utf/string.c
similarity index 99%
rename from level_0/f_utf/c/utf_string.c
rename to level_0/f_utf/c/utf/string.c
index 7011fe2..a3fc569 100644 (file)
--- a/level_0/f_utf/c/utf_string.c
+++ b/level_0/f_utf/c/utf/string.c
@@ -1,6 +1,5 @@
-#include "utf.h"
-#include "utf_string.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_string.h b/level_0/f_utf/c/utf/string.h
similarity index 100%
rename from level_0/f_utf/c/utf_string.h
rename to level_0/f_utf/c/utf/string.h

diff --git a/level_0/f_utf/c/utf_triple.c b/level_0/f_utf/c/utf/triple.c
similarity index 98%
rename from level_0/f_utf/c/utf_triple.c
rename to level_0/f_utf/c/utf/triple.c
index 8ae6ae0..88fa935 100644 (file)
--- a/level_0/f_utf/c/utf_triple.c
+++ b/level_0/f_utf/c/utf/triple.c
@@ -1,6 +1,6 @@
-#include "utf.h"
-#include "private-utf.h"
-#include "private-utf_string.h"
+#include "../utf.h"
+#include "../private-utf.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf_triple.h b/level_0/f_utf/c/utf/triple.h
similarity index 100%
rename from level_0/f_utf/c/utf_triple.h
rename to level_0/f_utf/c/utf/triple.h

diff --git a/level_0/f_utf/data/build/settings b/level_0/f_utf/data/build/settings
index b7d6548..bf44165 100644 (file)
--- a/level_0/f_utf/data/build/settings
+++ b/level_0/f_utf/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library utf.c utf-common.c utf_dynamic.c utf_map.c utf_string.c utf_triple.c private-utf.c private-utf-is_unassigned.c private-utf_string.c
+build_sources_library utf.c private-utf.c utf/common.c utf/dynamic.c utf/map.c utf/private-is_unassigned.c utf/private-string.c utf/string.c utf/triple.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers utf.h utf-common.h utf_dynamic.h utf_map.h utf_string.h utf_triple.h
+build_sources_headers utf.h utf/common.h utf/dynamic.h utf/map.h utf/string.h utf/triple.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_control_group/data/build/settings b/level_1/fl_control_group/data/build/settings
index c3ff85c..15b1e93 100644 (file)
--- a/level_1/fl_control_group/data/build/settings
+++ b/level_1/fl_control_group/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_conversion/data/build/settings b/level_1/fl_conversion/data/build/settings
index 0652e59..e385ecf 100644 (file)
--- a/level_1/fl_conversion/data/build/settings
+++ b/level_1/fl_conversion/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h
index b904ce7..8515ebf 100644 (file)
--- a/level_1/fl_directory/c/directory.h
+++ b/level_1/fl_directory/c/directory.h
@@ -41,7 +41,7 @@
 #include <fll/level_0/path.h>
 
 // FLL-1 directory includes.
-#include <fll/level_1/directory-common.h>
+#include <fll/level_1/directory/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_directory/c/directory-common.c b/level_1/fl_directory/c/directory/common.c
similarity index 77%
rename from level_1/fl_directory/c/directory-common.c
rename to level_1/fl_directory/c/directory/common.c
index 2f595c4..289532b 100644 (file)
--- a/level_1/fl_directory/c/directory-common.c
+++ b/level_1/fl_directory/c/directory/common.c
@@ -1,5 +1,4 @@
 #include "directory.h"
-#include "private-directory.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_directory/c/directory-common.h b/level_1/fl_directory/c/directory/common.h
similarity index 100%
rename from level_1/fl_directory/c/directory-common.h
rename to level_1/fl_directory/c/directory/common.h

diff --git a/level_1/fl_directory/data/build/settings b/level_1/fl_directory/data/build/settings
index 9bcf591..979a23b 100644 (file)
--- a/level_1/fl_directory/data/build/settings
+++ b/level_1/fl_directory/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers directory.h directory-common.h
+build_sources_headers directory.h directory/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_environment/data/build/settings b/level_1/fl_environment/data/build/settings
index 9d39bc9..71a63af 100644 (file)
--- a/level_1/fl_environment/data/build/settings
+++ b/level_1/fl_environment/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_execute/c/execute.h b/level_1/fl_execute/c/execute.h
index ccbbaf9..bcb0094 100644 (file)
--- a/level_1/fl_execute/c/execute.h
+++ b/level_1/fl_execute/c/execute.h
@@ -30,8 +30,8 @@
 #include <fll/level_0/limit.h>
 #include <fll/level_0/signal.h>
 
-// fll-1 execute includes
-#include <fll/level_1/execute-common.h>
+// FLL-1 execute includes.
+#include <fll/level_1/execute/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_execute/c/execute-common.h b/level_1/fl_execute/c/execute/common.h
similarity index 100%
rename from level_1/fl_execute/c/execute-common.h
rename to level_1/fl_execute/c/execute/common.h

diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings
index f367570..933f61c 100644 (file)
--- a/level_1/fl_execute/data/build/settings
+++ b/level_1/fl_execute/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers execute.h execute-common.h
+build_sources_headers execute.h execute/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss/basic.c
similarity index 98%
rename from level_1/fl_fss/c/fss_basic.c
rename to level_1/fl_fss/c/fss/basic.c
index 447d9bf..5c92c52 100644 (file)
--- a/level_1/fl_fss/c/fss_basic.c
+++ b/level_1/fl_fss/c/fss/basic.c
@@ -1,6 +1,6 @@
-#include "fss_basic.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "basic.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss/basic.h
similarity index 100%
rename from level_1/fl_fss/c/fss_basic.h
rename to level_1/fl_fss/c/fss/basic.h

diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss/basic_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_basic_list.c
rename to level_1/fl_fss/c/fss/basic_list.c
index 5e7e3a2..757b95e 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.c
+++ b/level_1/fl_fss/c/fss/basic_list.c
@@ -1,6 +1,6 @@
-#include "fss_basic.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "basic_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss/basic_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_basic_list.h
rename to level_1/fl_fss/c/fss/basic_list.h
index 8e92ca1..b5beef8 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.h
+++ b/level_1/fl_fss/c/fss/basic_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_embedded_list.c
rename to level_1/fl_fss/c/fss/embedded_list.c
index c24f63f..172f23d 100644 (file)
--- a/level_1/fl_fss/c/fss_embedded_list.c
+++ b/level_1/fl_fss/c/fss/embedded_list.c
@@ -1,6 +1,6 @@
-#include "fss_embedded_list.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "embedded_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_embedded_list.h b/level_1/fl_fss/c/fss/embedded_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_embedded_list.h
rename to level_1/fl_fss/c/fss/embedded_list.h
index e380109..1713d49 100644 (file)
--- a/level_1/fl_fss/c/fss_embedded_list.h
+++ b/level_1/fl_fss/c/fss/embedded_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss/extended.c
similarity index 99%
rename from level_1/fl_fss/c/fss_extended.c
rename to level_1/fl_fss/c/fss/extended.c
index 29a0564..f0425f1 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.c
+++ b/level_1/fl_fss/c/fss/extended.c
@@ -1,6 +1,6 @@
-#include "fss_extended.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "extended.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss/extended.h
similarity index 99%
rename from level_1/fl_fss/c/fss_extended.h
rename to level_1/fl_fss/c/fss/extended.h
index 67d5670..d26b617 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.h
+++ b/level_1/fl_fss/c/fss/extended.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>

diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss/extended_list.c
similarity index 99%
rename from level_1/fl_fss/c/fss_extended_list.c
rename to level_1/fl_fss/c/fss/extended_list.c
index eee94f6..c56aa5b 100644 (file)
--- a/level_1/fl_fss/c/fss_extended_list.c
+++ b/level_1/fl_fss/c/fss/extended_list.c
@@ -1,6 +1,6 @@
-#include "fss_extended_list.h"
-#include "private-fss.h"
-#include "private-fss_macro.h"
+#include "extended_list.h"
+#include "../private-fss.h"
+#include "macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss/extended_list.h
similarity index 99%
rename from level_1/fl_fss/c/fss_extended_list.h
rename to level_1/fl_fss/c/fss/extended_list.h
index 6c7b043..3ba5b2e 100644 (file)
--- a/level_1/fl_fss/c/fss_extended_list.h
+++ b/level_1/fl_fss/c/fss/extended_list.h
@@ -15,7 +15,6 @@
 #include <string.h>
 
 // FLL-0 includes.
-
 #include <fll/level_0/type.h>
 #include <fll/level_0/status.h>
 #include <fll/level_0/memory.h>
@@ -25,7 +24,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/private-fss_macro.h b/level_1/fl_fss/c/fss/macro.h
similarity index 100%
rename from level_1/fl_fss/c/private-fss_macro.h
rename to level_1/fl_fss/c/fss/macro.h

diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c
index 929c9e5..5d2ab16 100644 (file)
--- a/level_1/fl_fss/c/private-fss.c
+++ b/level_1/fl_fss/c/private-fss.c
@@ -1,6 +1,6 @@
 #include "fss.h"
 #include "private-fss.h"
-#include "private-fss_macro.h"
+#include "fss/macro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings
index ae66169..52a8732 100644 (file)
--- a/level_1/fl_fss/data/build/settings
+++ b/level_1/fl_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c
+build_sources_library private-fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_iki/data/build/settings b/level_1/fl_iki/data/build/settings
index 0df87de..1f848c0 100644 (file)
--- a/level_1/fl_iki/data/build/settings
+++ b/level_1/fl_iki/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h
index 8af1047..6b50645 100644 (file)
--- a/level_1/fl_print/c/print.h
+++ b/level_1/fl_print/c/print.h
@@ -26,8 +26,8 @@
 #include <fll/level_0/file.h>
 #include <fll/level_0/print.h>
 
-// fll-1 print includes.
-#include <fll/level_1/print-common.h>
+// FLL-1 print includes.
+#include <fll/level_1/print/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_print/c/print-common.c b/level_1/fl_print/c/print/common.c
similarity index 91%
rename from level_1/fl_print/c/print-common.c
rename to level_1/fl_print/c/print/common.c
index 1cc329b..4807ed8 100644 (file)
--- a/level_1/fl_print/c/print-common.c
+++ b/level_1/fl_print/c/print/common.c
@@ -1,5 +1,4 @@
-#include "print.h"
-#include "private-print.h"
+#include "../print.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_print/c/print-common.h b/level_1/fl_print/c/print/common.h
similarity index 100%
rename from level_1/fl_print/c/print-common.h
rename to level_1/fl_print/c/print/common.h

diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings
index e5bcbb5..536ffd7 100644 (file)
--- a/level_1/fl_print/data/build/settings
+++ b/level_1/fl_print/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library print.c print-common.c private-print.c
+build_sources_library print.c private-print.c print/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers print.h print-common.h
+build_sources_headers print.h print/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_signal/c/signal.h b/level_1/fl_signal/c/signal.h
index 65123f5..821dbb8 100644 (file)
--- a/level_1/fl_signal/c/signal.h
+++ b/level_1/fl_signal/c/signal.h
@@ -20,8 +20,8 @@
 #include <fll/level_0/status.h>
 #include <fll/level_0/signal.h>
 
-// fll-1 signal includes
-#include <fll/level_1/signal-common.h>
+// FLL-1 signal includes.
+#include <fll/level_1/signal/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_signal/c/signal-common.h b/level_1/fl_signal/c/signal/common.h
similarity index 100%
rename from level_1/fl_signal/c/signal-common.h
rename to level_1/fl_signal/c/signal/common.h

diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings
index 4ae316e..46711af 100644 (file)
--- a/level_1/fl_signal/data/build/settings
+++ b/level_1/fl_signal/data/build/settings
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers signal.h signal-common.h
+build_sources_headers signal.h signal/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_string/data/build/settings b/level_1/fl_string/data/build/settings
index 6cf487c..5c6ba8a 100644 (file)
--- a/level_1/fl_string/data/build/settings
+++ b/level_1/fl_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_utf/data/build/settings b/level_1/fl_utf/data/build/settings
index 5807766..8a357d7 100644 (file)
--- a/level_1/fl_utf/data/build/settings
+++ b/level_1/fl_utf/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_1/fl_utf_file/data/build/settings b/level_1/fl_utf_file/data/build/settings
index 3585ced..9bf466f 100644 (file)
--- a/level_1/fl_utf_file/data/build/settings
+++ b/level_1/fl_utf_file/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_control_group/data/build/settings b/level_2/fll_control_group/data/build/settings
index a7823fe..0ea30e0 100644 (file)
--- a/level_2/fll_control_group/data/build/settings
+++ b/level_2/fll_control_group/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_error/c/error.h b/level_2/fll_error/c/error.h
index 5f74d51..4598da9 100644 (file)
--- a/level_2/fll_error/c/error.h
+++ b/level_2/fll_error/c/error.h
@@ -27,8 +27,8 @@
 // FLL-1 includes.
 #include <fll/level_1/print.h>
 
-// fll-2 error includes
-#include <fll/level_2/error-common.h>
+// FLL-2 error includes.
+#include <fll/level_2/error/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_error/c/error-common.c b/level_2/fll_error/c/error/common.c
similarity index 95%
rename from level_2/fll_error/c/error-common.c
rename to level_2/fll_error/c/error/common.c
index 14735df..e8691f2 100644 (file)
--- a/level_2/fll_error/c/error-common.c
+++ b/level_2/fll_error/c/error/common.c
@@ -1,5 +1,4 @@
-#include "error.h"
-#include "private-error.h"
+#include "../error.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_error/c/error-common.h b/level_2/fll_error/c/error/common.h
similarity index 100%
rename from level_2/fll_error/c/error-common.h
rename to level_2/fll_error/c/error/common.h

diff --git a/level_2/fll_error/data/build/settings b/level_2/fll_error/data/build/settings
index 8bef3cd..d4261db 100644 (file)
--- a/level_2/fll_error/data/build/settings
+++ b/level_2/fll_error/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library error.c error-common.c private-error.c
+build_sources_library error.c private-error.c error/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers error.h error-common.h
+build_sources_headers error.h error/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings
index 86743d9..90c6a12 100644 (file)
--- a/level_2/fll_execute/data/build/settings
+++ b/level_2/fll_execute/data/build/settings
@@ -63,7 +63,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings
index 647b27a..c57e4fa 100644 (file)
--- a/level_2/fll_file/data/build/settings
+++ b/level_2/fll_file/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c
index b7740d8..4e8d786 100644 (file)
--- a/level_2/fll_fss/c/fss.c
+++ b/level_2/fll_fss/c/fss.c
@@ -1,5 +1,4 @@
 #include "fss.h"
-#include "private-fss.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss/basic.c
similarity index 99%
rename from level_2/fll_fss/c/fss_basic.c
rename to level_2/fll_fss/c/fss/basic.c
index 18f98e9..f967b53 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.c
+++ b/level_2/fll_fss/c/fss/basic.c
@@ -1,4 +1,4 @@
-#include "fss_basic.h"
+#include "basic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss/basic.h
similarity index 99%
rename from level_2/fll_fss/c/fss_basic.h
rename to level_2/fll_fss/c/fss/basic.h
index 89d3276..7c70eef 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.h
+++ b/level_2/fll_fss/c/fss/basic.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss/basic_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_basic_list.c
rename to level_2/fll_fss/c/fss/basic_list.c
index dee3c52..bd3e501 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.c
+++ b/level_2/fll_fss/c/fss/basic_list.c
@@ -1,4 +1,4 @@
-#include "fss_basic_list.h"
+#include "basic_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss/basic_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_basic_list.h
rename to level_2/fll_fss/c/fss/basic_list.h
index fe3bda0..75c6403 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.h
+++ b/level_2/fll_fss/c/fss/basic_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/fss_embedded_list.c b/level_2/fll_fss/c/fss/embedded_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_embedded_list.c
rename to level_2/fll_fss/c/fss/embedded_list.c
index d0721b3..908f7c5 100644 (file)
--- a/level_2/fll_fss/c/fss_embedded_list.c
+++ b/level_2/fll_fss/c/fss/embedded_list.c
@@ -1,4 +1,4 @@
-#include "fss_embedded_list.h"
+#include "embedded_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_embedded_list.h b/level_2/fll_fss/c/fss/embedded_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_embedded_list.h
rename to level_2/fll_fss/c/fss/embedded_list.h
index 554cc61..c482376 100644 (file)
--- a/level_2/fll_fss/c/fss_embedded_list.h
+++ b/level_2/fll_fss/c/fss/embedded_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_embedded_list.h>
+#include <fll/level_1/fss/embedded_list.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss/extended.c
similarity index 99%
rename from level_2/fll_fss/c/fss_extended.c
rename to level_2/fll_fss/c/fss/extended.c
index 36ad280..c5c2177 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.c
+++ b/level_2/fll_fss/c/fss/extended.c
@@ -1,4 +1,4 @@
-#include "fss_extended.h"
+#include "extended.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss/extended.h
similarity index 99%
rename from level_2/fll_fss/c/fss_extended.h
rename to level_2/fll_fss/c/fss/extended.h
index 2680bc7..39393d7 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.h
+++ b/level_2/fll_fss/c/fss/extended.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_extended.h>
+#include <fll/level_1/fss/extended.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss/extended_list.c
similarity index 99%
rename from level_2/fll_fss/c/fss_extended_list.c
rename to level_2/fll_fss/c/fss/extended_list.c
index 31427f9..fb1fade 100644 (file)
--- a/level_2/fll_fss/c/fss_extended_list.c
+++ b/level_2/fll_fss/c/fss/extended_list.c
@@ -1,4 +1,4 @@
-#include "fss_extended_list.h"
+#include "extended_list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss/extended_list.h
similarity index 99%
rename from level_2/fll_fss/c/fss_extended_list.h
rename to level_2/fll_fss/c/fss/extended_list.h
index 2fdda41..0871e90 100644 (file)
--- a/level_2/fll_fss/c/fss_extended_list.h
+++ b/level_2/fll_fss/c/fss/extended_list.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_extended_list.h>
+#include <fll/level_1/fss/extended_list.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_payload.c b/level_2/fll_fss/c/fss/payload.c
similarity index 99%
rename from level_2/fll_fss/c/fss_payload.c
rename to level_2/fll_fss/c/fss/payload.c
index 6739618..4839903 100644 (file)
--- a/level_2/fll_fss/c/fss_payload.c
+++ b/level_2/fll_fss/c/fss/payload.c
@@ -1,4 +1,4 @@
-#include "fss_payload.h"
+#include "payload.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_fss/c/fss_payload.h b/level_2/fll_fss/c/fss/payload.h
similarity index 99%
rename from level_2/fll_fss/c/fss_payload.h
rename to level_2/fll_fss/c/fss/payload.h
index ba99f1b..a42982a 100644 (file)
--- a/level_2/fll_fss/c/fss_payload.h
+++ b/level_2/fll_fss/c/fss/payload.h
@@ -20,7 +20,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/fss.h>
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/string.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/private-fss.c b/level_2/fll_fss/c/private-fss.c
deleted file mode 100644 (file)
index be126fd..0000000
--- a/level_2/fll_fss/c/private-fss.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "fss.h"
-#include "private-fss.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif

diff --git a/level_2/fll_fss/c/private-fss.h b/level_2/fll_fss/c/private-fss.h
deleted file mode 100644 (file)
index 749a068..0000000
--- a/level_2/fll_fss/c/private-fss.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * FLL - Level 2
- *
- * Project: FSS
- * API Version: 0.5
- * Licenses: lgpl-2.1-or-later
- *
- * These are provided for internal reduction in redundant code.
- * These should not be exposed/used outside of this project.
- */
-#ifndef _PRIVATE_FLL_fss_h
-#define _PRIVATE_FLL_fss_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // _PRIVATE_FLL_fss_h

diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings
index 60f0d00..47647a9 100644 (file)
--- a/level_2/fll_fss/data/build/settings
+++ b/level_2/fll_fss/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library fss.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c fss_payload.c
+build_sources_library fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c fss/payload.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_payload.h
+build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h fss/payload.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings
index cc00950..dba7d34 100644 (file)
--- a/level_2/fll_fss_status_string/data/build/settings
+++ b/level_2/fll_fss_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_iki/data/build/settings b/level_2/fll_iki/data/build/settings
index f8b3acb..3e355a6 100644 (file)
--- a/level_2/fll_iki/data/build/settings
+++ b/level_2/fll_iki/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_path/data/build/settings b/level_2/fll_path/data/build/settings
index 08fe5a5..f05e6d2 100644 (file)
--- a/level_2/fll_path/data/build/settings
+++ b/level_2/fll_path/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_print/data/build/settings b/level_2/fll_print/data/build/settings
index 9c0d5f0..c1e28b7 100644 (file)
--- a/level_2/fll_print/data/build/settings
+++ b/level_2/fll_print/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h
index fe5d141..de5ac41 100644 (file)
--- a/level_2/fll_program/c/program.h
+++ b/level_2/fll_program/c/program.h
@@ -10,7 +10,7 @@
 #ifndef _FLL_program_h
 #define _FLL_program_h
 
-// libc include
+// Libc includes.
 #include <stdio.h>
 
 // FLL-0 includes.
@@ -29,8 +29,8 @@
 #include <fll/level_1/string.h>
 #include <fll/level_1/print.h>
 
-// fll-2 program includes
-#include <fll/level_2/program-common.h>
+// FLL-2 program includes.
+#include <fll/level_2/program/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_program/c/program-common.c b/level_2/fll_program/c/program/common.c
similarity index 98%
rename from level_2/fll_program/c/program-common.c
rename to level_2/fll_program/c/program/common.c
index c67b6db..d3446d5 100644 (file)
--- a/level_2/fll_program/c/program-common.c
+++ b/level_2/fll_program/c/program/common.c
@@ -1,4 +1,4 @@
-#include "program.h"
+#include "../program.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_2/fll_program/c/program-common.h b/level_2/fll_program/c/program/common.h
similarity index 100%
rename from level_2/fll_program/c/program-common.h
rename to level_2/fll_program/c/program/common.h

diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings
index 4b12fe3..765c65f 100644 (file)
--- a/level_2/fll_program/data/build/settings
+++ b/level_2/fll_program/data/build/settings
@@ -30,7 +30,7 @@ build_objects_library_static
 build_objects_program
 build_objects_program_shared
 build_objects_program_static
-build_sources_library program.c program-common.c
+build_sources_library program.c program/common.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_object
@@ -39,7 +39,7 @@ build_sources_object_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers program.h program-common.h
+build_sources_headers program.h program/common.h
 build_sources_headers_shared
 build_sources_headers_static
 build_sources_script
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_2/fll_status_string/data/build/settings b/level_2/fll_status_string/data/build/settings
index 3516ecf..a538eb9 100644 (file)
--- a/level_2/fll_status_string/data/build/settings
+++ b/level_2/fll_status_string/data/build/settings
@@ -62,7 +62,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings
index f04f44c..c3fbb7e 100644 (file)
--- a/level_3/byte_dump/data/build/settings
+++ b/level_3/byte_dump/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h
index b3bc210..1d193f0 100644 (file)
--- a/level_3/control/c/control.h
+++ b/level_3/control/c/control.h
@@ -40,7 +40,7 @@
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings
index 427c53b..59af6ca 100644 (file)
--- a/level_3/control/data/build/settings
+++ b/level_3/control/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h
index f41d830..67f4c2f 100644 (file)
--- a/level_3/controller/c/controller.h
+++ b/level_3/controller/c/controller.h
@@ -74,10 +74,10 @@
 #include <fll/level_2/error.h>
 #include <fll/level_2/execute.h>
 #include <fll/level_2/fss.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
-#include <fll/level_2/fss_extended_list.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
+#include <fll/level_2/fss/extended_list.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>

diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings
index 5bab469..1213f24 100644 (file)
--- a/level_3/controller/data/build/settings
+++ b/level_3/controller/data/build/settings
@@ -75,7 +75,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h
index da4ef73..1ad83ae 100644 (file)
--- a/level_3/fake/c/fake.h
+++ b/level_3/fake/c/fake.h
@@ -82,8 +82,8 @@
 #include <fll/level_2/execute.h>
 #include <fll/level_2/file.h>
 #include <fll/level_2/fss.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index b8413ab..56e6fff 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index 6b0fbf6..eeb1d99 100644 (file)
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -41,9 +41,9 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/execute.h>
-#include <fll/level_2/fss_basic.h>
-#include <fll/level_2/fss_basic_list.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/basic.h>
+#include <fll/level_2/fss/basic_list.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index 640df7b..e870e01 100644 (file)
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
index 8c84b09..f7f9b4a 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_basic_list.h>
+#include <fll/level_2/fss/basic_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index b1afbde..354bfe2 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
index aae4f81..fc72501 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
@@ -30,7 +30,7 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index 3400f33..8e13cf2 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h
index d079c66..f21ab8a 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_basic.h>
+#include <fll/level_2/fss/basic.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index 5bf1f9c..1535be1 100644 (file)
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index f893f87..570cbd8 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic.h>
+#include <fll/level_1/fss/basic.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_basic.h>
+#include <fll/level_2/fss/basic.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 824118e..6f6997a 100644 (file)
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
index 943fbff..b30fdc6 100644 (file)
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_embedded_list.h>
+#include <fll/level_2/fss/embedded_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings
index b0e810e..583ecb6 100644 (file)
--- a/level_3/fss_embedded_list_read/data/build/settings
+++ b/level_3/fss_embedded_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
index 859d8c8..a0d6c38 100644 (file)
--- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
+++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
@@ -31,7 +31,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/conversion.h>
-#include <fll/level_1/fss_embedded_list.h>
+#include <fll/level_1/fss/embedded_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings
index 0a254a6..61fb107 100644 (file)
--- a/level_3/fss_embedded_list_write/data/build/settings
+++ b/level_3/fss_embedded_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
index b20a762..6783035 100644 (file)
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended_list.h>
+#include <fll/level_2/fss/extended_list.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings
index 1d02ce3..b9808ae 100644 (file)
--- a/level_3/fss_extended_list_read/data/build/settings
+++ b/level_3/fss_extended_list_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
index 75661fc..d8e3e91 100644 (file)
--- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h
+++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
@@ -31,7 +31,7 @@
 
 // FLL-1 includes.
 #include <fll/level_1/conversion.h>
-#include <fll/level_1/fss_extended_list.h>
+#include <fll/level_1/fss/extended_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 

diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings
index fece3b7..207e704 100644 (file)
--- a/level_3/fss_extended_list_write/data/build/settings
+++ b/level_3/fss_extended_list_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h
index 38f4896..9022f4f 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -43,7 +43,7 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index 6553164..933c5bb 100644 (file)
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h
index 835744e..a75ddcd 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.h
+++ b/level_3/fss_extended_write/c/fss_extended_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_extended.h>
+#include <fll/level_1/fss/extended.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_extended.h>
+#include <fll/level_2/fss/extended.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings
index 845f5a4..54c2e81 100644 (file)
--- a/level_3/fss_extended_write/data/build/settings
+++ b/level_3/fss_extended_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings
index 58dab22..6ed694a 100644 (file)
--- a/level_3/fss_identify/data/build/settings
+++ b/level_3/fss_identify/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_payload_read/c/fss_payload_read.h b/level_3/fss_payload_read/c/fss_payload_read.h
index 4defbf6..4f5caa3 100644 (file)
--- a/level_3/fss_payload_read/c/fss_payload_read.h
+++ b/level_3/fss_payload_read/c/fss_payload_read.h
@@ -43,8 +43,8 @@
 // FLL-2 includes.
 #include <fll/level_2/error.h>
 #include <fll/level_2/file.h>
-#include <fll/level_2/fss_extended.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/extended.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings
index d798bed..2ec9c9a 100644 (file)
--- a/level_3/fss_payload_read/data/build/settings
+++ b/level_3/fss_payload_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_payload_write/c/fss_payload_write.h b/level_3/fss_payload_write/c/fss_payload_write.h
index ca28e35..1679a62 100644 (file)
--- a/level_3/fss_payload_write/c/fss_payload_write.h
+++ b/level_3/fss_payload_write/c/fss_payload_write.h
@@ -30,13 +30,13 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/fss_basic_list.h>
+#include <fll/level_1/fss/basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
 // FLL-2 includes.
 #include <fll/level_2/error.h>
-#include <fll/level_2/fss_payload.h>
+#include <fll/level_2/fss/payload.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings
index d3552fb..45c05f7 100644 (file)
--- a/level_3/fss_payload_write/data/build/settings
+++ b/level_3/fss_payload_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings
index a0c2e02..e6c0dbc 100644 (file)
--- a/level_3/fss_status_code/data/build/settings
+++ b/level_3/fss_status_code/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings
index 9003c43..e03c588 100644 (file)
--- a/level_3/iki_read/data/build/settings
+++ b/level_3/iki_read/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings
index c1ed8eb..8d348fc 100644 (file)
--- a/level_3/iki_write/data/build/settings
+++ b/level_3/iki_write/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings
index 655c33f..d6c05f2 100644 (file)
--- a/level_3/status_code/data/build/settings
+++ b/level_3/status_code/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes

diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings
index 39ac4ae..fd2b456 100644 (file)
--- a/level_3/utf8/data/build/settings
+++ b/level_3/utf8/data/build/settings
@@ -64,7 +64,7 @@ path_sources
 path_sources_object
 
 has_path_standard yes
-preserve_path_headers no
+preserve_path_headers yes
 
 search_exclusive yes
 search_shared yes