diff --git a/.clangd b/.clangd
index dd40ac6..aea4fe2 100644
--- a/.clangd
+++ b/.clangd
@@ -1,4 +1,4 @@
 CompileFlags:
   Add:
     - '-std=c++17'
-    - '-Iincludes'
+    - '-Iinclude'
diff --git a/.github/workflows/build.workflow.yml b/.github/workflows/build.workflow.yml
index 1b351f7..97cfa71 100644
--- a/.github/workflows/build.workflow.yml
+++ b/.github/workflows/build.workflow.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'includes/**/*'
+      - 'include/**/*'
   workflow_dispatch:
 
 concurrency:
@@ -28,7 +28,7 @@ jobs:
       - name: Build Release
         run: |
           mkdir -p build
-          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
 
       - name: Copy Release
         run: |
@@ -65,8 +65,8 @@ jobs:
       - name: Build Release
         run: |
           mkdir -p build
-          g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
-          g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
           lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
           lipo -info build/libRhythmGameUtilities.dylib
 
@@ -107,7 +107,7 @@ jobs:
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           mkdir -p build
-          cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
+          cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
           link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
           del build\RhythmGameUtilities.obj
 
diff --git a/.github/workflows/canary-build.workflow.yml b/.github/workflows/canary-build.workflow.yml
index af0a7ce..b88e04e 100644
--- a/.github/workflows/canary-build.workflow.yml
+++ b/.github/workflows/canary-build.workflow.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - main
     paths:
-      - 'includes/**/*'
+      - 'include/**/*'
   workflow_dispatch:
 
 concurrency:
@@ -24,7 +24,7 @@ jobs:
       - name: Build Release
         run: |
           mkdir -p build
-          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
   canary-build-macos:
     runs-on: macos-latest
 
@@ -35,8 +35,8 @@ jobs:
       - name: Build Release
         run: |
           mkdir -p build
-          g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
-          g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
           lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
           lipo -info build/libRhythmGameUtilities.dylib
   canary-build-windows:
@@ -51,6 +51,6 @@ jobs:
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           mkdir -p build
-          cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
+          cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
           link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
           del build\RhythmGameUtilities.obj
diff --git a/.github/workflows/test.workflow.yml b/.github/workflows/test.workflow.yml
index 19ce547..9df6a62 100644
--- a/.github/workflows/test.workflow.yml
+++ b/.github/workflows/test.workflow.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'includes/**/*'
+      - 'include/**/*'
       - 'tests/**/*'
       - 'RhythmGameUtilities/**/*'
       - 'RhythmGameUtilities.Tests/**/*'
@@ -14,7 +14,7 @@ on:
     branches:
       - main
     paths:
-      - 'includes/**/*'
+      - 'include/**/*'
       - 'tests/**/*'
       - 'RhythmGameUtilities/**/*'
       - 'RhythmGameUtilities.Tests/**/*'
@@ -47,7 +47,7 @@ jobs:
       - name: Build Release
         run: |
           mkdir -p build
