diff --git a/src/01_preliminary/01_general/02_text_cases.jl b/src/00_preliminary/01_general/02_text_cases.jl
similarity index 100%
rename from src/01_preliminary/01_general/02_text_cases.jl
rename to src/00_preliminary/01_general/02_text_cases.jl
diff --git a/src/01_preliminary/02_modelling/01_model_naming.jl b/src/00_preliminary/02_modelling/01_model_naming.jl
similarity index 100%
rename from src/01_preliminary/02_modelling/01_model_naming.jl
rename to src/00_preliminary/02_modelling/01_model_naming.jl
diff --git a/src/01_preliminary/02_modelling/02_modelling_types.jl b/src/00_preliminary/02_modelling/02_modelling_types.jl
similarity index 100%
rename from src/01_preliminary/02_modelling/02_modelling_types.jl
rename to src/00_preliminary/02_modelling/02_modelling_types.jl
diff --git a/src/06_postliminary/01_preliminary.jl b/src/06_postliminary/00_preliminary.jl
similarity index 100%
rename from src/06_postliminary/01_preliminary.jl
rename to src/06_postliminary/00_preliminary.jl
diff --git a/src/06_postliminary/02_profiles/celerity/01_preliminary.jl b/src/06_postliminary/01_profiles/celerity/01_preliminary.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/celerity/01_preliminary.jl
rename to src/06_postliminary/01_profiles/celerity/01_preliminary.jl
diff --git a/src/06_postliminary/02_profiles/celerity/02_atmosphere.jl b/src/06_postliminary/01_profiles/celerity/02_atmosphere.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/celerity/02_atmosphere.jl
rename to src/06_postliminary/01_profiles/celerity/02_atmosphere.jl
diff --git a/src/06_postliminary/02_profiles/celerity/02_ocean.jl b/src/06_postliminary/01_profiles/celerity/02_ocean.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/celerity/02_ocean.jl
rename to src/06_postliminary/01_profiles/celerity/02_ocean.jl
diff --git a/src/06_postliminary/02_profiles/celerity/02_seabed.jl b/src/06_postliminary/01_profiles/celerity/02_seabed.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/celerity/02_seabed.jl
rename to src/06_postliminary/01_profiles/celerity/02_seabed.jl
diff --git a/src/06_postliminary/02_profiles/celerity/99_postliminary.jl b/src/06_postliminary/01_profiles/celerity/99_postliminary.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/celerity/99_postliminary.jl
rename to src/06_postliminary/01_profiles/celerity/99_postliminary.jl
diff --git a/src/06_postliminary/02_profiles/density/01_preliminary.jl b/src/06_postliminary/01_profiles/density/01_preliminary.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/density/01_preliminary.jl
rename to src/06_postliminary/01_profiles/density/01_preliminary.jl
diff --git a/src/06_postliminary/02_profiles/density/02_atmosphere.jl b/src/06_postliminary/01_profiles/density/02_atmosphere.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/density/02_atmosphere.jl
rename to src/06_postliminary/01_profiles/density/02_atmosphere.jl
diff --git a/src/06_postliminary/02_profiles/density/02_ocean.jl b/src/06_postliminary/01_profiles/density/02_ocean.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/density/02_ocean.jl
rename to src/06_postliminary/01_profiles/density/02_ocean.jl
diff --git a/src/06_postliminary/02_profiles/density/02_seabed.jl b/src/06_postliminary/01_profiles/density/02_seabed.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/density/02_seabed.jl
rename to src/06_postliminary/01_profiles/density/02_seabed.jl
diff --git a/src/06_postliminary/02_profiles/density/99_postliminary.jl b/src/06_postliminary/01_profiles/density/99_postliminary.jl
similarity index 100%
rename from src/06_postliminary/02_profiles/density/99_postliminary.jl
rename to src/06_postliminary/01_profiles/density/99_postliminary.jl
diff --git a/test/00_quality/aqua.jl b/test/00_preliminary/01_code_quality/aqua.jl
similarity index 60%
rename from test/00_quality/aqua.jl
rename to test/00_preliminary/01_code_quality/aqua.jl
index e2f9071..9884159 100644
--- a/test/00_quality/aqua.jl
+++ b/test/00_preliminary/01_code_quality/aqua.jl
@@ -2,5 +2,5 @@ using OceanSonar
 using Aqua
 
 Aqua.test_all(OceanSonar,
-    ambiguities = (broken = true,)
+    # ambiguities = (broken = true,)
 )
\ No newline at end of file
diff --git a/test/00_quality/docstrings.jl b/test/00_preliminary/01_code_quality/docstrings.jl
similarity index 100%
rename from test/00_quality/docstrings.jl
rename to test/00_preliminary/01_code_quality/docstrings.jl
diff --git a/test/00_quality/linting.jl b/test/00_preliminary/01_code_quality/linting.jl
similarity index 100%
rename from test/00_quality/linting.jl
rename to test/00_preliminary/01_code_quality/linting.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 3fcff12..c29818e 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -5,8 +5,8 @@ using SafeTestsets
     name = "Code Quality"
     @time @testset "$name" begin
         @info "Testing $name"
-        @safetestset "Aqua" include("00_quality/aqua.jl")
-        @safetestset "Linting" include("00_quality/linting.jl")
-        @safetestset "Docstrings" include("00_quality/docstrings.jl")
+        @safetestset "Aqua" include("00_preliminary/01_code_quality/aqua.jl")
+        @safetestset "Linting" include("00_preliminary/01_code_quality/linting.jl")
+        @safetestset "Docstrings" include("00_preliminary/01_code_quality/docstrings.jl")
     end
 end