-          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+          g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
 
       - name: Copy Release
         run: |
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 0362dbb..d962713 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -2,7 +2,7 @@
   "configurations": [
     {
       "name": "Mac",
-      "includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
+      "includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
       "defines": [],
       "compilerPath": "/usr/bin/clang",
       "cStandard": "c17",
@@ -11,7 +11,7 @@
     },
     {
       "name": "Win32",
-      "includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
+      "includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
       "defines": [],
       "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.40.33617/bin/Hostx64/x64/cl.exe",
       "cStandard": "c17",
diff --git a/Makefile b/Makefile
index 379fa87..4bfd55b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,6 @@ clean: ## Clean project
 	git clean -xdf
 
 tidy:
-	clang-tidy includes/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*
+	clang-tidy include/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*
 
 .PHONY: build
diff --git a/bin/build.bat b/bin/build.bat
index 570b747..507d736 100644
--- a/bin/build.bat
+++ b/bin/build.bat
@@ -7,7 +7,7 @@ if not defined VCINSTALLDIR (
 
 mkdir build
 
-cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
+cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
 link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
 
 del build\RhythmGameUtilities.obj
diff --git a/bin/build.sh b/bin/build.sh
index 5aeea49..0fc0311 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -16,8 +16,8 @@ COLOROFF=$(tput sgr0)
 
     printf "Building macOS libraries ... "
 
-    g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
-    g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
+    g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
+    g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
 
     if [[ ! -f build/libRhythmGameUtilities-arm64.dylib || ! -f build/libRhythmGameUtilities-x86_64.dylib ]]; then
         exit 1
diff --git a/bin/test.sh b/bin/test.sh
index 24d6622..f1f7e93 100755
--- a/bin/test.sh
+++ b/bin/test.sh
@@ -18,7 +18,7 @@ COLOROFF=$(tput sgr0)
 
         printf " - Running %s " "${FILE}"
 
-        if ! g++ -std=c++17 -o test "${FILE}" -Iincludes; then
+        if ! g++ -std=c++17 -o test "${FILE}" -Iinclude; then
             printf "%sCOMPILATION FAILED%s\n" "${REDON}" "${COLOROFF}"
             exit 1
         fi
diff --git a/includes/RhythmGameUtilities/Audio.hpp b/include/RhythmGameUtilities/Audio.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/Audio.hpp
rename to include/RhythmGameUtilities/Audio.hpp
diff --git a/includes/RhythmGameUtilities/Common.hpp b/include/RhythmGameUtilities/Common.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/Common.hpp
rename to include/RhythmGameUtilities/Common.hpp
diff --git a/includes/RhythmGameUtilities/Enums/Difficulty.h b/include/RhythmGameUtilities/Enums/Difficulty.h
similarity index 100%
rename from includes/RhythmGameUtilities/Enums/Difficulty.h
rename to include/RhythmGameUtilities/Enums/Difficulty.h
diff --git a/includes/RhythmGameUtilities/Enums/NamedSection.h b/include/RhythmGameUtilities/Enums/NamedSection.h
similarity index 100%
rename from includes/RhythmGameUtilities/Enums/NamedSection.h
rename to include/RhythmGameUtilities/Enums/NamedSection.h
diff --git a/includes/RhythmGameUtilities/Enums/TypeCode.h b/include/RhythmGameUtilities/Enums/TypeCode.h
similarity index 100%
rename from includes/RhythmGameUtilities/Enums/TypeCode.h
rename to include/RhythmGameUtilities/Enums/TypeCode.h
diff --git a/includes/RhythmGameUtilities/File.hpp b/include/RhythmGameUtilities/File.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/File.hpp
rename to include/RhythmGameUtilities/File.hpp
diff --git a/includes/RhythmGameUtilities/Parsers.hpp b/include/RhythmGameUtilities/Parsers.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/Parsers.hpp
rename to include/RhythmGameUtilities/Parsers.hpp
diff --git a/includes/RhythmGameUtilities/ParsersInternal.hpp b/include/RhythmGameUtilities/ParsersInternal.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/ParsersInternal.hpp
rename to include/RhythmGameUtilities/ParsersInternal.hpp
diff --git a/includes/RhythmGameUtilities/RhythmGameUtilities.cpp b/include/RhythmGameUtilities/RhythmGameUtilities.cpp
similarity index 100%
rename from includes/RhythmGameUtilities/RhythmGameUtilities.cpp
rename to include/RhythmGameUtilities/RhythmGameUtilities.cpp
diff --git a/includes/RhythmGameUtilities/Structs/BeatBar.h b/include/RhythmGameUtilities/Structs/BeatBar.h
similarity index 100%
rename from includes/RhythmGameUtilities/Structs/BeatBar.h
rename to include/RhythmGameUtilities/Structs/BeatBar.h
diff --git a/includes/RhythmGameUtilities/Structs/Note.h b/include/RhythmGameUtilities/Structs/Note.h
similarity index 100%
rename from includes/RhythmGameUtilities/Structs/Note.h
rename to include/RhythmGameUtilities/Structs/Note.h
diff --git a/includes/RhythmGameUtilities/Structs/TrackEvent.h b/include/RhythmGameUtilities/Structs/TrackEvent.h
similarity index 100%
rename from includes/RhythmGameUtilities/Structs/TrackEvent.h
rename to include/RhythmGameUtilities/Structs/TrackEvent.h
diff --git a/includes/RhythmGameUtilities/Utilities.hpp b/include/RhythmGameUtilities/Utilities.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/Utilities.hpp
rename to include/RhythmGameUtilities/Utilities.hpp
diff --git a/includes/RhythmGameUtilities/UtilitiesInternal.hpp b/include/RhythmGameUtilities/UtilitiesInternal.hpp
similarity index 100%
rename from includes/RhythmGameUtilities/UtilitiesInternal.hpp
rename to include/RhythmGameUtilities/UtilitiesInternal.hpp