diff --git a/.gitattributes b/.gitattributes
index ea8de3ecd..2709c11b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-examples_matlab_octave/* linguist-documentation
-doc_matlab_octave/* linguist-documentation
-doc_C++/* linguist-documentation
+examples/octave/* linguist-documentation
+doc/sphinx/octave/* linguist-documentation
+doc/doxygen/cpp/* linguist-documentation
 *.html linguist-detectable=false
 *.htm linguist-detectable=false
 *.css linguist-detectable=false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 05ab21a5b..ad98f9cc6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,7 @@
      - ✅ Provide tests for your changes.
      - 📝 Use descriptive commit messages.
      - 📗 Update any related documentation and include any relevant screenshots.
-     - 📝 Add license information in the appropriate place. See MATLAB or C++ code for reference.
+     - 📝 Add license information in the appropriate place. See GNU Octave or C++ code for reference.
       
           SPDX-License-Identifier: GPL-3.0-or-later
           © 2008-2024 San Diego State University Research Foundation (SDSURF).
diff --git a/.github/workflows/matlab-tests.yml b/.github/workflows/matlab-tests.yml
index 72d2a4511..82578468f 100644
--- a/.github/workflows/matlab-tests.yml
+++ b/.github/workflows/matlab-tests.yml
@@ -33,8 +33,8 @@ jobs:
         with:
           test-results-junit: test-results/results.xml
           code-coverage-cobertura: code-coverage/coverage.xml
-          source-folder: src/matlab_octave
-          select-by-folder: tests/matlab_octave
+          source-folder: src/octave
+          select-by-folder: tests/octave
           strict: false
           use-parallel: false
           generate-summary: true
diff --git a/.zenodo.json b/.zenodo.json
index cb26ba44f..99f74a6de 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -157,7 +157,7 @@
             "name": "GNU General Public License v3.0", 
             "key": "gpl-3.0"
         }, 
-        "language": "MATLAB/Octave", 
+        "language": "Octave (MATLAB)", 
         "url": "https://api.github.com/repos/jcorbino/mole", 
         "subscribers_url": "https://api.github.com/repos/jcorbino/mole/subscribers", 
         "created_at": "2017-08-12T19:03:04Z", 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a900e579..29380576c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,10 +149,10 @@ set(LINK_LIBS ${ARMADILLO_LIBRARIES}
 # Add subdirectories
 add_subdirectory(src/cpp)
 add_subdirectory(tests/cpp)
-add_subdirectory(tests/matlab_octave)
+add_subdirectory(tests/octave)
 add_subdirectory(examples/cpp)
 
 # Custom target to build everything
-add_custom_target(all_build DEPENDS mole_C++ tests_C++ examples_C++ tests_matlab_octave)
+add_custom_target(all_build DEPENDS mole_C++ tests_C++ examples_C++ tests_octave)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 84d58b65d..7df2cde0e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ The MOLE library follows a consistent structure across Octave and C++ implementa
 
 #### Octave Core Functions
 
-Core functions are located in `src/matlab_octave/` and follow this pattern:
+Core functions are located in `src/octave/` and follow this pattern:
 
 ```matlab
 function OUTPUT = functionName(k, m, dx, ...)
@@ -157,7 +157,7 @@ When contributing core functionality, identify which category your contribution
 
 If adding a new operator, follow this checklist:
 
-1. **Octave Implementation** (`src/matlab_octave/newoperator.m`):
+1. **Octave Implementation** (`src/octave/newoperator.m`):
    ```matlab
    function OP = newoperator(k, m, dx)
    % Returns a new mimetic operator
@@ -195,7 +195,7 @@ Examples are organized by PDE type in the `examples/` directory:
 
 ```
 examples/
-├── matlab_octave/         # Octave examples
+├── octave/         # Octave examples
 │   ├── elliptic1D.m       # Basic examples
 │   ├── parabolic2D.m      # 2D examples
 │   └── compact_operators/ # Specialized examples
@@ -223,7 +223,7 @@ Organize your examples by PDE type:
 clc
 close all
 
-addpath('../../src/matlab_octave')  % REQUIRED: Add path to MOLE library
+addpath('../../src/octave')  % REQUIRED: Add path to MOLE library
 
 %% Problem Parameters
 % [Describe each parameter with physical meaning]
@@ -404,7 +404,7 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/example_name.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/example_name.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/example_name.cpp) *(if available)*
 
 #### Variants
diff --git a/README.md b/README.md
index 46b81d176..cfbe80b3e 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ make run_tests
 Octave equivalent of the C++ test suite. We recommend running these tests before using MOLE to ensure proper setup.
 
 ```matlab
-make run_matlab_octave_tests
+make run_octave_tests
 ```
 
 ## Examples
diff --git a/doc/doxygen/matlab_octave/README.md b/doc/doxygen/matlab_octave/README.md
deleted file mode 100644
index 596e8f112..000000000
--- a/doc/doxygen/matlab_octave/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains **generated** documentation of *MOLE's* MATLAB/Octave version via a tool called [M2HTML](https://www.gllmflndn.com/software/matlab/m2html). Please note that we do not regularly update this documentation.
diff --git a/doc/sphinx/Makefile b/doc/sphinx/Makefile
index d00af8b62..303d509df 100644
--- a/doc/sphinx/Makefile
+++ b/doc/sphinx/Makefile
@@ -44,6 +44,7 @@ help:
 # Doxygen documentation
 doc-doxygen:
 	@echo "Generating Doxygen documentation..."
+	@mkdir -p $(DOXYDIR)
 	@cd ../.. && doxygen Doxyfile
 	@if [ ! -d "$(DOXYXML)" ]; then \
 		echo "Error: Doxygen XML output directory not found at $(DOXYXML)"; \
diff --git a/doc/sphinx/octave/README.md b/doc/sphinx/octave/README.md
new file mode 100644
index 000000000..e5b3f95f7
--- /dev/null
+++ b/doc/sphinx/octave/README.md
@@ -0,0 +1 @@
+This folder contains **generated** documentation of *MOLE's* Octave version via a tool called [M2HTML](https://www.gllmflndn.com/software/matlab/m2html). Please note that we do not regularly update this documentation.
diff --git a/doc/doxygen/matlab_octave/alpha.png b/doc/sphinx/octave/alpha.png
similarity index 100%
rename from doc/doxygen/matlab_octave/alpha.png
rename to doc/sphinx/octave/alpha.png
diff --git a/doc/doxygen/matlab_octave/c++.png b/doc/sphinx/octave/c++.png
similarity index 100%
rename from doc/doxygen/matlab_octave/c++.png
rename to doc/sphinx/octave/c++.png
diff --git a/doc/doxygen/matlab_octave/c.png b/doc/sphinx/octave/c.png
similarity index 100%
rename from doc/doxygen/matlab_octave/c.png
rename to doc/sphinx/octave/c.png
diff --git a/doc/doxygen/matlab_octave/demoicon.gif b/doc/sphinx/octave/demoicon.gif
similarity index 100%
rename from doc/doxygen/matlab_octave/demoicon.gif
rename to doc/sphinx/octave/demoicon.gif
diff --git a/doc/doxygen/matlab_octave/down.png b/doc/sphinx/octave/down.png
similarity index 100%
rename from doc/doxygen/matlab_octave/down.png
rename to doc/sphinx/octave/down.png
diff --git a/doc/doxygen/matlab_octave/doxysearch.php b/doc/sphinx/octave/doxysearch.php
similarity index 100%
rename from doc/doxygen/matlab_octave/doxysearch.php
rename to doc/sphinx/octave/doxysearch.php
diff --git a/doc/doxygen/matlab_octave/fortran.png b/doc/sphinx/octave/fortran.png
similarity index 100%
rename from doc/doxygen/matlab_octave/fortran.png
rename to doc/sphinx/octave/fortran.png
diff --git a/doc/doxygen/matlab_octave/hp.png b/doc/sphinx/octave/hp.png
similarity index 100%
rename from doc/doxygen/matlab_octave/hp.png
rename to doc/sphinx/octave/hp.png
diff --git a/doc/doxygen/matlab_octave/index.html b/doc/sphinx/octave/index.html
similarity index 77%
rename from doc/doxygen/matlab_octave/index.html
rename to doc/sphinx/octave/index.html
index 1226961cc..7775bab6d 100644
--- a/doc/doxygen/matlab_octave/index.html
+++ b/doc/sphinx/octave/index.html
@@ -5,19 +5,19 @@
   <link rel="shortcut icon" href="../logo.png" type="image/x-icon">
   <title>MOLE's Documentation</title>
   <meta name="keywords" content="matlab, octave, m2html, documentation">
-  <meta name="description" content="MATLAB/Octave Documentation by M2HTML">
+  <meta name="description" content="Octave Documentation by M2HTML (MATLAB)">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="generator" content="m2html &copy; 2005 Guillaume Flandin">
   <meta name="robots" content="index, follow">
   <link type="text/css" rel="stylesheet" href="m2html.css">
 </head>
 <frameset cols="20%, 80%">
-  <frame scrolling="yes" name="menu" src="mole_MATLAB/menu.html"></frame>
+  <frame scrolling="yes" name="menu" src="mole_Octave/menu.html"></frame>
   <frame scrolling="yes" name="function" src="about:blank"></frame>
 </frameset>
 <noframe>
-This is a MATLAB/Octave Documentation by M2HTML.<br>
+This is a Octave Documentation by M2HTML (Compatible with MATLAB).<br>
 Go to <a href="menu.html">menu.html</a> for the documentation of all
-the MATLAB/Octave functions.
+the Octave functions.
 </noframe>
 </html>
diff --git a/doc/doxygen/matlab_octave/left.png b/doc/sphinx/octave/left.png
similarity index 100%
rename from doc/doxygen/matlab_octave/left.png
rename to doc/sphinx/octave/left.png
diff --git a/doc/doxygen/matlab_octave/linux.png b/doc/sphinx/octave/linux.png
similarity index 100%
rename from doc/doxygen/matlab_octave/linux.png
rename to doc/sphinx/octave/linux.png
diff --git a/doc/doxygen/matlab_octave/m2html.css b/doc/sphinx/octave/m2html.css
similarity index 100%
rename from doc/doxygen/matlab_octave/m2html.css
rename to doc/sphinx/octave/m2html.css
diff --git a/doc/doxygen/matlab_octave/matlabicon.gif b/doc/sphinx/octave/matlabicon.gif
similarity index 100%
rename from doc/doxygen/matlab_octave/matlabicon.gif
rename to doc/sphinx/octave/matlabicon.gif
diff --git a/doc/doxygen/matlab_octave/menu.html b/doc/sphinx/octave/menu.html
similarity index 72%
rename from doc/doxygen/matlab_octave/menu.html
rename to doc/sphinx/octave/menu.html
index ccb79eff7..69334724a 100644
--- a/doc/doxygen/matlab_octave/menu.html
+++ b/doc/sphinx/octave/menu.html
@@ -2,9 +2,9 @@
                 "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-  <title>MATLAB/Octave Index</title>
-  <meta name="keywords" content="mole_MATLAB">
-  <meta name="description" content="mole_MATLAB">
+  <title>Octave Index (compatible with MATLAB)</title>
+  <meta name="keywords" content="mole_Octave">
+  <meta name="description" content="mole_Octave">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="generator" content="m2html &copy; 2005 Guillaume Flandin">
   <meta name="robots" content="index, follow">
@@ -12,11 +12,11 @@
 </head>
 <body>
 <a name="_top"></a>
-<h1>MATLAB/Octave Index</h1>
-<h2>MATLAB/Octave Directories</h2>
+<h1>Octave Index</h1>
+<h2>Octave Directories</h2>
 <ul style="list-style-image:url(./matlabicon.gif)">
-<li><a href="mole_MATLAB/menu.html" target="menu">mole_MATLAB</a></li></ul>
-<!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- -->
+<li><a href="mole_Octave/menu.html" target="menu">mole_Octave</a></li></ul>
+<!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --><!-- --"><!-- --"><!-- --"><!-- --"><!-- --"><!-- --"><!-- --"><!-- --><!-- --><!-- --"><!-- --"><!-- -->
 
 <hr><address>Generated by <strong><a href="http://www.artefact.tk/software/matlab/m2html/" target="_parent">m2html</a></strong> &copy; 2005</address>
 </body>
diff --git a/doc/doxygen/matlab_octave/mex.png b/doc/sphinx/octave/mex.png
similarity index 100%
rename from doc/doxygen/matlab_octave/mex.png
rename to doc/sphinx/octave/mex.png
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/DI2.html b/doc/sphinx/octave/mole_Octave/DI2.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/DI2.html
rename to doc/sphinx/octave/mole_Octave/DI2.html
index e7802a11f..e789335e8 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/DI2.html
+++ b/doc/sphinx/octave/mole_Octave/DI2.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>DI2
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/DI3.html b/doc/sphinx/octave/mole_Octave/DI3.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/DI3.html
rename to doc/sphinx/octave/mole_Octave/DI3.html
index c42c4de80..21307c3fe 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/DI3.html
+++ b/doc/sphinx/octave/mole_Octave/DI3.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>DI3
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/GI1.html b/doc/sphinx/octave/mole_Octave/GI1.html
similarity index 98%
rename from doc/doxygen/matlab_octave/mole_MATLAB/GI1.html
rename to doc/sphinx/octave/mole_Octave/GI1.html
index 944f5c94f..12de4188b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/GI1.html
+++ b/doc/sphinx/octave/mole_Octave/GI1.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>GI1
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/GI13.html b/doc/sphinx/octave/mole_Octave/GI13.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/GI13.html
rename to doc/sphinx/octave/mole_Octave/GI13.html
index bb33ab1bc..6c27ca0b4 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/GI13.html
+++ b/doc/sphinx/octave/mole_Octave/GI13.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>GI13
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/GI2.html b/doc/sphinx/octave/mole_Octave/GI2.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/GI2.html
rename to doc/sphinx/octave/mole_Octave/GI2.html
index 5a16b2b1d..d5c3924ee 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/GI2.html
+++ b/doc/sphinx/octave/mole_Octave/GI2.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>GI2
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/curl2D.html b/doc/sphinx/octave/mole_Octave/curl2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/curl2D.html
rename to doc/sphinx/octave/mole_Octave/curl2D.html
index b5dc4874a..221a0d3a1 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/curl2D.html
+++ b/doc/sphinx/octave/mole_Octave/curl2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>curl2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div.html b/doc/sphinx/octave/mole_Octave/div.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div.html
rename to doc/sphinx/octave/mole_Octave/div.html
index 60055c211..ac21a09da 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div.html
+++ b/doc/sphinx/octave/mole_Octave/div.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div2D.html b/doc/sphinx/octave/mole_Octave/div2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div2D.html
rename to doc/sphinx/octave/mole_Octave/div2D.html
index 98845a3e5..5657bcde0 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div2D.html
+++ b/doc/sphinx/octave/mole_Octave/div2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div2DCurv.html b/doc/sphinx/octave/mole_Octave/div2DCurv.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div2DCurv.html
rename to doc/sphinx/octave/mole_Octave/div2DCurv.html
index 40bb6ad13..46c5f8f40 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div2DCurv.html
+++ b/doc/sphinx/octave/mole_Octave/div2DCurv.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div2DCurv
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div2DNonUniform.html b/doc/sphinx/octave/mole_Octave/div2DNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div2DNonUniform.html
rename to doc/sphinx/octave/mole_Octave/div2DNonUniform.html
index 07a1389cf..15dd61d8b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div2DNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/div2DNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div2DNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div3D.html b/doc/sphinx/octave/mole_Octave/div3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div3D.html
rename to doc/sphinx/octave/mole_Octave/div3D.html
index 3cd42c901..9d8807ed4 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div3D.html
+++ b/doc/sphinx/octave/mole_Octave/div3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div3DCurv.html b/doc/sphinx/octave/mole_Octave/div3DCurv.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div3DCurv.html
rename to doc/sphinx/octave/mole_Octave/div3DCurv.html
index 0fa90b7be..096534a62 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div3DCurv.html
+++ b/doc/sphinx/octave/mole_Octave/div3DCurv.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div3DCurv
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/div3DNonUniform.html b/doc/sphinx/octave/mole_Octave/div3DNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/div3DNonUniform.html
rename to doc/sphinx/octave/mole_Octave/div3DNonUniform.html
index 0803cdd51..863cee10d 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/div3DNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/div3DNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>div3DNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/divNonUniform.html b/doc/sphinx/octave/mole_Octave/divNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/divNonUniform.html
rename to doc/sphinx/octave/mole_Octave/divNonUniform.html
index db34afe7b..3b1760a10 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/divNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/divNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>divNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad.html b/doc/sphinx/octave/mole_Octave/grad.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad.html
rename to doc/sphinx/octave/mole_Octave/grad.html
index 4330b1ba8..bb5af2d6e 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad.html
+++ b/doc/sphinx/octave/mole_Octave/grad.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad2D.html b/doc/sphinx/octave/mole_Octave/grad2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad2D.html
rename to doc/sphinx/octave/mole_Octave/grad2D.html
index ac053988b..a6832aad2 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad2D.html
+++ b/doc/sphinx/octave/mole_Octave/grad2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad2DCurv.html b/doc/sphinx/octave/mole_Octave/grad2DCurv.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad2DCurv.html
rename to doc/sphinx/octave/mole_Octave/grad2DCurv.html
index 86f382323..e36c5515b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad2DCurv.html
+++ b/doc/sphinx/octave/mole_Octave/grad2DCurv.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad2DCurv
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad2DNonUniform.html b/doc/sphinx/octave/mole_Octave/grad2DNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad2DNonUniform.html
rename to doc/sphinx/octave/mole_Octave/grad2DNonUniform.html
index 19536ffa3..bcc2024bd 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad2DNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/grad2DNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad2DNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad3D.html b/doc/sphinx/octave/mole_Octave/grad3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad3D.html
rename to doc/sphinx/octave/mole_Octave/grad3D.html
index 006bae014..80eb7a87d 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad3D.html
+++ b/doc/sphinx/octave/mole_Octave/grad3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad3DCurv.html b/doc/sphinx/octave/mole_Octave/grad3DCurv.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad3DCurv.html
rename to doc/sphinx/octave/mole_Octave/grad3DCurv.html
index a86e17407..4a90e3a96 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad3DCurv.html
+++ b/doc/sphinx/octave/mole_Octave/grad3DCurv.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad3DCurv
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/grad3DNonUniform.html b/doc/sphinx/octave/mole_Octave/grad3DNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/grad3DNonUniform.html
rename to doc/sphinx/octave/mole_Octave/grad3DNonUniform.html
index 098e08612..46db99138 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/grad3DNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/grad3DNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>grad3DNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/gradNonUniform.html b/doc/sphinx/octave/mole_Octave/gradNonUniform.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/gradNonUniform.html
rename to doc/sphinx/octave/mole_Octave/gradNonUniform.html
index 9eccb5d44..322baf29a 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/gradNonUniform.html
+++ b/doc/sphinx/octave/mole_Octave/gradNonUniform.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>gradNonUniform
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/graph.dot b/doc/sphinx/octave/mole_Octave/graph.dot
similarity index 100%
rename from doc/doxygen/matlab_octave/mole_MATLAB/graph.dot
rename to doc/sphinx/octave/mole_Octave/graph.dot
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/graph.html b/doc/sphinx/octave/mole_Octave/graph.html
similarity index 98%
rename from doc/doxygen/matlab_octave/mole_MATLAB/graph.html
rename to doc/sphinx/octave/mole_Octave/graph.html
index 1f4d7684c..a8c879184 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/graph.html
+++ b/doc/sphinx/octave/mole_Octave/graph.html
@@ -2,9 +2,9 @@
                 "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-  <title>Dependency Graph for mole_MATLAB</title>
-  <meta name="keywords" content="dependency, graph, dependence, mole_MATLAB">
-  <meta name="description" content="Dependency graph for mole_MATLAB">
+  <title>Dependency Graph for mole_Octave</title>
+  <meta name="keywords" content="dependency, graph, dependence, mole_Octave">
+  <meta name="description" content="Dependency graph for mole_Octave">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="generator" content="m2html &copy; 2005 Guillaume Flandin">
   <meta name="robots" content="index, follow">
@@ -12,10 +12,10 @@
 </head>
 <body>
 <a name="_top"></a>
-<h1>Dependency Graph for mole_MATLAB</h1>
+<h1>Dependency Graph for mole_Octave</h1>
 
 <center>
-<img src="graph.png" usemap="#mainmap" alt="Dependency Graph for mole_MATLAB" border="2" style="color:#000;">  
+<img src="graph.png" usemap="#mainmap" alt="Dependency Graph for mole_Octave" border="2" style="color:#000;">  
 <map name="mainmap">
 <area shape="poly" id="node1" href="curl2D.html" title="curl2D" alt="" coords="731,29,728,22,720,15,707,10,692,7,674,5,657,7,641,10,629,15,621,22,618,29,621,37,629,43,641,49,657,52,674,53,692,52,707,49,720,43,728,37">
 <area shape="poly" id="node2" href="div2D.html" title="div2D" alt="" coords="779,125,776,118,769,111,758,106,743,103,728,101,712,103,697,106,686,111,679,118,676,125,679,133,686,139,697,145,712,148,728,149,743,148,758,145,769,139,776,133">
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/graph.map b/doc/sphinx/octave/mole_Octave/graph.map
similarity index 100%
rename from doc/doxygen/matlab_octave/mole_MATLAB/graph.map
rename to doc/sphinx/octave/mole_Octave/graph.map
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/graph.png b/doc/sphinx/octave/mole_Octave/graph.png
similarity index 100%
rename from doc/doxygen/matlab_octave/mole_MATLAB/graph.png
rename to doc/sphinx/octave/mole_Octave/graph.png
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/gridGen.html b/doc/sphinx/octave/mole_Octave/gridGen.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/gridGen.html
rename to doc/sphinx/octave/mole_Octave/gridGen.html
index 4d7f8c820..43d39952a 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/gridGen.html
+++ b/doc/sphinx/octave/mole_Octave/gridGen.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>gridGen
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpol.html b/doc/sphinx/octave/mole_Octave/interpol.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpol.html
rename to doc/sphinx/octave/mole_Octave/interpol.html
index 4d7ecf9e7..3fddd99a7 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpol.html
+++ b/doc/sphinx/octave/mole_Octave/interpol.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpol
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpol2D.html b/doc/sphinx/octave/mole_Octave/interpol2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpol2D.html
rename to doc/sphinx/octave/mole_Octave/interpol2D.html
index d192dfb8c..8fe3a50a4 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpol2D.html
+++ b/doc/sphinx/octave/mole_Octave/interpol2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpol2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpol3D.html b/doc/sphinx/octave/mole_Octave/interpol3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpol3D.html
rename to doc/sphinx/octave/mole_Octave/interpol3D.html
index d51ade502..28d4d4049 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpol3D.html
+++ b/doc/sphinx/octave/mole_Octave/interpol3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpol3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD.html b/doc/sphinx/octave/mole_Octave/interpolD.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpolD.html
rename to doc/sphinx/octave/mole_Octave/interpolD.html
index 3a77df326..3543c0c6b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD.html
+++ b/doc/sphinx/octave/mole_Octave/interpolD.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpolD
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD2D.html b/doc/sphinx/octave/mole_Octave/interpolD2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpolD2D.html
rename to doc/sphinx/octave/mole_Octave/interpolD2D.html
index 3dd52e4e0..c620e5dd6 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD2D.html
+++ b/doc/sphinx/octave/mole_Octave/interpolD2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpolD2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD3D.html b/doc/sphinx/octave/mole_Octave/interpolD3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/interpolD3D.html
rename to doc/sphinx/octave/mole_Octave/interpolD3D.html
index 9450b06f1..bc73773a7 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/interpolD3D.html
+++ b/doc/sphinx/octave/mole_Octave/interpolD3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>interpolD3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/jacobian2D.html b/doc/sphinx/octave/mole_Octave/jacobian2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/jacobian2D.html
rename to doc/sphinx/octave/mole_Octave/jacobian2D.html
index e875dedd4..20a7b7ca6 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/jacobian2D.html
+++ b/doc/sphinx/octave/mole_Octave/jacobian2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>jacobian2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/jacobian3D.html b/doc/sphinx/octave/mole_Octave/jacobian3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/jacobian3D.html
rename to doc/sphinx/octave/mole_Octave/jacobian3D.html
index 2b6576ff6..458382eff 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/jacobian3D.html
+++ b/doc/sphinx/octave/mole_Octave/jacobian3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>jacobian3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/lap.html b/doc/sphinx/octave/mole_Octave/lap.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/lap.html
rename to doc/sphinx/octave/mole_Octave/lap.html
index 4b12181d0..888cc55db 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/lap.html
+++ b/doc/sphinx/octave/mole_Octave/lap.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>lap
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/lap2D.html b/doc/sphinx/octave/mole_Octave/lap2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/lap2D.html
rename to doc/sphinx/octave/mole_Octave/lap2D.html
index 2516f4f73..4e02628c0 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/lap2D.html
+++ b/doc/sphinx/octave/mole_Octave/lap2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>lap2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/lap3D.html b/doc/sphinx/octave/mole_Octave/lap3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/lap3D.html
rename to doc/sphinx/octave/mole_Octave/lap3D.html
index fed4293a2..3e72b11fd 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/lap3D.html
+++ b/doc/sphinx/octave/mole_Octave/lap3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>lap3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/menu.html b/doc/sphinx/octave/mole_Octave/menu.html
similarity index 97%
rename from doc/doxygen/matlab_octave/mole_MATLAB/menu.html
rename to doc/sphinx/octave/mole_Octave/menu.html
index 6bb184c28..b1093639b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/menu.html
+++ b/doc/sphinx/octave/mole_Octave/menu.html
@@ -2,9 +2,9 @@
                 "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-  <title>Index for Directory mole_MATLAB</title>
-  <meta name="keywords" content="mole_MATLAB">
-  <meta name="description" content="Index for Directory mole_MATLAB">
+  <title>Index for Directory mole_Octave</title>
+  <meta name="keywords" content="mole_Octave">
+  <meta name="description" content="Index for Directory mole_Octave">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="generator" content="m2html &copy; 2005 Guillaume Flandin">
   <meta name="robots" content="index, follow">
@@ -12,7 +12,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<h1>Index for mole_MATLAB</h1>
+<h1>Index for mole_Octave</h1>
 
 <h2>Functions</h2>
 <ul style="list-style-image:url(../matlabicon.gif)">
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/mimeticB.html b/doc/sphinx/octave/mole_Octave/mimeticB.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/mimeticB.html
rename to doc/sphinx/octave/mole_Octave/mimeticB.html
index 37697584c..6e0633946 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/mimeticB.html
+++ b/doc/sphinx/octave/mole_Octave/mimeticB.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>mimeticB
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/nodal.html b/doc/sphinx/octave/mole_Octave/nodal.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/nodal.html
rename to doc/sphinx/octave/mole_Octave/nodal.html
index 76f3a3773..2041d56e7 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/nodal.html
+++ b/doc/sphinx/octave/mole_Octave/nodal.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>nodal
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/nodal2D.html b/doc/sphinx/octave/mole_Octave/nodal2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/nodal2D.html
rename to doc/sphinx/octave/mole_Octave/nodal2D.html
index e8af2f48d..59452388c 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/nodal2D.html
+++ b/doc/sphinx/octave/mole_Octave/nodal2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>nodal2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/nodal3D.html b/doc/sphinx/octave/mole_Octave/nodal3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/nodal3D.html
rename to doc/sphinx/octave/mole_Octave/nodal3D.html
index d1751b7f0..a4306867b 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/nodal3D.html
+++ b/doc/sphinx/octave/mole_Octave/nodal3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>nodal3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC.html b/doc/sphinx/octave/mole_Octave/robinBC.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/robinBC.html
rename to doc/sphinx/octave/mole_Octave/robinBC.html
index f2cb2caed..ba2ce469d 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC.html
+++ b/doc/sphinx/octave/mole_Octave/robinBC.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>robinBC
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC2D.html b/doc/sphinx/octave/mole_Octave/robinBC2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/robinBC2D.html
rename to doc/sphinx/octave/mole_Octave/robinBC2D.html
index f8c949c71..a206b91e0 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC2D.html
+++ b/doc/sphinx/octave/mole_Octave/robinBC2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>robinBC2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC3D.html b/doc/sphinx/octave/mole_Octave/robinBC3D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/robinBC3D.html
rename to doc/sphinx/octave/mole_Octave/robinBC3D.html
index 136e5f1ea..dc747bd45 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/robinBC3D.html
+++ b/doc/sphinx/octave/mole_Octave/robinBC3D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>robinBC3D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/tensorGrad2D.html b/doc/sphinx/octave/mole_Octave/tensorGrad2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/tensorGrad2D.html
rename to doc/sphinx/octave/mole_Octave/tensorGrad2D.html
index 4725ae34a..d11c74ad2 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/tensorGrad2D.html
+++ b/doc/sphinx/octave/mole_Octave/tensorGrad2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>tensorGrad2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/tfi.html b/doc/sphinx/octave/mole_Octave/tfi.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/tfi.html
rename to doc/sphinx/octave/mole_Octave/tfi.html
index f14dcbd73..49fe4ec58 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/tfi.html
+++ b/doc/sphinx/octave/mole_Octave/tfi.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>tfi
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/ttm.html b/doc/sphinx/octave/mole_Octave/ttm.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/ttm.html
rename to doc/sphinx/octave/mole_Octave/ttm.html
index 3d115ab41..5ee77e9ba 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/ttm.html
+++ b/doc/sphinx/octave/mole_Octave/ttm.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>ttm
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/weightsP.html b/doc/sphinx/octave/mole_Octave/weightsP.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/weightsP.html
rename to doc/sphinx/octave/mole_Octave/weightsP.html
index a804020e7..4aac53763 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/weightsP.html
+++ b/doc/sphinx/octave/mole_Octave/weightsP.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>weightsP
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/weightsP2D.html b/doc/sphinx/octave/mole_Octave/weightsP2D.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/weightsP2D.html
rename to doc/sphinx/octave/mole_Octave/weightsP2D.html
index 1c2def3cd..13538856d 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/weightsP2D.html
+++ b/doc/sphinx/octave/mole_Octave/weightsP2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>weightsP2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/weightsQ.html b/doc/sphinx/octave/mole_Octave/weightsQ.html
similarity index 99%
rename from doc/doxygen/matlab_octave/mole_MATLAB/weightsQ.html
rename to doc/sphinx/octave/mole_Octave/weightsQ.html
index 9778365af..07a48688c 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/weightsQ.html
+++ b/doc/sphinx/octave/mole_Octave/weightsQ.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>weightsQ
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/mole_MATLAB/weightsQ2D.html b/doc/sphinx/octave/mole_Octave/weightsQ2D.html
similarity index 98%
rename from doc/doxygen/matlab_octave/mole_MATLAB/weightsQ2D.html
rename to doc/sphinx/octave/mole_Octave/weightsQ2D.html
index e9b3ad750..5aeb5d2fc 100644
--- a/doc/doxygen/matlab_octave/mole_MATLAB/weightsQ2D.html
+++ b/doc/sphinx/octave/mole_Octave/weightsQ2D.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 <a name="_top"></a>
-<!-- menu.html mole_MATLAB -->
+<!-- menu.html mole_Octave -->
 <h1>weightsQ2D
 </h1>
 
diff --git a/doc/doxygen/matlab_octave/pcode.png b/doc/sphinx/octave/pcode.png
similarity index 100%
rename from doc/doxygen/matlab_octave/pcode.png
rename to doc/sphinx/octave/pcode.png
diff --git a/doc/doxygen/matlab_octave/right.png b/doc/sphinx/octave/right.png
similarity index 100%
rename from doc/doxygen/matlab_octave/right.png
rename to doc/sphinx/octave/right.png
diff --git a/doc/doxygen/matlab_octave/sgi.png b/doc/sphinx/octave/sgi.png
similarity index 100%
rename from doc/doxygen/matlab_octave/sgi.png
rename to doc/sphinx/octave/sgi.png
diff --git a/doc/doxygen/matlab_octave/simulinkicon.gif b/doc/sphinx/octave/simulinkicon.gif
similarity index 100%
rename from doc/doxygen/matlab_octave/simulinkicon.gif
rename to doc/sphinx/octave/simulinkicon.gif
diff --git a/doc/doxygen/matlab_octave/solaris.png b/doc/sphinx/octave/solaris.png
similarity index 100%
rename from doc/doxygen/matlab_octave/solaris.png
rename to doc/sphinx/octave/solaris.png
diff --git a/doc/doxygen/matlab_octave/up.png b/doc/sphinx/octave/up.png
similarity index 100%
rename from doc/doxygen/matlab_octave/up.png
rename to doc/sphinx/octave/up.png
diff --git a/doc/doxygen/matlab_octave/windows.png b/doc/sphinx/octave/windows.png
similarity index 100%
rename from doc/doxygen/matlab_octave/windows.png
rename to doc/sphinx/octave/windows.png
diff --git a/doc/sphinx/source/_ext/matlab_args_fix.py b/doc/sphinx/source/_ext/matlab_args_fix.py
index 29087c0e1..aa76550d9 100644
--- a/doc/sphinx/source/_ext/matlab_args_fix.py
+++ b/doc/sphinx/source/_ext/matlab_args_fix.py
@@ -1,5 +1,5 @@
 """
-Custom Sphinx extension to fix MATLAB function argument warnings.
+Custom Sphinx extension to fix Octave function argument warnings.
 """
 
 import warnings
@@ -8,9 +8,9 @@
 
 logger = getLogger(__name__)
 
-# Create a filter for MATLAB domain warnings
+# Create a filter for Octave domain warnings
 class MATLABWarningsFilter(logging.Filter):
-    """Filter to suppress specific MATLAB domain warnings."""
+    """Filter to suppress specific Octave domain warnings."""
     
     def filter(self, record):
         # Suppress warnings about formatting arguments
@@ -24,7 +24,7 @@ def setup(app):
     """
     Setup function for Sphinx extension.
     
-    This extension adds a filter to suppress MATLAB domain warnings.
+    This extension adds a filter to suppress Octave domain warnings.
     """
     # Add the filter to the Sphinx warning logger
     warning_logger = logging.getLogger('sphinx.domains.mat')
@@ -34,7 +34,7 @@ def setup(app):
     root_logger = logging.getLogger('sphinx')
     root_logger.addFilter(MATLABWarningsFilter())
     
-    logger.info("MATLAB argument warnings filter added")
+    logger.info("Octave argument warnings filter added")
     
     return {
         'version': '0.1',
diff --git a/doc/sphinx/source/_ext/matlab_doc_filter.py b/doc/sphinx/source/_ext/matlab_doc_filter.py
index 054e5401a..7443e65c9 100644
--- a/doc/sphinx/source/_ext/matlab_doc_filter.py
+++ b/doc/sphinx/source/_ext/matlab_doc_filter.py
@@ -1,5 +1,5 @@
 """
-Sphinx extension to filter out license headers from MATLAB docstrings
+Sphinx extension to filter out license headers from Octave docstrings
 and format them in an M2HTML-like style.
 """
 import re
@@ -16,36 +16,36 @@
 # Flag to track if we've analyzed the code
 _analyzed_code = False
 
-def analyze_matlab_code(matlab_src_dir):
+def analyze_octave_code(matlab_src_dir):
     """
-    Analyze MATLAB code to build a call graph.
+    Analyze Octave (MATLAB) code to build a call graph.
     
-    This function parses all MATLAB files in the source directory to identify
+    This function parses all Octave *.m files in the source directory to identify
     function calls and builds call graphs for both directions (calls and called by).
     
     Args:
-        matlab_src_dir: Directory containing MATLAB source files
+        matlab_src_dir: Directory containing Octave source files
     """
     global _function_calls_graph, _function_dependency_graph, _analyzed_code
     
     if _analyzed_code:
         return  # Only analyze once
     
-    print(f"Analyzing MATLAB code in {matlab_src_dir}")
+    print(f"Analyzing Octave code in {matlab_src_dir}")
     
     # Reset graphs
     _function_calls_graph = {}
     _function_dependency_graph = {}
     
-    # Get all MATLAB files
-    matlab_files = glob.glob(os.path.join(matlab_src_dir, "*.m"))
+    # Get all Octave files
+    octave_files = glob.glob(os.path.join(matlab_src_dir, "*.m"))
     
     # Map of lowercase function names to their original case
     case_map = {}
     
     # First pass: get all function names (without extensions)
     function_names = []
-    for filepath in matlab_files:
+    for filepath in octave_files:
         function_name = os.path.splitext(os.path.basename(filepath))[0]
         # Store the mapping between lowercase and original case
         case_map[function_name.lower()] = function_name
@@ -55,7 +55,7 @@ def analyze_matlab_code(matlab_src_dir):
         _function_dependency_graph[function_name] = set()
     
     # Second pass: analyze function calls
-    for filepath in matlab_files:
+    for filepath in octave_files:
         function_name = os.path.splitext(os.path.basename(filepath))[0]
         
         try:
@@ -87,7 +87,7 @@ def analyze_matlab_code(matlab_src_dir):
             print(f"Error analyzing {filepath}: {e}")
     
     # Print some stats for debugging
-    print(f"Analyzed {len(matlab_files)} MATLAB files")
+    print(f"Analyzed {len(octave_files)} Octave files")
     total_calls = sum(len(calls) for calls in _function_calls_graph.values())
     print(f"Found {total_calls} function calls")
     
@@ -106,12 +106,12 @@ def analyze_matlab_code(matlab_src_dir):
 
 def get_function_description(func_name, matlab_src_dir):
     """
-    Get the PURPOSE block description of a MATLAB function.
-    
+    Get the PURPOSE block description of an Octave function.
+
     Args:
         func_name: The name of the function
-        matlab_src_dir: The directory containing MATLAB source files
-        
+        matlab_src_dir: The directory containing Octave source files
+
     Returns:
         The PURPOSE block text if found, empty string otherwise
     """
@@ -125,7 +125,7 @@ def get_function_description(func_name, matlab_src_dir):
         func_file = func_name
         func_name = func_name[:-2]  # Remove .m
 
-    # Look for the file in the MATLAB source directory
+    # Look for the file in the Octave source directory
     filepath = os.path.join(matlab_src_dir, func_file)
     if not os.path.exists(filepath):
         # Try finding it with case-insensitive search
@@ -194,7 +194,7 @@ def get_function_description(func_name, matlab_src_dir):
 
 def m2html_style_formatter(app, what, name, obj, options, lines):
     """
-    Process MATLAB docstrings to create M2HTML-like output.
+    Process Octave docstrings to create M2HTML-like output.
     
     This transforms the docstrings to have clear sections like:
     - PURPOSE
@@ -206,16 +206,16 @@ def m2html_style_formatter(app, what, name, obj, options, lines):
         return
         
     # Get configuration options
-    matlab_filter_options = getattr(app.config, 'matlab_filter_options', {})
-    remove_license = matlab_filter_options.get('remove_license', True)
-    m2html_style = matlab_filter_options.get('m2html_style', True)
+    octave_filter_options = getattr(app.config, 'octave_filter_options', {})
+    remove_license = octave_filter_options.get('remove_license', True)
+    m2html_style = octave_filter_options.get('m2html_style', True)
     
-    # Get MATLAB source directory from configuration
+    # Get Octave source directory from configuration
     matlab_src_dir = getattr(app.config, 'matlab_src_dir', '')
     
-    # Analyze the MATLAB code to build call graphs
+    # Analyze the Octave code to build call graphs
     if matlab_src_dir and not _analyzed_code:
-        analyze_matlab_code(matlab_src_dir)
+        analyze_octave_code(matlab_src_dir)
     
     # Store extracted tagged content
     first_desc_line = ""
@@ -516,7 +516,7 @@ def setup(app):
     Set up the extension.
     """
     # Add default configuration
-    app.add_config_value('matlab_filter_options', {
+    app.add_config_value('octave_filter_options', {
         'remove_license': True,
         'm2html_style': True,
     }, 'env')
diff --git a/doc/sphinx/source/_static/css/custom.css b/doc/sphinx/source/_static/css/custom.css
index e65008c9c..86215bc81 100644
--- a/doc/sphinx/source/_static/css/custom.css
+++ b/doc/sphinx/source/_static/css/custom.css
@@ -162,9 +162,9 @@ tbody tr:nth-child(odd) {
   box-shadow: 0 1px 2px rgba(0,0,0,0.1);
 }
 
-/* ===== MATLAB SPECIFIC STYLING ===== */
+/* ===== Octave SPECIFIC STYLING ===== */
 
-/* MATLAB code blocks */
+/* Octave code blocks */
 .highlight-matlab pre,
 .matlab-code {
   background-color: #f5f5f5;
diff --git a/doc/sphinx/source/api/matlab_octave/api.rst b/doc/sphinx/source/api/octave/api.rst
similarity index 100%
rename from doc/sphinx/source/api/matlab_octave/api.rst
rename to doc/sphinx/source/api/octave/api.rst
diff --git a/doc/sphinx/source/api/matlab_octave/index-beta.rst b/doc/sphinx/source/api/octave/index-beta.rst
similarity index 100%
rename from doc/sphinx/source/api/matlab_octave/index-beta.rst
rename to doc/sphinx/source/api/octave/index-beta.rst
diff --git a/doc/sphinx/source/api/matlab_octave/matlab_index.rst b/doc/sphinx/source/api/octave/matlab_index.rst
similarity index 100%
rename from doc/sphinx/source/api/matlab_octave/matlab_index.rst
rename to doc/sphinx/source/api/octave/matlab_index.rst
diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
index b7aa46800..5c6bcad91 100644
--- a/doc/sphinx/source/conf.py
+++ b/doc/sphinx/source/conf.py
@@ -67,12 +67,12 @@
     'breathe',                # Doxygen integration
     'myst_parser',            # Markdown support
     
-    # MATLAB documentation
+    # Octave (MATLAB) documentation
     'sphinxcontrib.matlab',   # MATLAB domain support
     
     # Custom extensions
-    'matlab_doc_filter',      # Filter license info from MATLAB docstrings
-    'matlab_args_fix',        # Fix MATLAB function argument warnings
+    'matlab_doc_filter',      # Filter license info from GNU Octave docstrings
+    'matlab_args_fix',        # Fix GNU Octave function argument warnings
     'generate_sitemap',       # Generate sitemap.xml for SEO
     'github_contributors',    # Display GitHub contributors
 ]
@@ -151,16 +151,16 @@
 ]
 
 #------------------------------------------------------------------------------
-# MATLAB/Octave domain configuration
+# Octave (MATLAB)domain configuration
 #------------------------------------------------------------------------------
-# Path to MATLAB/Octave source directory for cross-reference functionality
-matlab_src_dir = os.path.abspath(os.path.join(ROOT_DIR, 'src', 'matlab_octave'))
+# Path to Octave (MATLAB) source directory for cross-reference functionality
+matlab_src_dir = os.path.abspath(os.path.join(ROOT_DIR, 'src', 'octave'))
 
 # Enhanced debug logging
-# print("\nDEBUG: Enhanced MATLAB Configuration:")
+# print("\nDEBUG: Enhanced GNU Octave Configuration:")
 # print(f"Current working directory: {os.getcwd()}")
 # print(f"ROOT_DIR value: {ROOT_DIR}")
-# print(f"MATLAB source directory: {matlab_src_dir}")
+# print(f"GNU Octave source directory: {matlab_src_dir}")
 # print(f"Directory exists: {os.path.exists(matlab_src_dir)}")
 try:
     if os.path.exists(os.path.dirname(matlab_src_dir)):
@@ -184,31 +184,31 @@
     # print(f"Error getting sphinxcontrib-matlab version: {e}")
     pass # Placeholder
 
-# Add MATLAB/Octave directory to Python path if it exists
+# Add Octave (MATLAB) directory to Python path if it exists
 if os.path.exists(matlab_src_dir):
     sys.path.insert(0, matlab_src_dir)
-    # print(f"\nAdded existing MATLAB/Octave directory to Python path: {matlab_src_dir}")
+    # print(f"\nAdded existing Octave (MATLAB) directory to Python path: {matlab_src_dir}")
 
-# For matlabdomain, we need to treat MATLAB files as modules
-primary_domain = 'mat'  # Make MATLAB the primary domain for .m files
+# For matlabdomain, we need to treat Octave files as modules
+primary_domain = 'mat'  # Make Octave the primary domain for .m files
 
-# MATLAB documentation style settings
+# Octave documentation style settings
 matlab_keep_package_prefix = False
 matlab_short_links = True
-matlab_auto_link = "basic"  # Auto-link known MATLAB code elements
+matlab_auto_link = "basic"  # Auto-link known Octave code elements
 matlab_show_property_default_value = False
 matlab_show_property_specs = False
 
-# MATLAB documentation filtering options
+# Octave documentation filtering options
 matlab_filter_options = {
     'remove_license': True,
     'm2html_style': True,
 }
 
-# Reduce MATLAB domain verbosity
+# Reduce Octave domain verbosity
 matlab_suppress_warnings = True
 
-# Add MATLAB to intersphinx mapping if needed
+# Add Octave to intersphinx mapping if needed
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
     'numpy': ('https://numpy.org/doc/stable', None),
@@ -853,7 +853,7 @@ def mkdir_p(path):
 # readme_files = [
 #     os.path.join(example_dest, "README.md"),
 #     os.path.join(example_dest, "cpp/README.md"),
-#     os.path.join(example_dest, "matlab/compact_operators/README.md")
+#     os.path.join(example_dest, "octave/compact_operators/README.md")
 # ]
 # 
 # for readme_file in readme_files:
@@ -871,8 +871,8 @@ def mkdir_p(path):
 #             title = "C++ Examples"
 #             content = "This folder contains C++ examples for MOLE."
 #         elif basename == "compact_operators":
-#             title = "MATLAB Compact Operators"
-#             content = "This folder contains MATLAB examples for compact operators."
+#             title = "Octave Compact Operators"
+#             content = "This folder contains Octave examples for compact operators."
 #         
 #         with open(readme_file, 'w') as f:
 #             f.write(f"# {title}\n\n{content}\n")
@@ -904,7 +904,7 @@ def mkdir_p(path):
 
 # Additional meta tags for all pages
 html_meta = {
-    'keywords': 'mimetic operators, computational science, PDE solver, numerical methods, scientific computing, MATLAB, C++',
+    'keywords': 'mimetic operators, computational science, PDE solver, numerical methods, scientific computing, MATLAB, GNU Octave, C++',
     'description': 'MOLE: Mimetic Operators Library Enhanced - A high-order mimetic differential operators library for solving PDEs',
     'author': 'CSRC SDSU',
     'viewport': 'width=device-width, initial-scale=1',
diff --git a/doc/sphinx/source/dev-notes/RELEASING.md b/doc/sphinx/source/dev-notes/RELEASING.md
index 4839bf5a4..9a29153b3 100644
--- a/doc/sphinx/source/dev-notes/RELEASING.md
+++ b/doc/sphinx/source/dev-notes/RELEASING.md
@@ -26,7 +26,7 @@ While doing this, gather a couple sentences for key features to highlight on [Gi
 
 1. **Testing**: Ensure all tests pass on supported platforms:
    - Run `make run_tests` for C++ tests
-   - Run `make run_matlab_octave_tests` for Octave/MATLAB tests
+   - Run `make run_octave_tests` for Octave tests
    - Verify CI passes on all platforms (Ubuntu, macOS)
 
 2. **Documentation**: Ensure documentation builds successfully:
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Homogeneous-Dirichlet.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Homogeneous-Dirichlet.md
index 421bb21d3..414e10f6f 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Homogeneous-Dirichlet.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Homogeneous-Dirichlet.md
@@ -40,15 +40,15 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/elliptic1DHomogeneousDirichlet.cpp)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Dirichlet-Right-Robin.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Dirichlet-Right-Robin.md
index 882b3a91f..9aef76049 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Dirichlet-Right-Robin.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Dirichlet-Right-Robin.md
@@ -46,14 +46,14 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Dirichlet.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Dirichlet.md
index 426ca5841..4fc07b6b7 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Dirichlet.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Dirichlet.md
@@ -43,15 +43,15 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/elliptic1DLeftNeumannRightDirichlet.cpp)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Neumann.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Neumann.md
index e0511bba1..8b923d913 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Neumann.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Neumann.md
@@ -46,15 +46,15 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/elliptic1DLeftNeumannRightNeumann.cpp)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Robin.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Robin.md
index 40d9dc997..32b689701 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Robin.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Neumann-Right-Robin.md
@@ -49,14 +49,14 @@ The example is taken from [this paper](https://www.scirp.org/journal/paperinform
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Robin-Right-Robin.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Robin-Right-Robin.md
index a699dfd81..b5b37f785 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Robin-Right-Robin.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Left-Robin-Right-Robin.md
@@ -48,14 +48,14 @@ The example is taken from [this paper](https://www.scirp.org/journal/paperinform
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNRobinRightRobin.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNRobinRightRobin.m)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Homogeneous-Dirichlet.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Homogeneous-Dirichlet.md
index a44a8551a..f924cd90d 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Homogeneous-Dirichlet.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Homogeneous-Dirichlet.md
@@ -40,15 +40,15 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/elliptic1DNonHomogeneousDirichlet.cpp)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Periodic-BC.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Periodic-BC.md
index 34b05660d..06bc10ff6 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Periodic-BC.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Non-Periodic-BC.md
@@ -2,7 +2,7 @@
 
 Solves the 1D Poisson equation with homogeneous non-periodic Dirichlet boundary conditions.
 
-( This is the same as [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m) example )
+( This is the same as [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m) example )
 
 $$
 -\nabla^2 u(x) = 1
@@ -43,14 +43,14 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Periodic-BC.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Periodic-BC.md
index 421ebb9ec..11c0870a9 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Periodic-BC.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D-Periodic-BC.md
@@ -32,14 +32,14 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D.md b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D.md
index 0b9a34051..2c7827ca2 100644
--- a/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D.md
+++ b/doc/sphinx/source/examples/Elliptic/1D/Elliptic1D.md
@@ -27,16 +27,16 @@ This corresponds to the call to robinBC1D of `robinBC1D(k, m, dx, a, b)`.
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/elliptic1D.cpp)
 
 Additional Octave variants of this example with different boundary conditions:
-- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m)
-- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m)
-- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m)
-- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m)
-- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m)
-- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m)
-- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m)
-- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DPeriodicBC.m)
-- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1DNonPeriodicBC.m)
+- [Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DHomogeneousDirichlet.m)
+- [Non-Homogeneous Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonHomogeneousDirichlet.m)
+- [Left Neumann, Right Dirichlet](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightDirichlet.m)
+- [Left Dirichlet, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftDirichletRightRobin.m)
+- [Left Neumann, Right Neumann](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightNeumann.m)
+- [Left Neumann, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftNeumannRightRobin.m)
+- [Left Robin, Right Robin](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DLeftRobinRightRobin.m)
+- [Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DPeriodicBC.m)
+- [Non-Periodic Boundary Conditions](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1DNonPeriodicBC.m)
diff --git a/doc/sphinx/source/examples/Hyperbolic/1D/Burgers1D.md b/doc/sphinx/source/examples/Hyperbolic/1D/Burgers1D.md
index 0dbf93664..2085a42e9 100644
--- a/doc/sphinx/source/examples/Hyperbolic/1D/Burgers1D.md
+++ b/doc/sphinx/source/examples/Hyperbolic/1D/Burgers1D.md
@@ -17,5 +17,5 @@ The wave is allowed to propagate across the domain while the area under the curv
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/burgers1D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/burgers1D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/burgers1D.cpp) 
diff --git a/doc/sphinx/source/examples/Hyperbolic/1D/Hyperbolic1D.md b/doc/sphinx/source/examples/Hyperbolic/1D/Hyperbolic1D.md
index 4fbd152e6..b52396e13 100644
--- a/doc/sphinx/source/examples/Hyperbolic/1D/Hyperbolic1D.md
+++ b/doc/sphinx/source/examples/Hyperbolic/1D/Hyperbolic1D.md
@@ -41,8 +41,8 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/hyperbolic1D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/hyperbolic1D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/hyperbolic1D.cpp)
 Additional Octave variants:
-- [Upwind Scheme](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/hyperbolic1D_upwind.m)
-- [Lax-Friedrichs Scheme](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/hyperbolic1D_lax_friedrichs.m)
+- [Upwind Scheme](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/hyperbolic1D_upwind.m)
+- [Lax-Friedrichs Scheme](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/hyperbolic1D_lax_friedrichs.m)
diff --git a/doc/sphinx/source/examples/Hyperbolic/1D/Wave-1D.md b/doc/sphinx/source/examples/Hyperbolic/1D/Wave-1D.md
index 5403b8461..4a1064838 100644
--- a/doc/sphinx/source/examples/Hyperbolic/1D/Wave-1D.md
+++ b/doc/sphinx/source/examples/Hyperbolic/1D/Wave-1D.md
@@ -19,8 +19,8 @@ $$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/wave1D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/wave1D.m)
 
 Additional Octave variants:
-- [Wave 1D Case 2](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/wave1D_case2.m)
-- [Wave 1D with Time-Varying BC](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/wave1DTimeVaryingBC.m)
+- [Wave 1D Case 2](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/wave1D_case2.m)
+- [Wave 1D with Time-Varying BC](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/wave1DTimeVaryingBC.m)
diff --git a/doc/sphinx/source/examples/Integration/Integration1D.md b/doc/sphinx/source/examples/Integration/Integration1D.md
index cd5f83f71..f82ae4c1b 100644
--- a/doc/sphinx/source/examples/Integration/Integration1D.md
+++ b/doc/sphinx/source/examples/Integration/Integration1D.md
@@ -92,4 +92,4 @@ $$
 
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/integration1D.m)
\ No newline at end of file
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/integration1D.m)
\ No newline at end of file
diff --git a/doc/sphinx/source/examples/Mixed/3D/Convection-Diffusion.md b/doc/sphinx/source/examples/Mixed/3D/Convection-Diffusion.md
index 483e5ac30..24438693f 100644
--- a/doc/sphinx/source/examples/Mixed/3D/Convection-Diffusion.md
+++ b/doc/sphinx/source/examples/Mixed/3D/Convection-Diffusion.md
@@ -42,7 +42,7 @@ Time step constraints include:
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/convection_diffusion3D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/convection_diffusion3D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/convection_diffusion3D.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Navier-Stokes/Lock-Exchange.md b/doc/sphinx/source/examples/Navier-Stokes/Lock-Exchange.md
index 4afe3d2d5..c84ca742c 100644
--- a/doc/sphinx/source/examples/Navier-Stokes/Lock-Exchange.md
+++ b/doc/sphinx/source/examples/Navier-Stokes/Lock-Exchange.md
@@ -43,7 +43,7 @@ Spatial discretization uses mimetic operators:
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/lock_exchange.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/lock_exchange.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/lock_exchange.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Parabolic/1D/Parabolic1D.md b/doc/sphinx/source/examples/Parabolic/1D/Parabolic1D.md
index 7976fde62..d9eb4df39 100644
--- a/doc/sphinx/source/examples/Parabolic/1D/Parabolic1D.md
+++ b/doc/sphinx/source/examples/Parabolic/1D/Parabolic1D.md
@@ -26,7 +26,7 @@ $$\Delta t \leq \frac{\Delta x^2}{3\alpha}$$
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/parabolic1D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/parabolic1D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/parabolic1D.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Parabolic/1D/Terzaghi1D.md b/doc/sphinx/source/examples/Parabolic/1D/Terzaghi1D.md
index 9dd0aa2b1..fff13d0e5 100644
--- a/doc/sphinx/source/examples/Parabolic/1D/Terzaghi1D.md
+++ b/doc/sphinx/source/examples/Parabolic/1D/Terzaghi1D.md
@@ -70,4 +70,4 @@ At selected time snapshots (1, 10, 40, 70 hours), the following are printed and
 #### Code Location
 
 This example is implemented in:  
-- [Octave (terzaghi1D.m)](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/terzaghi1D.m)
+- [Octave (terzaghi1D.m)](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/terzaghi1D.m)
diff --git a/doc/sphinx/source/examples/Parabolic/2D/Parabolic2D.md b/doc/sphinx/source/examples/Parabolic/2D/Parabolic2D.md
index a91a4bd7d..8bb6e03f1 100644
--- a/doc/sphinx/source/examples/Parabolic/2D/Parabolic2D.md
+++ b/doc/sphinx/source/examples/Parabolic/2D/Parabolic2D.md
@@ -37,7 +37,7 @@ The explicit scheme requires a sufficiently small time step for stability.
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/parabolic2D.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/parabolic2D.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/parabolic2D.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Bessel.md b/doc/sphinx/source/examples/Sturm-Liouville/Bessel.md
index fd4db341f..bd23e461a 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Bessel.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Bessel.md
@@ -44,7 +44,7 @@ Boundary conditions are applied using `RobinBC`.
 
 This example is implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleBessel.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleBessel.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleBessel.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Chebyshev.md b/doc/sphinx/source/examples/Sturm-Liouville/Chebyshev.md
index a19d6cb58..b653aafa9 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Chebyshev.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Chebyshev.md
@@ -44,7 +44,7 @@ Boundary conditions are applied using the `addScalarBC1D` function.
 
 This example is implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleChebyshev.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleChebyshev.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleChebyshev.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Helmholtz.md b/doc/sphinx/source/examples/Sturm-Liouville/Helmholtz.md
index 357c7cf89..f4ee02709 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Helmholtz.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Helmholtz.md
@@ -46,12 +46,12 @@ Boundary conditions are applied using `RobinBC` or `MixedBC`.
 
 These examples are implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletDirichlet.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleHelmholtzDirichletDirichlet.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleHelmholtzDirichletDirichlet.cpp)
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletRobin.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleHelmholtzDirichletRobin.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleHelmholtzDirichletRobin.cpp)
 Additional Octave and C++ variant:
-- [Octave Wifi](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/helmholtz2D_wifi.m)
+- [Octave Wifi](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/helmholtz2D_wifi.m)
 - [C++ Wifi](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/helmholtz2D_wifi.cpp)
 ## Results
 
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Hermite.md b/doc/sphinx/source/examples/Sturm-Liouville/Hermite.md
index 67735e432..97952a562 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Hermite.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Hermite.md
@@ -44,7 +44,7 @@ Boundary conditions are applied using `RobinBC`.
 
 This example is implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleHermite.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleHermite.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleHermite.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Laguerre.md b/doc/sphinx/source/examples/Sturm-Liouville/Laguerre.md
index 2598707c0..e6f322ca2 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Laguerre.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Laguerre.md
@@ -44,7 +44,7 @@ Boundary conditions are applied using `RobinBC`.
 
 This example is implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleLaguerre.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleLaguerre.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleLaguerre.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Sturm-Liouville/Legendre.md b/doc/sphinx/source/examples/Sturm-Liouville/Legendre.md
index 84006bd70..5cb670a85 100644
--- a/doc/sphinx/source/examples/Sturm-Liouville/Legendre.md
+++ b/doc/sphinx/source/examples/Sturm-Liouville/Legendre.md
@@ -44,7 +44,7 @@ Boundary conditions are applied using `RobinBC`.
 
 This example is implemented in:
 
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/sturmLiouvilleLegendre.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/sturmLiouvilleLegendre.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/sturmLiouvilleLegendre.cpp)
 
 ## Results
diff --git a/doc/sphinx/source/examples/Time-Integrators/RK2.md b/doc/sphinx/source/examples/Time-Integrators/RK2.md
index 07516f0c2..e6d434926 100644
--- a/doc/sphinx/source/examples/Time-Integrators/RK2.md
+++ b/doc/sphinx/source/examples/Time-Integrators/RK2.md
@@ -36,7 +36,7 @@ where:
 - $y_i$ is the solution at time $t_i$
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/RK2.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/RK2.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/RK2.cpp)
 
 Both implementations include visualization of the solution using plotting tools (Octave's built-in plot function and GNUplot for C++). 
diff --git a/doc/sphinx/source/examples/Time-Integrators/RK4.md b/doc/sphinx/source/examples/Time-Integrators/RK4.md
index d861987ad..289f4b77f 100644
--- a/doc/sphinx/source/examples/Time-Integrators/RK4.md
+++ b/doc/sphinx/source/examples/Time-Integrators/RK4.md
@@ -36,7 +36,7 @@ $$y(t) = y_0 \exp\left(\int_0^t \sin^2(s) ds\right) = y_0 \exp\left(\frac{t}{2}
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/RK4.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/RK4.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/RK4.cpp)
 
 ## Properties of RK4
diff --git a/doc/sphinx/source/examples/Time-Integrators/backward_euler.md b/doc/sphinx/source/examples/Time-Integrators/backward_euler.md
index 8a728d018..907a6efc7 100644
--- a/doc/sphinx/source/examples/Time-Integrators/backward_euler.md
+++ b/doc/sphinx/source/examples/Time-Integrators/backward_euler.md
@@ -41,5 +41,5 @@ In the C++ example, we used the fixed-point iteration method for rootfinding due
 ---
 
 This example is implemented in:
-- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/backward_euler.m)
+- [Octave](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/backward_euler.m)
 - [C++](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/backward_euler.cpp)
diff --git a/doc/sphinx/source/examples/index.md b/doc/sphinx/source/examples/index.md
index a9cb16320..2c9fe53e9 100644
--- a/doc/sphinx/source/examples/index.md
+++ b/doc/sphinx/source/examples/index.md
@@ -2,7 +2,7 @@
 
 The MOLE library contains many examples written in Octave and C++. These examples span a broad range of partial differential equations (PDEs). Below are more technical explanations of the examples included in the library.
 
-**NOTE**: The name for both Octave and C++ will be the same. The files `elliptic1D.m` and `elliptic1D.cpp` solve the same differential equation explained here under Elliptic1D. There are many more Octave examples, so if you cannot find a C++ example, it is only in `examples/matlab_octave/`.
+**NOTE**: The name for both Octave and C++ will be the same. The files `elliptic1D.m` and `elliptic1D.cpp` solve the same differential equation explained here under Elliptic1D. There are many more Octave examples, so if you cannot find a C++ example, it is only in `examples/octave/`.
 
 ```{toctree}
 :maxdepth: 1
diff --git a/doc/sphinx/source/index.md b/doc/sphinx/source/index.md
index 56aa44b03..6b98032fb 100644
--- a/doc/sphinx/source/index.md
+++ b/doc/sphinx/source/index.md
@@ -24,7 +24,7 @@ Documentation Guide <intros/doc_readme_wrapper>
 :name: api-nav
 
 api/cpp/index
-api/matlab_octave/index-beta
+api/octave/index-beta
 api/julia/index
 ```
 
diff --git a/doc/sphinx/source/intros/gettingstarted.md b/doc/sphinx/source/intros/gettingstarted.md
index 37775a31f..09c989c64 100644
--- a/doc/sphinx/source/intros/gettingstarted.md
+++ b/doc/sphinx/source/intros/gettingstarted.md
@@ -73,7 +73,7 @@ int main() {
 ```matlab
 % elliptic1D.m - 1D Poisson's equation with Robin boundary conditions
 
-addpath('../../src/matlab_octave')
+addpath('../../src/octave')
 
 west = 0;  % Domain's limits
 east = 1;
@@ -110,12 +110,12 @@ plot(grid, exp(grid))
 
 For full examples, see:
 - C++: [transport1D.cpp](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp/transport1D.cpp)
-- Octave: [elliptic1D.m](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/elliptic1D.m)
+- Octave: [elliptic1D.m](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/elliptic1D.m)
 
 ## Next Steps
 
 - Check out more C++ examples in the [examples/cpp/](https://github.com/csrc-sdsu/mole/blob/main/examples/cpp) directory
-- Explore the Octave examples in the [examples/matlab_octave/](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave) directory
+- Explore the Octave examples in the [examples/octave/](https://github.com/csrc-sdsu/mole/blob/main/examples/octave) directory
 - Join our community and [contribute](https://github.com/csrc-sdsu/mole/blob/main/CONTRIBUTING.md)
 
 ```{include} ../../../../README.md
diff --git a/doc/sphinx/source/math_functions/IntegrationByParts.md b/doc/sphinx/source/math_functions/IntegrationByParts.md
index 9f4a4e11d..0e3f71c1b 100644
--- a/doc/sphinx/source/math_functions/IntegrationByParts.md
+++ b/doc/sphinx/source/math_functions/IntegrationByParts.md
@@ -61,4 +61,4 @@ $$
   (D u_h)^{T} Q\, q_h = -\, u_h^{T} P\, (G q_h)
 $$
 
-The example [integration1D.m](https://github.com/csrc-sdsu/mole/blob/main/examples/matlab_octave/integration1D.m) illustrates how the weight matrix $Q$ can be used to approximate the integral of a Ricker wavelet.
\ No newline at end of file
+The example [integration1D.m](https://github.com/csrc-sdsu/mole/blob/main/examples/octave/integration1D.m) illustrates how the weight matrix $Q$ can be used to approximate the integral of a Ricker wavelet.
\ No newline at end of file
diff --git a/examples/README.md b/examples/README.md
index 6e0a9be9b..3e58d50d7 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -5,7 +5,7 @@ This directory contains examples demonstrating how to use MOLE for various appli
 ## Directory Structure
 
 - `cpp/` - C++ examples demonstrating MOLE's C++ API
-- `matlab_octave/` - MATLAB/Octave examples showing how to use MOLE in MATLAB/Octave
+- `octave/` - GNU Octave examples showing how to use MOLE in Octave (Fully compatible with MATLAB)
   - `compact_operators/` - Examples of compact form operators
 
 Each example is self-contained and demonstrates different aspects of the MOLE library.
diff --git a/examples/cpp/elliptic1DLeftNeumannRightDirichlet.cpp b/examples/cpp/elliptic1DLeftNeumannRightDirichlet.cpp
index 2a7c983d7..8fc15fa0a 100644
--- a/examples/cpp/elliptic1DLeftNeumannRightDirichlet.cpp
+++ b/examples/cpp/elliptic1DLeftNeumannRightDirichlet.cpp
@@ -16,7 +16,7 @@
  * - Solving the resulting linear system
  * - Computing solution error
  *
- * Based on MATLAB example: elliptic1DLeftNeumannRightDirichlet.m
+ * Based on Octave example: elliptic1DLeftNeumannRightDirichlet.m
  */
 
 #include "mole.h"
diff --git a/examples/cpp/elliptic2D.cpp b/examples/cpp/elliptic2D.cpp
index 07752cd5f..d2fdc56e0 100644
--- a/examples/cpp/elliptic2D.cpp
+++ b/examples/cpp/elliptic2D.cpp
@@ -1,6 +1,6 @@
 /**
  * This example uses MOLE to solve a 2D BVP
- * It is the equivalent to examples_MATLAB/minimal_poisson2D.m
+ * It is the equivalent to examples_Octave/minimal_poisson2D.m
  * The output can be plotted via:
  * gnuplot> plot 'solution' matrix with image
  */
diff --git a/examples/cpp/elliptic2D_x_dirichlet_y_dirichlet.cpp b/examples/cpp/elliptic2D_x_dirichlet_y_dirichlet.cpp
index c6e0d668b..0e10e723a 100644
--- a/examples/cpp/elliptic2D_x_dirichlet_y_dirichlet.cpp
+++ b/examples/cpp/elliptic2D_x_dirichlet_y_dirichlet.cpp
@@ -18,7 +18,7 @@
  * - Solving the resulting linear system
  * - Computing solution error
  *
- * Based on MATLAB example: elliptic2DXDirichletYDirichlet.m
+ * Based on Octave example: elliptic2DXDirichletYDirichlet.m
  */
 
 #include "mole.h"
@@ -180,7 +180,7 @@ int main() {
     cout << endl;
 
     cout << "Note: For visualization of the solution, export the data to" << endl;
-    cout << "      a file and use tools like ParaView, VisIt, or MATLAB/Python." << endl;
+    cout << "      a file and use tools like ParaView, VisIt, or Octave/Python." << endl;
     cout << endl;
 
     return 0;
diff --git a/examples/cpp/hyperbolic1D.cpp b/examples/cpp/hyperbolic1D.cpp
index 6d7cad776..bc3e2eb82 100644
--- a/examples/cpp/hyperbolic1D.cpp
+++ b/examples/cpp/hyperbolic1D.cpp
@@ -33,7 +33,7 @@
  *
  *      -a*dt*2*D*I
  *
- *   matching the MATLAB staggered-grid structure.
+ *   matching the Octave staggered-grid structure.
  *
  * Time Integration:
  *   One startup step is computed using Explicit Euler, then the solution
diff --git a/examples/cpp/lock_exchange.cpp b/examples/cpp/lock_exchange.cpp
index 0d633ebbf..1047fc96c 100644
--- a/examples/cpp/lock_exchange.cpp
+++ b/examples/cpp/lock_exchange.cpp
@@ -161,7 +161,7 @@ int main() {
 
     // -- Pressure Solve --
     // Flatten the predicted velocities into vectors.
-    // Use transpose to match MATLAB's column-major order during vectorization
+    // Use transpose to match GNU Octave's column-major order during vectorization
     vec u_vec = vectorise(u_star.t());
     vec v_vec = vectorise(v_star.t());
     vec R = (rho_middle / dt) * join_cols(u_vec, v_vec);
@@ -182,7 +182,7 @@ int main() {
     p = reshape(p_vec, m + 2, n + 2).t();
 
     // -- Corrector Step --
-    // Update velocities by adding the pressure gradient, similar to MATLAB's u
+    // Update velocities by adding the pressure gradient, similar to GNU Octave's u
     // = u_s+G(1:u_length, :)*p;
     int tot_u = u_vec.n_elem;
     vec p_grad = G * p_vec;
diff --git a/examples/cpp/poisson_2D_dirichlet.cpp b/examples/cpp/poisson_2D_dirichlet.cpp
index 406cdcfd2..5485fc7be 100644
--- a/examples/cpp/poisson_2D_dirichlet.cpp
+++ b/examples/cpp/poisson_2D_dirichlet.cpp
@@ -10,7 +10,7 @@
  * This example demonstrates how to use addScalarBC to apply
  * Dirichlet boundary conditions to a discrete Laplacian operator.
  *
- * Based on MATLAB example: elliptic2D.m
+ * Based on Octave example: elliptic2D.m
  */
 
 #include "mole.h"
@@ -125,7 +125,7 @@ int main() {
     cout << endl;
 
     cout << "To visualize the solution, export the data and use" << endl;
-    cout << "tools like ParaView, VisIt, or MATLAB/Python." << endl;
+    cout << "tools like ParaView, VisIt, or Octave/Python." << endl;
     cout << endl;
 
     return 0;
diff --git a/examples/cpp/wave1D_convergence.cpp b/examples/cpp/wave1D_convergence.cpp
index 346e6bd71..6b01a53d3 100644
--- a/examples/cpp/wave1D_convergence.cpp
+++ b/examples/cpp/wave1D_convergence.cpp
@@ -6,7 +6,7 @@
  *
  * Reference:
  * Problem based on "Example 10.1" from:
- * Mathews, J. H., & Fink, K. D. (2004). Numerical methods using MATLAB (4th ed.).
+ * Mathews, J. H., & Fink, K. D. (2004). Numerical methods using Octave (4th ed.).
  * Pearson Prentice Hall.
  *
  * Context:
diff --git a/examples/matlab_octave/Compact_operators/README.md b/examples/octave/Compact_operators/README.md
similarity index 91%
rename from examples/matlab_octave/Compact_operators/README.md
rename to examples/octave/Compact_operators/README.md
index aa4284dd7..70be1bfc4 100644
--- a/examples/matlab_octave/Compact_operators/README.md
+++ b/examples/octave/Compact_operators/README.md
@@ -1,3 +1,3 @@
-# MATLAB/Octave Compact Operators
+# GNU Octave Compact Operators
 
 Mimetic operators of order greater than two can be represented in a _compact form_ by factorizing the original matrices. By doing this, we can attain higher orders of accuracy using the minimal stencil. For example, in this [article](https://doi.org/10.1016/j.cam.2015.01.040) the authors used compact representations for a problem of acoustic wave propagation.
diff --git a/examples/matlab_octave/Compact_operators/compact.m b/examples/octave/Compact_operators/compact.m
similarity index 95%
rename from examples/matlab_octave/Compact_operators/compact.m
rename to examples/octave/Compact_operators/compact.m
index 87c9f925e..77633860d 100644
--- a/examples/matlab_octave/Compact_operators/compact.m
+++ b/examples/octave/Compact_operators/compact.m
@@ -9,7 +9,7 @@
 close all
 format rat
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 k = 4;
 m = 2*k+1;
diff --git a/examples/matlab_octave/KG_product.m b/examples/octave/KG_product.m
similarity index 86%
rename from examples/matlab_octave/KG_product.m
rename to examples/octave/KG_product.m
index 4d5cc7ad9..10842541a 100644
--- a/examples/matlab_octave/KG_product.m
+++ b/examples/octave/KG_product.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;
diff --git a/examples/matlab_octave/RK2.m b/examples/octave/RK2.m
similarity index 100%
rename from examples/matlab_octave/RK2.m
rename to examples/octave/RK2.m
diff --git a/examples/matlab_octave/RK4.m b/examples/octave/RK4.m
similarity index 100%
rename from examples/matlab_octave/RK4.m
rename to examples/octave/RK4.m
diff --git a/examples/matlab_octave/backward_euler.m b/examples/octave/backward_euler.m
similarity index 100%
rename from examples/matlab_octave/backward_euler.m
rename to examples/octave/backward_euler.m
diff --git a/examples/matlab_octave/burgers1D.m b/examples/octave/burgers1D.m
similarity index 95%
rename from examples/matlab_octave/burgers1D.m
rename to examples/octave/burgers1D.m
index f9ba6315a..03fd9da20 100644
--- a/examples/matlab_octave/burgers1D.m
+++ b/examples/octave/burgers1D.m
@@ -5,7 +5,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 west = -15; % Domain's limits
 east = 15;
diff --git a/examples/matlab_octave/convection_diffusion3D.m b/examples/octave/convection_diffusion3D.m
similarity index 98%
rename from examples/matlab_octave/convection_diffusion3D.m
rename to examples/octave/convection_diffusion3D.m
index ce2f58d5f..88a443190 100644
--- a/examples/matlab_octave/convection_diffusion3D.m
+++ b/examples/octave/convection_diffusion3D.m
@@ -4,7 +4,7 @@
 close all
 format short
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Mimetic operator's parameters
 k = 2;
diff --git a/examples/matlab_octave/curvConvergenceTest.m b/examples/octave/curvConvergenceTest.m
similarity index 98%
rename from examples/matlab_octave/curvConvergenceTest.m
rename to examples/octave/curvConvergenceTest.m
index 8e759b5b1..ff8734a57 100644
--- a/examples/matlab_octave/curvConvergenceTest.m
+++ b/examples/octave/curvConvergenceTest.m
@@ -20,7 +20,7 @@
 % 
 % Current Implementation:
 %   - Nodal Jacobian derivatives
-%   - MATLAB interpolation (2nd order)
+%   - Octave interpolation (2nd order) - (compatible wwith MATLAB)
 %   - Hard to understand implementation (DI2 and GI2 functions: It is 
 %       obvious what they are doing, but not how they are doing it.)
 %   - Cannot handle periodic domains
diff --git a/examples/matlab_octave/cylinder_flow_2D.m b/examples/octave/cylinder_flow_2D.m
similarity index 98%
rename from examples/matlab_octave/cylinder_flow_2D.m
rename to examples/octave/cylinder_flow_2D.m
index 3a3d53772..26e0972a0 100644
--- a/examples/matlab_octave/cylinder_flow_2D.m
+++ b/examples/octave/cylinder_flow_2D.m
@@ -75,7 +75,7 @@
 %
 % Notes:
 %
-%   - Although motivated by flow past a cylinder, the present MATLAB
+%   - Although motivated by flow past a cylinder, the present GNU Octave
 %     implementation uses a masked block of cells, not a fitted circular
 %     boundary.
 %   - The purpose of this example is to demonstrate how MOLE mimetic
@@ -83,7 +83,7 @@
 %     transient incompressible flow solver in a compact way.
 
 close all; clear; clc;
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 %% Settings (match C++)
 Re    = 200;     % C++: 200
diff --git a/examples/matlab_octave/elliptic1D.m b/examples/octave/elliptic1D.m
similarity index 94%
rename from examples/matlab_octave/elliptic1D.m
rename to examples/octave/elliptic1D.m
index ae63dac18..d7432ba38 100644
--- a/examples/matlab_octave/elliptic1D.m
+++ b/examples/octave/elliptic1D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 west = 0;  % Domain's limits
 east = 1;
diff --git a/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m b/examples/octave/elliptic1DHomogeneousDirichlet.m
similarity index 94%
rename from examples/matlab_octave/elliptic1DHomogeneousDirichlet.m
rename to examples/octave/elliptic1DHomogeneousDirichlet.m
index 6f77e2490..083ec8c39 100755
--- a/examples/matlab_octave/elliptic1DHomogeneousDirichlet.m
+++ b/examples/octave/elliptic1DHomogeneousDirichlet.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 1;
diff --git a/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m b/examples/octave/elliptic1DLeftDirichletRightRobin.m
similarity index 95%
rename from examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m
rename to examples/octave/elliptic1DLeftDirichletRightRobin.m
index 1608a1f1b..9c4d25db3 100755
--- a/examples/matlab_octave/elliptic1DLeftDirichletRightRobin.m
+++ b/examples/octave/elliptic1DLeftDirichletRightRobin.m
@@ -13,7 +13,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 7;
diff --git a/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m b/examples/octave/elliptic1DLeftNeumannRightDirichlet.m
similarity index 94%
rename from examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m
rename to examples/octave/elliptic1DLeftNeumannRightDirichlet.m
index 378488089..e2cc7f255 100755
--- a/examples/matlab_octave/elliptic1DLeftNeumannRightDirichlet.m
+++ b/examples/octave/elliptic1DLeftNeumannRightDirichlet.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 3;
diff --git a/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m b/examples/octave/elliptic1DLeftNeumannRightNeumann.m
similarity index 95%
rename from examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m
rename to examples/octave/elliptic1DLeftNeumannRightNeumann.m
index 44f8d6255..756e74bff 100755
--- a/examples/matlab_octave/elliptic1DLeftNeumannRightNeumann.m
+++ b/examples/octave/elliptic1DLeftNeumannRightNeumann.m
@@ -9,7 +9,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 4;
diff --git a/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m b/examples/octave/elliptic1DLeftNeumannRightRobin.m
similarity index 96%
rename from examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m
rename to examples/octave/elliptic1DLeftNeumannRightRobin.m
index 5f2353801..dc50d7cdd 100755
--- a/examples/matlab_octave/elliptic1DLeftNeumannRightRobin.m
+++ b/examples/octave/elliptic1DLeftNeumannRightRobin.m
@@ -13,7 +13,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 8;
diff --git a/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m b/examples/octave/elliptic1DLeftRobinRightRobin.m
similarity index 96%
rename from examples/matlab_octave/elliptic1DLeftRobinRightRobin.m
rename to examples/octave/elliptic1DLeftRobinRightRobin.m
index b7c4b1bed..2cb87317b 100755
--- a/examples/matlab_octave/elliptic1DLeftRobinRightRobin.m
+++ b/examples/octave/elliptic1DLeftRobinRightRobin.m
@@ -15,7 +15,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 6;
diff --git a/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m b/examples/octave/elliptic1DNonHomogeneousDirichlet.m
similarity index 94%
rename from examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m
rename to examples/octave/elliptic1DNonHomogeneousDirichlet.m
index 0574dbc99..b015f8374 100755
--- a/examples/matlab_octave/elliptic1DNonHomogeneousDirichlet.m
+++ b/examples/octave/elliptic1DNonHomogeneousDirichlet.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic1DNonPeriodicBC.m b/examples/octave/elliptic1DNonPeriodicBC.m
similarity index 94%
rename from examples/matlab_octave/elliptic1DNonPeriodicBC.m
rename to examples/octave/elliptic1DNonPeriodicBC.m
index 34e263ae4..f698ea9be 100755
--- a/examples/matlab_octave/elliptic1DNonPeriodicBC.m
+++ b/examples/octave/elliptic1DNonPeriodicBC.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 1;
diff --git a/examples/matlab_octave/elliptic1DPeriodicBC.m b/examples/octave/elliptic1DPeriodicBC.m
similarity index 95%
rename from examples/matlab_octave/elliptic1DPeriodicBC.m
rename to examples/octave/elliptic1DPeriodicBC.m
index 9caa0aeaa..a7a8c1aff 100755
--- a/examples/matlab_octave/elliptic1DPeriodicBC.m
+++ b/examples/octave/elliptic1DPeriodicBC.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 5;
diff --git a/examples/matlab_octave/elliptic2D.m b/examples/octave/elliptic2D.m
similarity index 98%
rename from examples/matlab_octave/elliptic2D.m
rename to examples/octave/elliptic2D.m
index 453ee0c9d..9a6c23fb5 100644
--- a/examples/matlab_octave/elliptic2D.m
+++ b/examples/octave/elliptic2D.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;
diff --git a/examples/matlab_octave/elliptic2DCurvPeriodic.m b/examples/octave/elliptic2DCurvPeriodic.m
similarity index 97%
rename from examples/matlab_octave/elliptic2DCurvPeriodic.m
rename to examples/octave/elliptic2DCurvPeriodic.m
index 5b43ebbf5..3280e9f25 100644
--- a/examples/matlab_octave/elliptic2DCurvPeriodic.m
+++ b/examples/octave/elliptic2DCurvPeriodic.m
@@ -1,5 +1,5 @@
 clear; clc; close all;
-addpath("../../src/matlab_octave/")
+addpath("../../src/octave/")
 % 
 % ∆u = 0
 % 
diff --git a/examples/matlab_octave/elliptic2DPeriodic.m b/examples/octave/elliptic2DPeriodic.m
similarity index 96%
rename from examples/matlab_octave/elliptic2DPeriodic.m
rename to examples/octave/elliptic2DPeriodic.m
index 32536da5d..0a020987f 100755
--- a/examples/matlab_octave/elliptic2DPeriodic.m
+++ b/examples/octave/elliptic2DPeriodic.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic2DXDirichletYDirichlet.m b/examples/octave/elliptic2DXDirichletYDirichlet.m
similarity index 97%
rename from examples/matlab_octave/elliptic2DXDirichletYDirichlet.m
rename to examples/octave/elliptic2DXDirichletYDirichlet.m
index 5534f2ae8..0624d3fdb 100755
--- a/examples/matlab_octave/elliptic2DXDirichletYDirichlet.m
+++ b/examples/octave/elliptic2DXDirichletYDirichlet.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 1;
diff --git a/examples/matlab_octave/elliptic2DXPerYDirichlet.m b/examples/octave/elliptic2DXPerYDirichlet.m
similarity index 96%
rename from examples/matlab_octave/elliptic2DXPerYDirichlet.m
rename to examples/octave/elliptic2DXPerYDirichlet.m
index 4388b7cf9..c0980146b 100755
--- a/examples/matlab_octave/elliptic2DXPerYDirichlet.m
+++ b/examples/octave/elliptic2DXPerYDirichlet.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 5;
diff --git a/examples/matlab_octave/elliptic2DXPeriodicYPeriodic.m b/examples/octave/elliptic2DXPeriodicYPeriodic.m
similarity index 96%
rename from examples/matlab_octave/elliptic2DXPeriodicYPeriodic.m
rename to examples/octave/elliptic2DXPeriodicYPeriodic.m
index b63800190..e921a34ad 100755
--- a/examples/matlab_octave/elliptic2DXPeriodicYPeriodic.m
+++ b/examples/octave/elliptic2DXPeriodicYPeriodic.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 
diff --git a/examples/matlab_octave/elliptic2D_case2.m b/examples/octave/elliptic2D_case2.m
similarity index 98%
rename from examples/matlab_octave/elliptic2D_case2.m
rename to examples/octave/elliptic2D_case2.m
index f52a9ffd7..5b1f49066 100644
--- a/examples/matlab_octave/elliptic2D_case2.m
+++ b/examples/octave/elliptic2D_case2.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 e = 1; % Controls "rectangularity" of the grid, e = 0 -> completely rectangular
diff --git a/examples/matlab_octave/elliptic2D_nodal_curv.m b/examples/octave/elliptic2D_nodal_curv.m
similarity index 96%
rename from examples/matlab_octave/elliptic2D_nodal_curv.m
rename to examples/octave/elliptic2D_nodal_curv.m
index 4a6a1fd48..9befe12b9 100644
--- a/examples/matlab_octave/elliptic2D_nodal_curv.m
+++ b/examples/octave/elliptic2D_nodal_curv.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;
diff --git a/examples/matlab_octave/elliptic2D_nodal_curv_sinusoidal.m b/examples/octave/elliptic2D_nodal_curv_sinusoidal.m
similarity index 96%
rename from examples/matlab_octave/elliptic2D_nodal_curv_sinusoidal.m
rename to examples/octave/elliptic2D_nodal_curv_sinusoidal.m
index 73fc94bcb..7c6728de7 100644
--- a/examples/matlab_octave/elliptic2D_nodal_curv_sinusoidal.m
+++ b/examples/octave/elliptic2D_nodal_curv_sinusoidal.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 e = 1; % Controls "rectangularity" of the grid, e = 0 -> completely rectangular
diff --git a/examples/matlab_octave/elliptic3D.m b/examples/octave/elliptic3D.m
similarity index 93%
rename from examples/matlab_octave/elliptic3D.m
rename to examples/octave/elliptic3D.m
index c661c84af..05355c81a 100644
--- a/examples/matlab_octave/elliptic3D.m
+++ b/examples/octave/elliptic3D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 k = 2; % Order of accuracy
 m = 5; % -> 7
diff --git a/examples/matlab_octave/elliptic3DXDirichletYDirichletZDirichlet.m b/examples/octave/elliptic3DXDirichletYDirichletZDirichlet.m
similarity index 98%
rename from examples/matlab_octave/elliptic3DXDirichletYDirichletZDirichlet.m
rename to examples/octave/elliptic3DXDirichletYDirichletZDirichlet.m
index 00224e273..c9f8d6f22 100755
--- a/examples/matlab_octave/elliptic3DXDirichletYDirichletZDirichlet.m
+++ b/examples/octave/elliptic3DXDirichletYDirichletZDirichlet.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 1;
diff --git a/examples/matlab_octave/elliptic3DXDirichletYPerZNeumann.m b/examples/octave/elliptic3DXDirichletYPerZNeumann.m
similarity index 98%
rename from examples/matlab_octave/elliptic3DXDirichletYPerZNeumann.m
rename to examples/octave/elliptic3DXDirichletYPerZNeumann.m
index 784a03df2..28368a5c4 100755
--- a/examples/matlab_octave/elliptic3DXDirichletYPerZNeumann.m
+++ b/examples/octave/elliptic3DXDirichletYPerZNeumann.m
@@ -8,7 +8,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic3DXDirichletYPerZPer.m b/examples/octave/elliptic3DXDirichletYPerZPer.m
similarity index 98%
rename from examples/matlab_octave/elliptic3DXDirichletYPerZPer.m
rename to examples/octave/elliptic3DXDirichletYPerZPer.m
index 0e9c614ef..2efb9cc35 100755
--- a/examples/matlab_octave/elliptic3DXDirichletYPerZPer.m
+++ b/examples/octave/elliptic3DXDirichletYPerZPer.m
@@ -9,7 +9,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic3DXDirichletYPeriodicZPeriodic.m b/examples/octave/elliptic3DXDirichletYPeriodicZPeriodic.m
similarity index 98%
rename from examples/matlab_octave/elliptic3DXDirichletYPeriodicZPeriodic.m
rename to examples/octave/elliptic3DXDirichletYPeriodicZPeriodic.m
index 23c5ac3af..ade35c9f0 100755
--- a/examples/matlab_octave/elliptic3DXDirichletYPeriodicZPeriodic.m
+++ b/examples/octave/elliptic3DXDirichletYPeriodicZPeriodic.m
@@ -9,7 +9,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic3DXNeumannYPeriodicZPeriodic.m b/examples/octave/elliptic3DXNeumannYPeriodicZPeriodic.m
similarity index 98%
rename from examples/matlab_octave/elliptic3DXNeumannYPeriodicZPeriodic.m
rename to examples/octave/elliptic3DXNeumannYPeriodicZPeriodic.m
index 8111ef73b..0cb462991 100755
--- a/examples/matlab_octave/elliptic3DXNeumannYPeriodicZPeriodic.m
+++ b/examples/octave/elliptic3DXNeumannYPeriodicZPeriodic.m
@@ -9,7 +9,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/elliptic3DaddScalarBC3D.m b/examples/octave/elliptic3DaddScalarBC3D.m
similarity index 95%
rename from examples/matlab_octave/elliptic3DaddScalarBC3D.m
rename to examples/octave/elliptic3DaddScalarBC3D.m
index 72d78d407..fc558bab2 100644
--- a/examples/matlab_octave/elliptic3DaddScalarBC3D.m
+++ b/examples/octave/elliptic3DaddScalarBC3D.m
@@ -5,7 +5,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 k = 2; % Order of accuracy
 m = 5; % -> 7
diff --git a/examples/matlab_octave/genCurvGrid.m b/examples/octave/genCurvGrid.m
similarity index 100%
rename from examples/matlab_octave/genCurvGrid.m
rename to examples/octave/genCurvGrid.m
diff --git a/examples/matlab_octave/helmholtz2D_wifi.m b/examples/octave/helmholtz2D_wifi.m
similarity index 97%
rename from examples/matlab_octave/helmholtz2D_wifi.m
rename to examples/octave/helmholtz2D_wifi.m
index 97a52076c..14948a610 100644
--- a/examples/matlab_octave/helmholtz2D_wifi.m
+++ b/examples/octave/helmholtz2D_wifi.m
@@ -4,7 +4,7 @@
 % n = refractive index
 % This equation models the wifi signal propagation in a room
 clear; clc; close all;
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % define the walls
 wall = @(X,Y) (X>=10.0 & X<=39.0 & Y>=20.0 & Y<=21.0) | (X>=30.0 & X<=31.0 & Y>=1.0 & Y<=16.0) | ...
diff --git a/examples/matlab_octave/hyperbolic1D.m b/examples/octave/hyperbolic1D.m
similarity index 96%
rename from examples/matlab_octave/hyperbolic1D.m
rename to examples/octave/hyperbolic1D.m
index 21dd50b0c..99f68d046 100644
--- a/examples/matlab_octave/hyperbolic1D.m
+++ b/examples/octave/hyperbolic1D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 a = 1; % Velocity
 west = 0; % Domain's limits
diff --git a/examples/matlab_octave/hyperbolic1D_lax_friedrichs.m b/examples/octave/hyperbolic1D_lax_friedrichs.m
similarity index 95%
rename from examples/matlab_octave/hyperbolic1D_lax_friedrichs.m
rename to examples/octave/hyperbolic1D_lax_friedrichs.m
index a5e4a6b71..9fd9ac312 100644
--- a/examples/matlab_octave/hyperbolic1D_lax_friedrichs.m
+++ b/examples/octave/hyperbolic1D_lax_friedrichs.m
@@ -4,7 +4,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 a = 1; % Velocity
 west = 0; % Domain's limits
diff --git a/examples/matlab_octave/hyperbolic1D_upwind.m b/examples/octave/hyperbolic1D_upwind.m
similarity index 95%
rename from examples/matlab_octave/hyperbolic1D_upwind.m
rename to examples/octave/hyperbolic1D_upwind.m
index ac188fac5..8030ae76b 100644
--- a/examples/matlab_octave/hyperbolic1D_upwind.m
+++ b/examples/octave/hyperbolic1D_upwind.m
@@ -4,7 +4,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 a = 1; % Velocity
 west = 0; % Domain's limits
diff --git a/examples/matlab_octave/integration1D.m b/examples/octave/integration1D.m
similarity index 95%
rename from examples/matlab_octave/integration1D.m
rename to examples/octave/integration1D.m
index 587a39bd0..9b81df1ca 100644
--- a/examples/matlab_octave/integration1D.m
+++ b/examples/octave/integration1D.m
@@ -8,7 +8,7 @@
 
 clc; close all;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 % Domain limits
 west = -5;
diff --git a/examples/matlab_octave/lock_exchange.m b/examples/octave/lock_exchange.m
similarity index 99%
rename from examples/matlab_octave/lock_exchange.m
rename to examples/octave/lock_exchange.m
index 6d5621b5e..9e7facff9 100644
--- a/examples/matlab_octave/lock_exchange.m
+++ b/examples/octave/lock_exchange.m
@@ -8,7 +8,7 @@
 close all
 
 %% MOLE'S path so mimetic methods can be used
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 tic  % Start the timer
 %--------------------------------------------------------------------------
diff --git a/examples/matlab_octave/maxwell1D.m b/examples/octave/maxwell1D.m
similarity index 96%
rename from examples/matlab_octave/maxwell1D.m
rename to examples/octave/maxwell1D.m
index c3175d4cd..bd0e3b7eb 100644
--- a/examples/matlab_octave/maxwell1D.m
+++ b/examples/octave/maxwell1D.m
@@ -1,7 +1,7 @@
 % Solution to 1D Maxwell's equations using mimetic operators and leapfrog
 clear; clc; close all;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 nt = 150;         % number of time steps
 m = 100;          % number of cells
diff --git a/examples/matlab_octave/parabolic1D.m b/examples/octave/parabolic1D.m
similarity index 97%
rename from examples/matlab_octave/parabolic1D.m
rename to examples/octave/parabolic1D.m
index 7bb8a15eb..b6999b076 100644
--- a/examples/matlab_octave/parabolic1D.m
+++ b/examples/octave/parabolic1D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 is_Octave = exist('OCTAVE_VERSION', 'builtin') ~= 0;
 
diff --git a/examples/matlab_octave/parabolic2D.m b/examples/octave/parabolic2D.m
similarity index 95%
rename from examples/matlab_octave/parabolic2D.m
rename to examples/octave/parabolic2D.m
index 4a8fe2cce..41284142f 100644
--- a/examples/matlab_octave/parabolic2D.m
+++ b/examples/octave/parabolic2D.m
@@ -11,8 +11,8 @@
 clc
 close all
 
-% Add paths to lap2D and addScalarBC2D in the src/matlab_octave
-addpath(genpath('../../src/matlab_octave'))
+% Add paths to lap2D and addScalarBC2D in the src/octave
+addpath(genpath('../../src/octave'))
 
 % Parameters
 method = "implicit";
diff --git a/examples/matlab_octave/poisson2D.m b/examples/octave/poisson2D.m
similarity index 93%
rename from examples/matlab_octave/poisson2D.m
rename to examples/octave/poisson2D.m
index 32c5d054a..53bd0dbeb 100644
--- a/examples/matlab_octave/poisson2D.m
+++ b/examples/octave/poisson2D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 k = 2; % Order of accuracy
 m = 5; % Vertical resolution - minimal number of grid points required for the operator
diff --git a/examples/matlab_octave/richards.m b/examples/octave/richards.m
similarity index 97%
rename from examples/matlab_octave/richards.m
rename to examples/octave/richards.m
index f38bb62a2..77f35fd2d 100644
--- a/examples/matlab_octave/richards.m
+++ b/examples/octave/richards.m
@@ -6,7 +6,7 @@
     clc
     close all
 
-    addpath(genpath('../../src/matlab_octave'));
+    addpath(genpath('../../src/octave'));
 
     % Spatial and temporal discretization
     k = 4;
diff --git a/examples/matlab_octave/schrodinger2D.m b/examples/octave/schrodinger2D.m
similarity index 97%
rename from examples/matlab_octave/schrodinger2D.m
rename to examples/octave/schrodinger2D.m
index a2b9e0673..1bb71c6cc 100644
--- a/examples/matlab_octave/schrodinger2D.m
+++ b/examples/octave/schrodinger2D.m
@@ -2,7 +2,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 Lxy = 1;              % Length of box in x and y
diff --git a/examples/matlab_octave/sturmLiouvilleBessel.m b/examples/octave/sturmLiouvilleBessel.m
similarity index 96%
rename from examples/matlab_octave/sturmLiouvilleBessel.m
rename to examples/octave/sturmLiouvilleBessel.m
index 7b565eefd..cbcd6c391 100755
--- a/examples/matlab_octave/sturmLiouvilleBessel.m
+++ b/examples/octave/sturmLiouvilleBessel.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 2;
diff --git a/examples/matlab_octave/sturmLiouvilleChebyshev.m b/examples/octave/sturmLiouvilleChebyshev.m
similarity index 95%
rename from examples/matlab_octave/sturmLiouvilleChebyshev.m
rename to examples/octave/sturmLiouvilleChebyshev.m
index a2620faa1..04420bac5 100755
--- a/examples/matlab_octave/sturmLiouvilleChebyshev.m
+++ b/examples/octave/sturmLiouvilleChebyshev.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 1;
diff --git a/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletDirichlet.m b/examples/octave/sturmLiouvilleHelmholtzDirichletDirichlet.m
similarity index 94%
rename from examples/matlab_octave/sturmLiouvilleHelmholtzDirichletDirichlet.m
rename to examples/octave/sturmLiouvilleHelmholtzDirichletDirichlet.m
index 58ab0fb69..86221933c 100755
--- a/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletDirichlet.m
+++ b/examples/octave/sturmLiouvilleHelmholtzDirichletDirichlet.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 6; 
diff --git a/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletRobin.m b/examples/octave/sturmLiouvilleHelmholtzDirichletRobin.m
similarity index 95%
rename from examples/matlab_octave/sturmLiouvilleHelmholtzDirichletRobin.m
rename to examples/octave/sturmLiouvilleHelmholtzDirichletRobin.m
index 3e90e7837..66284c4e9 100755
--- a/examples/matlab_octave/sturmLiouvilleHelmholtzDirichletRobin.m
+++ b/examples/octave/sturmLiouvilleHelmholtzDirichletRobin.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 7; 
diff --git a/examples/matlab_octave/sturmLiouvilleHermite.m b/examples/octave/sturmLiouvilleHermite.m
similarity index 96%
rename from examples/matlab_octave/sturmLiouvilleHermite.m
rename to examples/octave/sturmLiouvilleHermite.m
index 412df2fbd..e04a90e1b 100755
--- a/examples/matlab_octave/sturmLiouvilleHermite.m
+++ b/examples/octave/sturmLiouvilleHermite.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 3;
diff --git a/examples/matlab_octave/sturmLiouvilleLaguerre.m b/examples/octave/sturmLiouvilleLaguerre.m
similarity index 97%
rename from examples/matlab_octave/sturmLiouvilleLaguerre.m
rename to examples/octave/sturmLiouvilleLaguerre.m
index d2f1e5eec..aff557e70 100755
--- a/examples/matlab_octave/sturmLiouvilleLaguerre.m
+++ b/examples/octave/sturmLiouvilleLaguerre.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 5; 
diff --git a/examples/matlab_octave/sturmLiouvilleLegendre.m b/examples/octave/sturmLiouvilleLegendre.m
similarity index 96%
rename from examples/matlab_octave/sturmLiouvilleLegendre.m
rename to examples/octave/sturmLiouvilleLegendre.m
index e9d4f55b9..c36fa2e71 100755
--- a/examples/matlab_octave/sturmLiouvilleLegendre.m
+++ b/examples/octave/sturmLiouvilleLegendre.m
@@ -7,7 +7,7 @@
 %
 close all; clc;
 
-addpath(genpath('../../src/matlab_octave'));
+addpath(genpath('../../src/octave'));
 
 k = 2;
 bvp = 4;
diff --git a/examples/matlab_octave/terzaghi1D.m b/examples/octave/terzaghi1D.m
similarity index 99%
rename from examples/matlab_octave/terzaghi1D.m
rename to examples/octave/terzaghi1D.m
index 014a81e75..01794ece2 100644
--- a/examples/matlab_octave/terzaghi1D.m
+++ b/examples/octave/terzaghi1D.m
@@ -48,7 +48,7 @@
 clc;
 close all;
 
-addpath(genpath('../../src/matlab_octave'));  % MOLE operator path
+addpath(genpath('../../src/octave'));  % MOLE operator path
 
 %% Parameters
 P0 = 10e6;         % Face load in Pascals
diff --git a/examples/matlab_octave/test_curl.m b/examples/octave/test_curl.m
similarity index 97%
rename from examples/matlab_octave/test_curl.m
rename to examples/octave/test_curl.m
index 584b13a91..e7b0249ec 100644
--- a/examples/matlab_octave/test_curl.m
+++ b/examples/octave/test_curl.m
@@ -12,7 +12,7 @@
 close all
 clear
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % This P and Q will produce a scalar curl = 2
 P = @(~, Y) -Y;   % U(x,y) = -y
diff --git a/examples/matlab_octave/test_div2DCurv.m b/examples/octave/test_div2DCurv.m
similarity index 98%
rename from examples/matlab_octave/test_div2DCurv.m
rename to examples/octave/test_div2DCurv.m
index 49b8b4b59..23fd377eb 100644
--- a/examples/matlab_octave/test_div2DCurv.m
+++ b/examples/octave/test_div2DCurv.m
@@ -4,7 +4,7 @@
 close all
 clear
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;
diff --git a/examples/matlab_octave/test_div3DCurv.m b/examples/octave/test_div3DCurv.m
similarity index 98%
rename from examples/matlab_octave/test_div3DCurv.m
rename to examples/octave/test_div3DCurv.m
index 7d5e758c6..7f36b126c 100644
--- a/examples/matlab_octave/test_div3DCurv.m
+++ b/examples/octave/test_div3DCurv.m
@@ -3,7 +3,7 @@
 close all
 clear
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;  % Order of accuracy
diff --git a/examples/matlab_octave/test_grad2DCurv.m b/examples/octave/test_grad2DCurv.m
similarity index 98%
rename from examples/matlab_octave/test_grad2DCurv.m
rename to examples/octave/test_grad2DCurv.m
index 328a170fc..45fc5d1ac 100644
--- a/examples/matlab_octave/test_grad2DCurv.m
+++ b/examples/octave/test_grad2DCurv.m
@@ -8,7 +8,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;  % Order of accuracy
diff --git a/examples/matlab_octave/test_grad3DCurv.m b/examples/octave/test_grad3DCurv.m
similarity index 98%
rename from examples/matlab_octave/test_grad3DCurv.m
rename to examples/octave/test_grad3DCurv.m
index 38c1bc0a9..9e2a71bb3 100644
--- a/examples/matlab_octave/test_grad3DCurv.m
+++ b/examples/octave/test_grad3DCurv.m
@@ -2,7 +2,7 @@
 close all
 clear
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;                   % Order of accuracy
diff --git a/examples/matlab_octave/test_lap3DCurv.m b/examples/octave/test_lap3DCurv.m
similarity index 97%
rename from examples/matlab_octave/test_lap3DCurv.m
rename to examples/octave/test_lap3DCurv.m
index 23a5efe91..3f97a97ea 100644
--- a/examples/matlab_octave/test_lap3DCurv.m
+++ b/examples/octave/test_lap3DCurv.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;  % Order of accuracy
diff --git a/examples/matlab_octave/test_lap3DCurv_case2.m b/examples/octave/test_lap3DCurv_case2.m
similarity index 97%
rename from examples/matlab_octave/test_lap3DCurv_case2.m
rename to examples/octave/test_lap3DCurv_case2.m
index 21be67673..8a18428ca 100644
--- a/examples/matlab_octave/test_lap3DCurv_case2.m
+++ b/examples/octave/test_lap3DCurv_case2.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;                   % Order of accuracy
diff --git a/examples/matlab_octave/test_nodal2DCurv.m b/examples/octave/test_nodal2DCurv.m
similarity index 95%
rename from examples/matlab_octave/test_nodal2DCurv.m
rename to examples/octave/test_nodal2DCurv.m
index dedb84e82..59dbda709 100644
--- a/examples/matlab_octave/test_nodal2DCurv.m
+++ b/examples/octave/test_nodal2DCurv.m
@@ -1,7 +1,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Parameters
 k = 2;
diff --git a/examples/matlab_octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m b/examples/octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m
similarity index 99%
rename from examples/matlab_octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m
rename to examples/octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m
index 2328fdab6..7e9595657 100644
--- a/examples/matlab_octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m
+++ b/examples/octave/tutorials/two_way_wave_equation/comparison_two_way_wave_md_vs_fd.m
@@ -93,7 +93,7 @@
 close all
 clear
 
-addpath(genpath('../../../../src/matlab_octave'));
+addpath(genpath('../../../../src/octave'));
 
 %% Problem definition - These values aremimicked in the FD and MD functions
 k    = 2;        % Mimetic Order of Accuracy, can change to 4,6,8
diff --git a/examples/matlab_octave/tutorials/two_way_wave_equation/finite_diff_two_way_wave_eq.m b/examples/octave/tutorials/two_way_wave_equation/finite_diff_two_way_wave_eq.m
similarity index 100%
rename from examples/matlab_octave/tutorials/two_way_wave_equation/finite_diff_two_way_wave_eq.m
rename to examples/octave/tutorials/two_way_wave_equation/finite_diff_two_way_wave_eq.m
diff --git a/examples/matlab_octave/tutorials/two_way_wave_equation/mimetic_diff_two_way_wave_eq.m b/examples/octave/tutorials/two_way_wave_equation/mimetic_diff_two_way_wave_eq.m
similarity index 100%
rename from examples/matlab_octave/tutorials/two_way_wave_equation/mimetic_diff_two_way_wave_eq.m
rename to examples/octave/tutorials/two_way_wave_equation/mimetic_diff_two_way_wave_eq.m
diff --git a/examples/matlab_octave/van_der_pol.m b/examples/octave/van_der_pol.m
similarity index 86%
rename from examples/matlab_octave/van_der_pol.m
rename to examples/octave/van_der_pol.m
index 62f76b7c0..a9c357141 100644
--- a/examples/matlab_octave/van_der_pol.m
+++ b/examples/octave/van_der_pol.m
@@ -1,6 +1,6 @@
-% Solves a second order ODE using our implementation of RK4 (src/matlab_octave/rk4.m)
+% Solves a second order ODE using our implementation of RK4 (src/octave/rk4.m)
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % OCTAVE does not have VanDerPol equation, so here it is with Mu=1
 vdpl = @(t,y) [y(2); (1 - y(1)^2) * y(2) - y(1)];
diff --git a/examples/matlab_octave/wave1D.m b/examples/octave/wave1D.m
similarity index 97%
rename from examples/matlab_octave/wave1D.m
rename to examples/octave/wave1D.m
index b28065afb..617412b8a 100644
--- a/examples/matlab_octave/wave1D.m
+++ b/examples/octave/wave1D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Spatial discretization
 k = 2;         % Order of accuracy (spatial)
diff --git a/examples/matlab_octave/wave1DTimeVaryingBC.m b/examples/octave/wave1DTimeVaryingBC.m
similarity index 98%
rename from examples/matlab_octave/wave1DTimeVaryingBC.m
rename to examples/octave/wave1DTimeVaryingBC.m
index 09d98e86d..de61c7152 100644
--- a/examples/matlab_octave/wave1DTimeVaryingBC.m
+++ b/examples/octave/wave1DTimeVaryingBC.m
@@ -16,7 +16,7 @@
 %
 clear all; close all; clc
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % some other parameters
 c = 2;
diff --git a/examples/matlab_octave/wave1D_case2.m b/examples/octave/wave1D_case2.m
similarity index 97%
rename from examples/matlab_octave/wave1D_case2.m
rename to examples/octave/wave1D_case2.m
index 353767e80..995b9f37f 100644
--- a/examples/matlab_octave/wave1D_case2.m
+++ b/examples/octave/wave1D_case2.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Spatial discretization
 k = 4;         % Order of accuracy (spatial)
diff --git a/examples/matlab_octave/wave1D_convergence/wave1D_convergence.m b/examples/octave/wave1D_convergence/wave1D_convergence.m
similarity index 97%
rename from examples/matlab_octave/wave1D_convergence/wave1D_convergence.m
rename to examples/octave/wave1D_convergence/wave1D_convergence.m
index 2974620bc..b656fec27 100644
--- a/examples/matlab_octave/wave1D_convergence/wave1D_convergence.m
+++ b/examples/octave/wave1D_convergence/wave1D_convergence.m
@@ -1,6 +1,6 @@
 % =========================================================================
 % Example: 2nd Order Convergence for 1D Wave Equation (Hyperbolic)
-% Language: MATLAB / Octave
+% Language: Octave (works in MATLAB as well)
 % =========================================================================
 %
 % Reference:
@@ -38,7 +38,7 @@
 % Implementation Details:
 %    - Spatial Scheme: Mimetic Finite Differences (Order k=2) vs Standard FD
 %    - Time Integration: Verlet Algorithm (Symplectic, 2nd order, Leapfrog equivalent)
-%    - Library: MOLE (MATLAB/Octave implementation)
+%    - Library: MOLE (GNU Octave implementation)
 %
 % Output:
 %    - Console: Table of Relative errors and convergence rates.
@@ -51,7 +51,7 @@
 % =========================================================================
 clear; clc; close all;
 
-addpath(genpath('../../../src/matlab_octave'));
+addpath(genpath('../../../src/octave'));
 
 fprintf('Running Comparative Convergence Test (Mimetic vs FD)\n');
 fprintf('--------------------------------------------------\n');
diff --git a/examples/matlab_octave/wave1D_convergence/wave1D_solver.m b/examples/octave/wave1D_convergence/wave1D_solver.m
similarity index 100%
rename from examples/matlab_octave/wave1D_convergence/wave1D_solver.m
rename to examples/octave/wave1D_convergence/wave1D_solver.m
diff --git a/examples/matlab_octave/wave1D_convergence/wave1D_solver_fd.m b/examples/octave/wave1D_convergence/wave1D_solver_fd.m
similarity index 100%
rename from examples/matlab_octave/wave1D_convergence/wave1D_solver_fd.m
rename to examples/octave/wave1D_convergence/wave1D_solver_fd.m
diff --git a/examples/matlab_octave/wave2D.m b/examples/octave/wave2D.m
similarity index 97%
rename from examples/matlab_octave/wave2D.m
rename to examples/octave/wave2D.m
index f5c0253ee..a2d080e1d 100644
--- a/examples/matlab_octave/wave2D.m
+++ b/examples/octave/wave2D.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Spatial discretization
 k = 2;   % Order of accuracy
diff --git a/examples/matlab_octave/wave2D_case2.m b/examples/octave/wave2D_case2.m
similarity index 97%
rename from examples/matlab_octave/wave2D_case2.m
rename to examples/octave/wave2D_case2.m
index 002fd5862..79f776114 100644
--- a/examples/matlab_octave/wave2D_case2.m
+++ b/examples/octave/wave2D_case2.m
@@ -3,7 +3,7 @@
 clc
 close all
 
-addpath(genpath('../../src/matlab_octave'))
+addpath(genpath('../../src/octave'))
 
 % Spatial discretization
 k = 4;    % Order of accuracy
diff --git a/julia/MOLE.jl/docs/src/examples/index.md b/julia/MOLE.jl/docs/src/examples/index.md
index 667d9583a..4d3051b9a 100644
--- a/julia/MOLE.jl/docs/src/examples/index.md
+++ b/julia/MOLE.jl/docs/src/examples/index.md
@@ -1,9 +1,9 @@
 # Examples
 
-The MOLE library contains many examples written in OCTAVE/MATLAB, C++, and Julia. These examples span a broad range of partial differential equations. Below are more technical explinations of the examples included in the library.
+The MOLE library contains many examples written in Octave, C++, and Julia. These examples span a broad range of partial differential equations. Below are more technical explinations of the examples included in the library.
 
 **NOTE:**
-The name for OCTAVE/MATLAB, C++, and Julia will be the same (i.e., the files `elliptic1D.m`, `elliptic1D.cpp`, and `elliptic1D.jl` solve the same differential equation explained here under Elliptic1D). These examples are only the ones implemented in Julia. There are many more OCTAVE/MATLAB and C++ examples, which can be found in the main MOLE documentation.
+The name for Octave, C++, and Julia will be the same (i.e., the files `elliptic1D.m`, `elliptic1D.cpp`, and `elliptic1D.jl` solve the same differential equation explained here under Elliptic1D). These examples are only the ones implemented in Julia. There are many more Octave and C++ examples, which can be found in the main MOLE documentation.
 
 ## Elliptic Problems
 
diff --git a/julia/MOLE.jl/examples/hyperbolic/hyperbolic1D.jl b/julia/MOLE.jl/examples/hyperbolic/hyperbolic1D.jl
index 94fba8229..00f98c27a 100644
--- a/julia/MOLE.jl/examples/hyperbolic/hyperbolic1D.jl
+++ b/julia/MOLE.jl/examples/hyperbolic/hyperbolic1D.jl
@@ -1,6 +1,6 @@
 #=
 Julia implementation of the 1D Advection equation with periodic boundary conditions
-from MATLAB MOLE example using the Leapfrog Scheme
+from Octave MOLE example using the Leapfrog Scheme
 =#
 
 using Plots
diff --git a/julia/MOLE.jl/src/BCs/scalarBC.jl b/julia/MOLE.jl/src/BCs/scalarBC.jl
index 5b9dd8dc3..797ddd8d5 100644
--- a/julia/MOLE.jl/src/BCs/scalarBC.jl
+++ b/julia/MOLE.jl/src/BCs/scalarBC.jl
@@ -18,7 +18,7 @@ abstract type AbstractScalarBC{D} end
 """
     Concrete scalar BC description for 1D.
 
-    Fields mirror the MATLAB function:
+    Fields mirror the Octave function:
     - dc: Dirichlet coefficients (left,right)
     - nc: Neumann/Robin coefficients (left,right)
     - v:  prescribed boundary value g (left,right)
@@ -33,7 +33,7 @@ end
 """
     Concrete scalar BC description for 2D.
 
-    Fields mirror the MATLAB function:
+    Fields mirror the Octave function:
     - dc: Dirichlet coefficients (left, right, bottom, top)
     - nc: Neumann/Robin coefficients (left, right, bottom, top)
     - vc: prescribed boundary value g (left, right, bottom, top)
@@ -102,7 +102,7 @@ end
 end
 
 """
-    1D BC applicator. Mirrors MATLAB addScalarBC1D.
+    1D BC applicator. Mirrors Octave addScalarBC1D.
     Signature keeps the discretization params (`k,m,dx`) separate from `bc`.
 """
 function addScalarBC!(A::SparseMatrixCSC, b::AbstractVector, bc::ScalarBC1D{T},
@@ -110,7 +110,7 @@ function addScalarBC!(A::SparseMatrixCSC, b::AbstractVector, bc::ScalarBC1D{T},
 
     dc, nc, v = bc.dc, bc.nc, bc.v
 
-    # Equivalent of MATLAB: q = find(dc.^2 + nc.^2, 1)
+    # Equivalent of Octave: q = find(dc.^2 + nc.^2, 1)
     hasbc =
         (dc[1] != zero(T)) || (dc[2] != zero(T)) || (nc[1] != zero(T)) || (nc[2] != zero(T))
     if !hasbc
@@ -242,7 +242,7 @@ end
 end
 
 """
-    2D BC applicator. Mirrors MATLAB addScalarBC2D.
+    2D BC applicator. Mirrors Octave addScalarBC2D.
     Signature keeps the discretization params (`k,m,dx,n,dy`) separate from `bc`.
 """
 function addScalarBC!(A::SparseMatrixCSC, b::AbstractVector, bc::ScalarBC2D{T},
diff --git a/src/cpp/utils.cpp b/src/cpp/utils.cpp
index a35369f39..ac7169636 100644
--- a/src/cpp/utils.cpp
+++ b/src/cpp/utils.cpp
@@ -7,11 +7,11 @@
 
 /* 
  * @file utils.cpp
- * @brief Helpers for sparse operations and MATLAB/Octave analogs
+ * @brief Helpers for sparse operations and Octave analogs
  * @date 2024/10/15
  * 
  * Sparse operations that repeatedly are needed, but not 
- * necessarily part of the Armadillo library. Some other MATLAB/Octave
+ * necessarily part of the Armadillo library. Some other Octave
  * type functions are also here, like meshgrid.
  */
 
diff --git a/src/cpp/utils.h b/src/cpp/utils.h
index 1318bed07..254d4a536 100644
--- a/src/cpp/utils.h
+++ b/src/cpp/utils.h
@@ -6,7 +6,7 @@
 
 /*
  * @file utils.h
- * @brief Helpers for sparse operations and MATLAB/Octave analogs
+ * @brief Helpers for sparse operations and Octave analogs
  * @date 2024/10/15
  *
  */
@@ -69,7 +69,7 @@ class Utils {
   static vec spsolve_eigen(const sp_mat &A, const vec &b);
 
   /**
-  * @brief An analog to the MATLAB/Octave 2D meshgrid operation
+  * @brief An analog to the Octave 2D meshgrid operation
   *
   * returns 2-D grid coordinates based on the coordinates contained 
   * in vectors x and y. X is a matrix where each row is a copy of x, 
@@ -87,7 +87,7 @@ class Utils {
   void meshgrid(const vec &x, const vec &y, mat &X, mat &Y);
 
   /**
-  * @brief An analog to the MATLAB/Octave 3D meshgrid operation
+  * @brief An analog to the Octave 3D meshgrid operation
   *
   * meshgrid(x,y,z,X,Y,Z) returns 3-D grid coordinates defined by the 
   * vectors x, y, and z. The grid represented by X, Y, and Z has size
diff --git a/src/matlab_octave/DI2.m b/src/octave/DI2.m
similarity index 100%
rename from src/matlab_octave/DI2.m
rename to src/octave/DI2.m
diff --git a/src/matlab_octave/DI3.m b/src/octave/DI3.m
similarity index 100%
rename from src/matlab_octave/DI3.m
rename to src/octave/DI3.m
diff --git a/src/matlab_octave/GI1.m b/src/octave/GI1.m
similarity index 100%
rename from src/matlab_octave/GI1.m
rename to src/octave/GI1.m
diff --git a/src/matlab_octave/GI13.m b/src/octave/GI13.m
similarity index 100%
rename from src/matlab_octave/GI13.m
rename to src/octave/GI13.m
diff --git a/src/matlab_octave/GI2.m b/src/octave/GI2.m
similarity index 100%
rename from src/matlab_octave/GI2.m
rename to src/octave/GI2.m
diff --git a/src/matlab_octave/addScalarBC1D.m b/src/octave/addScalarBC1D.m
similarity index 100%
rename from src/matlab_octave/addScalarBC1D.m
rename to src/octave/addScalarBC1D.m
diff --git a/src/matlab_octave/addScalarBC1Dlhs.m b/src/octave/addScalarBC1Dlhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC1Dlhs.m
rename to src/octave/addScalarBC1Dlhs.m
diff --git a/src/matlab_octave/addScalarBC1Drhs.m b/src/octave/addScalarBC1Drhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC1Drhs.m
rename to src/octave/addScalarBC1Drhs.m
diff --git a/src/matlab_octave/addScalarBC2D.m b/src/octave/addScalarBC2D.m
similarity index 100%
rename from src/matlab_octave/addScalarBC2D.m
rename to src/octave/addScalarBC2D.m
diff --git a/src/matlab_octave/addScalarBC2Dlhs.m b/src/octave/addScalarBC2Dlhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC2Dlhs.m
rename to src/octave/addScalarBC2Dlhs.m
diff --git a/src/matlab_octave/addScalarBC2Drhs.m b/src/octave/addScalarBC2Drhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC2Drhs.m
rename to src/octave/addScalarBC2Drhs.m
diff --git a/src/matlab_octave/addScalarBC3D.m b/src/octave/addScalarBC3D.m
similarity index 100%
rename from src/matlab_octave/addScalarBC3D.m
rename to src/octave/addScalarBC3D.m
diff --git a/src/matlab_octave/addScalarBC3Dlhs.m b/src/octave/addScalarBC3Dlhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC3Dlhs.m
rename to src/octave/addScalarBC3Dlhs.m
diff --git a/src/matlab_octave/addScalarBC3Drhs.m b/src/octave/addScalarBC3Drhs.m
similarity index 100%
rename from src/matlab_octave/addScalarBC3Drhs.m
rename to src/octave/addScalarBC3Drhs.m
diff --git a/src/matlab_octave/amean.m b/src/octave/amean.m
similarity index 100%
rename from src/matlab_octave/amean.m
rename to src/octave/amean.m
diff --git a/src/matlab_octave/boundaryIdx2D.m b/src/octave/boundaryIdx2D.m
similarity index 100%
rename from src/matlab_octave/boundaryIdx2D.m
rename to src/octave/boundaryIdx2D.m
diff --git a/src/matlab_octave/curl2D.m b/src/octave/curl2D.m
similarity index 100%
rename from src/matlab_octave/curl2D.m
rename to src/octave/curl2D.m
diff --git a/src/matlab_octave/div.m b/src/octave/div.m
similarity index 100%
rename from src/matlab_octave/div.m
rename to src/octave/div.m
diff --git a/src/matlab_octave/div2D.m b/src/octave/div2D.m
similarity index 100%
rename from src/matlab_octave/div2D.m
rename to src/octave/div2D.m
diff --git a/src/matlab_octave/div2DCurv.m b/src/octave/div2DCurv.m
similarity index 100%
rename from src/matlab_octave/div2DCurv.m
rename to src/octave/div2DCurv.m
diff --git a/src/matlab_octave/div2DCurvLegacy.m b/src/octave/div2DCurvLegacy.m
similarity index 100%
rename from src/matlab_octave/div2DCurvLegacy.m
rename to src/octave/div2DCurvLegacy.m
diff --git a/src/matlab_octave/div2DNonUniform.m b/src/octave/div2DNonUniform.m
similarity index 100%
rename from src/matlab_octave/div2DNonUniform.m
rename to src/octave/div2DNonUniform.m
diff --git a/src/matlab_octave/div3D.m b/src/octave/div3D.m
similarity index 100%
rename from src/matlab_octave/div3D.m
rename to src/octave/div3D.m
diff --git a/src/matlab_octave/div3DCurv.m b/src/octave/div3DCurv.m
similarity index 100%
rename from src/matlab_octave/div3DCurv.m
rename to src/octave/div3DCurv.m
diff --git a/src/matlab_octave/div3DCurvLegacy.m b/src/octave/div3DCurvLegacy.m
similarity index 100%
rename from src/matlab_octave/div3DCurvLegacy.m
rename to src/octave/div3DCurvLegacy.m
diff --git a/src/matlab_octave/div3DNonUniform.m b/src/octave/div3DNonUniform.m
similarity index 100%
rename from src/matlab_octave/div3DNonUniform.m
rename to src/octave/div3DNonUniform.m
diff --git a/src/matlab_octave/divNonPeriodic.m b/src/octave/divNonPeriodic.m
similarity index 100%
rename from src/matlab_octave/divNonPeriodic.m
rename to src/octave/divNonPeriodic.m
diff --git a/src/matlab_octave/divNonPeriodic2D.m b/src/octave/divNonPeriodic2D.m
similarity index 100%
rename from src/matlab_octave/divNonPeriodic2D.m
rename to src/octave/divNonPeriodic2D.m
diff --git a/src/matlab_octave/divNonPeriodic3D.m b/src/octave/divNonPeriodic3D.m
similarity index 100%
rename from src/matlab_octave/divNonPeriodic3D.m
rename to src/octave/divNonPeriodic3D.m
diff --git a/src/matlab_octave/divNonUniform.m b/src/octave/divNonUniform.m
similarity index 100%
rename from src/matlab_octave/divNonUniform.m
rename to src/octave/divNonUniform.m
diff --git a/src/matlab_octave/divPeriodic.m b/src/octave/divPeriodic.m
similarity index 100%
rename from src/matlab_octave/divPeriodic.m
rename to src/octave/divPeriodic.m
diff --git a/src/matlab_octave/generateWeights.m b/src/octave/generateWeights.m
similarity index 96%
rename from src/matlab_octave/generateWeights.m
rename to src/octave/generateWeights.m
index 30e37d123..91c8a7f68 100644
--- a/src/matlab_octave/generateWeights.m
+++ b/src/octave/generateWeights.m
@@ -11,7 +11,7 @@
 %   None
 %
 % SYNTAX
-%   From MATLAB or GNU Octave, change the current working directory to the
+%   From GNU Octave, change the current working directory to the
 %   directory containing `generateWeights.m`, then run:
 %
 %       generateWeights
diff --git a/src/matlab_octave/grad.m b/src/octave/grad.m
similarity index 100%
rename from src/matlab_octave/grad.m
rename to src/octave/grad.m
diff --git a/src/matlab_octave/grad2D.m b/src/octave/grad2D.m
similarity index 100%
rename from src/matlab_octave/grad2D.m
rename to src/octave/grad2D.m
diff --git a/src/matlab_octave/grad2DCurv.m b/src/octave/grad2DCurv.m
similarity index 100%
rename from src/matlab_octave/grad2DCurv.m
rename to src/octave/grad2DCurv.m
diff --git a/src/matlab_octave/grad2DCurvLegacy.m b/src/octave/grad2DCurvLegacy.m
similarity index 100%
rename from src/matlab_octave/grad2DCurvLegacy.m
rename to src/octave/grad2DCurvLegacy.m
diff --git a/src/matlab_octave/grad2DNonUniform.m b/src/octave/grad2DNonUniform.m
similarity index 100%
rename from src/matlab_octave/grad2DNonUniform.m
rename to src/octave/grad2DNonUniform.m
diff --git a/src/matlab_octave/grad3D.m b/src/octave/grad3D.m
similarity index 100%
rename from src/matlab_octave/grad3D.m
rename to src/octave/grad3D.m
diff --git a/src/matlab_octave/grad3DCurv.m b/src/octave/grad3DCurv.m
similarity index 100%
rename from src/matlab_octave/grad3DCurv.m
rename to src/octave/grad3DCurv.m
diff --git a/src/matlab_octave/grad3DCurvLegacy.m b/src/octave/grad3DCurvLegacy.m
similarity index 100%
rename from src/matlab_octave/grad3DCurvLegacy.m
rename to src/octave/grad3DCurvLegacy.m
diff --git a/src/matlab_octave/grad3DNonUniform.m b/src/octave/grad3DNonUniform.m
similarity index 100%
rename from src/matlab_octave/grad3DNonUniform.m
rename to src/octave/grad3DNonUniform.m
diff --git a/src/matlab_octave/gradNonPeriodic.m b/src/octave/gradNonPeriodic.m
similarity index 100%
rename from src/matlab_octave/gradNonPeriodic.m
rename to src/octave/gradNonPeriodic.m
diff --git a/src/matlab_octave/gradNonPeriodic2D.m b/src/octave/gradNonPeriodic2D.m
similarity index 100%
rename from src/matlab_octave/gradNonPeriodic2D.m
rename to src/octave/gradNonPeriodic2D.m
diff --git a/src/matlab_octave/gradNonPeriodic3D.m b/src/octave/gradNonPeriodic3D.m
similarity index 100%
rename from src/matlab_octave/gradNonPeriodic3D.m
rename to src/octave/gradNonPeriodic3D.m
diff --git a/src/matlab_octave/gradNonUniform.m b/src/octave/gradNonUniform.m
similarity index 100%
rename from src/matlab_octave/gradNonUniform.m
rename to src/octave/gradNonUniform.m
diff --git a/src/matlab_octave/gradPeriodic.m b/src/octave/gradPeriodic.m
similarity index 100%
rename from src/matlab_octave/gradPeriodic.m
rename to src/octave/gradPeriodic.m
diff --git a/src/matlab_octave/gridGen.m b/src/octave/gridGen.m
similarity index 100%
rename from src/matlab_octave/gridGen.m
rename to src/octave/gridGen.m
diff --git a/src/matlab_octave/grids/chevron/bottom.m b/src/octave/grids/chevron/bottom.m
similarity index 100%
rename from src/matlab_octave/grids/chevron/bottom.m
rename to src/octave/grids/chevron/bottom.m
diff --git a/src/matlab_octave/grids/chevron/left.m b/src/octave/grids/chevron/left.m
similarity index 100%
rename from src/matlab_octave/grids/chevron/left.m
rename to src/octave/grids/chevron/left.m
diff --git a/src/matlab_octave/grids/chevron/right.m b/src/octave/grids/chevron/right.m
similarity index 100%
rename from src/matlab_octave/grids/chevron/right.m
rename to src/octave/grids/chevron/right.m
diff --git a/src/matlab_octave/grids/chevron/top.m b/src/octave/grids/chevron/top.m
similarity index 100%
rename from src/matlab_octave/grids/chevron/top.m
rename to src/octave/grids/chevron/top.m
diff --git a/src/matlab_octave/grids/horseshoe/bottom.m b/src/octave/grids/horseshoe/bottom.m
similarity index 100%
rename from src/matlab_octave/grids/horseshoe/bottom.m
rename to src/octave/grids/horseshoe/bottom.m
diff --git a/src/matlab_octave/grids/horseshoe/left.m b/src/octave/grids/horseshoe/left.m
similarity index 100%
rename from src/matlab_octave/grids/horseshoe/left.m
rename to src/octave/grids/horseshoe/left.m
diff --git a/src/matlab_octave/grids/horseshoe/right.m b/src/octave/grids/horseshoe/right.m
similarity index 100%
rename from src/matlab_octave/grids/horseshoe/right.m
rename to src/octave/grids/horseshoe/right.m
diff --git a/src/matlab_octave/grids/horseshoe/top.m b/src/octave/grids/horseshoe/top.m
similarity index 100%
rename from src/matlab_octave/grids/horseshoe/top.m
rename to src/octave/grids/horseshoe/top.m
diff --git a/src/matlab_octave/grids/swan/bottom.m b/src/octave/grids/swan/bottom.m
similarity index 100%
rename from src/matlab_octave/grids/swan/bottom.m
rename to src/octave/grids/swan/bottom.m
diff --git a/src/matlab_octave/grids/swan/left.m b/src/octave/grids/swan/left.m
similarity index 100%
rename from src/matlab_octave/grids/swan/left.m
rename to src/octave/grids/swan/left.m
diff --git a/src/matlab_octave/grids/swan/right.m b/src/octave/grids/swan/right.m
similarity index 100%
rename from src/matlab_octave/grids/swan/right.m
rename to src/octave/grids/swan/right.m
diff --git a/src/matlab_octave/grids/swan/top.m b/src/octave/grids/swan/top.m
similarity index 100%
rename from src/matlab_octave/grids/swan/top.m
rename to src/octave/grids/swan/top.m
diff --git a/src/matlab_octave/hmean.m b/src/octave/hmean.m
similarity index 100%
rename from src/matlab_octave/hmean.m
rename to src/octave/hmean.m
diff --git a/src/matlab_octave/interpol.m b/src/octave/interpol.m
similarity index 100%
rename from src/matlab_octave/interpol.m
rename to src/octave/interpol.m
diff --git a/src/matlab_octave/interpol2D.m b/src/octave/interpol2D.m
similarity index 100%
rename from src/matlab_octave/interpol2D.m
rename to src/octave/interpol2D.m
diff --git a/src/matlab_octave/interpol3D.m b/src/octave/interpol3D.m
similarity index 100%
rename from src/matlab_octave/interpol3D.m
rename to src/octave/interpol3D.m
diff --git a/src/matlab_octave/interpolCentersToFacesD1D.m b/src/octave/interpolCentersToFacesD1D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD1D.m
rename to src/octave/interpolCentersToFacesD1D.m
diff --git a/src/matlab_octave/interpolCentersToFacesD1DPeriodic.m b/src/octave/interpolCentersToFacesD1DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD1DPeriodic.m
rename to src/octave/interpolCentersToFacesD1DPeriodic.m
diff --git a/src/matlab_octave/interpolCentersToFacesD2D.m b/src/octave/interpolCentersToFacesD2D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD2D.m
rename to src/octave/interpolCentersToFacesD2D.m
diff --git a/src/matlab_octave/interpolCentersToFacesD2DPeriodic.m b/src/octave/interpolCentersToFacesD2DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD2DPeriodic.m
rename to src/octave/interpolCentersToFacesD2DPeriodic.m
diff --git a/src/matlab_octave/interpolCentersToFacesD3D.m b/src/octave/interpolCentersToFacesD3D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD3D.m
rename to src/octave/interpolCentersToFacesD3D.m
diff --git a/src/matlab_octave/interpolCentersToFacesD3DPeriodic.m b/src/octave/interpolCentersToFacesD3DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToFacesD3DPeriodic.m
rename to src/octave/interpolCentersToFacesD3DPeriodic.m
diff --git a/src/matlab_octave/interpolCentersToNodes1D.m b/src/octave/interpolCentersToNodes1D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes1D.m
rename to src/octave/interpolCentersToNodes1D.m
diff --git a/src/matlab_octave/interpolCentersToNodes1DPeriodic.m b/src/octave/interpolCentersToNodes1DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes1DPeriodic.m
rename to src/octave/interpolCentersToNodes1DPeriodic.m
diff --git a/src/matlab_octave/interpolCentersToNodes2D.m b/src/octave/interpolCentersToNodes2D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes2D.m
rename to src/octave/interpolCentersToNodes2D.m
diff --git a/src/matlab_octave/interpolCentersToNodes2DPeriodic.m b/src/octave/interpolCentersToNodes2DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes2DPeriodic.m
rename to src/octave/interpolCentersToNodes2DPeriodic.m
diff --git a/src/matlab_octave/interpolCentersToNodes3D.m b/src/octave/interpolCentersToNodes3D.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes3D.m
rename to src/octave/interpolCentersToNodes3D.m
diff --git a/src/matlab_octave/interpolCentersToNodes3DPeriodic.m b/src/octave/interpolCentersToNodes3DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolCentersToNodes3DPeriodic.m
rename to src/octave/interpolCentersToNodes3DPeriodic.m
diff --git a/src/matlab_octave/interpolD.m b/src/octave/interpolD.m
similarity index 100%
rename from src/matlab_octave/interpolD.m
rename to src/octave/interpolD.m
diff --git a/src/matlab_octave/interpolD2D.m b/src/octave/interpolD2D.m
similarity index 100%
rename from src/matlab_octave/interpolD2D.m
rename to src/octave/interpolD2D.m
diff --git a/src/matlab_octave/interpolD3D.m b/src/octave/interpolD3D.m
similarity index 100%
rename from src/matlab_octave/interpolD3D.m
rename to src/octave/interpolD3D.m
diff --git a/src/matlab_octave/interpolFacesToCentersG1D.m b/src/octave/interpolFacesToCentersG1D.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG1D.m
rename to src/octave/interpolFacesToCentersG1D.m
diff --git a/src/matlab_octave/interpolFacesToCentersG1DPeriodic.m b/src/octave/interpolFacesToCentersG1DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG1DPeriodic.m
rename to src/octave/interpolFacesToCentersG1DPeriodic.m
diff --git a/src/matlab_octave/interpolFacesToCentersG2D.m b/src/octave/interpolFacesToCentersG2D.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG2D.m
rename to src/octave/interpolFacesToCentersG2D.m
diff --git a/src/matlab_octave/interpolFacesToCentersG2DPeriodic.m b/src/octave/interpolFacesToCentersG2DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG2DPeriodic.m
rename to src/octave/interpolFacesToCentersG2DPeriodic.m
diff --git a/src/matlab_octave/interpolFacesToCentersG3D.m b/src/octave/interpolFacesToCentersG3D.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG3D.m
rename to src/octave/interpolFacesToCentersG3D.m
diff --git a/src/matlab_octave/interpolFacesToCentersG3DPeriodic.m b/src/octave/interpolFacesToCentersG3DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolFacesToCentersG3DPeriodic.m
rename to src/octave/interpolFacesToCentersG3DPeriodic.m
diff --git a/src/matlab_octave/interpolNodesToCenters1D.m b/src/octave/interpolNodesToCenters1D.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters1D.m
rename to src/octave/interpolNodesToCenters1D.m
diff --git a/src/matlab_octave/interpolNodesToCenters1DPeriodic.m b/src/octave/interpolNodesToCenters1DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters1DPeriodic.m
rename to src/octave/interpolNodesToCenters1DPeriodic.m
diff --git a/src/matlab_octave/interpolNodesToCenters2D.m b/src/octave/interpolNodesToCenters2D.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters2D.m
rename to src/octave/interpolNodesToCenters2D.m
diff --git a/src/matlab_octave/interpolNodesToCenters2DPeriodic.m b/src/octave/interpolNodesToCenters2DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters2DPeriodic.m
rename to src/octave/interpolNodesToCenters2DPeriodic.m
diff --git a/src/matlab_octave/interpolNodesToCenters3D.m b/src/octave/interpolNodesToCenters3D.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters3D.m
rename to src/octave/interpolNodesToCenters3D.m
diff --git a/src/matlab_octave/interpolNodesToCenters3DPeriodic.m b/src/octave/interpolNodesToCenters3DPeriodic.m
similarity index 100%
rename from src/matlab_octave/interpolNodesToCenters3DPeriodic.m
rename to src/octave/interpolNodesToCenters3DPeriodic.m
diff --git a/src/matlab_octave/jacobian2D.m b/src/octave/jacobian2D.m
similarity index 100%
rename from src/matlab_octave/jacobian2D.m
rename to src/octave/jacobian2D.m
diff --git a/src/matlab_octave/jacobian2DLegacy.m b/src/octave/jacobian2DLegacy.m
similarity index 100%
rename from src/matlab_octave/jacobian2DLegacy.m
rename to src/octave/jacobian2DLegacy.m
diff --git a/src/matlab_octave/jacobian3D.m b/src/octave/jacobian3D.m
similarity index 100%
rename from src/matlab_octave/jacobian3D.m
rename to src/octave/jacobian3D.m
diff --git a/src/matlab_octave/jacobian3DLegacy.m b/src/octave/jacobian3DLegacy.m
similarity index 100%
rename from src/matlab_octave/jacobian3DLegacy.m
rename to src/octave/jacobian3DLegacy.m
diff --git a/src/matlab_octave/lap.m b/src/octave/lap.m
similarity index 100%
rename from src/matlab_octave/lap.m
rename to src/octave/lap.m
diff --git a/src/matlab_octave/lap2D.m b/src/octave/lap2D.m
similarity index 100%
rename from src/matlab_octave/lap2D.m
rename to src/octave/lap2D.m
diff --git a/src/matlab_octave/lap3D.m b/src/octave/lap3D.m
similarity index 100%
rename from src/matlab_octave/lap3D.m
rename to src/octave/lap3D.m
diff --git a/src/matlab_octave/lapNonPeriodic.m b/src/octave/lapNonPeriodic.m
similarity index 100%
rename from src/matlab_octave/lapNonPeriodic.m
rename to src/octave/lapNonPeriodic.m
diff --git a/src/matlab_octave/lapNonPeriodic2D.m b/src/octave/lapNonPeriodic2D.m
similarity index 100%
rename from src/matlab_octave/lapNonPeriodic2D.m
rename to src/octave/lapNonPeriodic2D.m
diff --git a/src/matlab_octave/lapNonPeriodic3D.m b/src/octave/lapNonPeriodic3D.m
similarity index 100%
rename from src/matlab_octave/lapNonPeriodic3D.m
rename to src/octave/lapNonPeriodic3D.m
diff --git a/src/matlab_octave/lapPeriodic.m b/src/octave/lapPeriodic.m
similarity index 100%
rename from src/matlab_octave/lapPeriodic.m
rename to src/octave/lapPeriodic.m
diff --git a/src/matlab_octave/mimeticB.m b/src/octave/mimeticB.m
similarity index 100%
rename from src/matlab_octave/mimeticB.m
rename to src/octave/mimeticB.m
diff --git a/src/matlab_octave/mixedBC.m b/src/octave/mixedBC.m
similarity index 100%
rename from src/matlab_octave/mixedBC.m
rename to src/octave/mixedBC.m
diff --git a/src/matlab_octave/mixedBC2D.m b/src/octave/mixedBC2D.m
similarity index 100%
rename from src/matlab_octave/mixedBC2D.m
rename to src/octave/mixedBC2D.m
diff --git a/src/matlab_octave/mixedBC3D.m b/src/octave/mixedBC3D.m
similarity index 100%
rename from src/matlab_octave/mixedBC3D.m
rename to src/octave/mixedBC3D.m
diff --git a/src/matlab_octave/neumann2DCurv.m b/src/octave/neumann2DCurv.m
similarity index 100%
rename from src/matlab_octave/neumann2DCurv.m
rename to src/octave/neumann2DCurv.m
diff --git a/src/matlab_octave/neumann3DCurv.m b/src/octave/neumann3DCurv.m
similarity index 100%
rename from src/matlab_octave/neumann3DCurv.m
rename to src/octave/neumann3DCurv.m
diff --git a/src/matlab_octave/nodal.m b/src/octave/nodal.m
similarity index 100%
rename from src/matlab_octave/nodal.m
rename to src/octave/nodal.m
diff --git a/src/matlab_octave/nodal2D.m b/src/octave/nodal2D.m
similarity index 100%
rename from src/matlab_octave/nodal2D.m
rename to src/octave/nodal2D.m
diff --git a/src/matlab_octave/nodal2DCurv.m b/src/octave/nodal2DCurv.m
similarity index 100%
rename from src/matlab_octave/nodal2DCurv.m
rename to src/octave/nodal2DCurv.m
diff --git a/src/matlab_octave/nodal3D.m b/src/octave/nodal3D.m
similarity index 100%
rename from src/matlab_octave/nodal3D.m
rename to src/octave/nodal3D.m
diff --git a/src/matlab_octave/nodal3DCurv.m b/src/octave/nodal3DCurv.m
similarity index 100%
rename from src/matlab_octave/nodal3DCurv.m
rename to src/octave/nodal3DCurv.m
diff --git a/src/matlab_octave/rk4.m b/src/octave/rk4.m
similarity index 100%
rename from src/matlab_octave/rk4.m
rename to src/octave/rk4.m
diff --git a/src/matlab_octave/robinBC.m b/src/octave/robinBC.m
similarity index 100%
rename from src/matlab_octave/robinBC.m
rename to src/octave/robinBC.m
diff --git a/src/matlab_octave/robinBC2D.m b/src/octave/robinBC2D.m
similarity index 100%
rename from src/matlab_octave/robinBC2D.m
rename to src/octave/robinBC2D.m
diff --git a/src/matlab_octave/robinBC3D.m b/src/octave/robinBC3D.m
similarity index 100%
rename from src/matlab_octave/robinBC3D.m
rename to src/octave/robinBC3D.m
diff --git a/src/matlab_octave/sidedNodal.m b/src/octave/sidedNodal.m
similarity index 100%
rename from src/matlab_octave/sidedNodal.m
rename to src/octave/sidedNodal.m
diff --git a/src/matlab_octave/tensorGrad2D.m b/src/octave/tensorGrad2D.m
similarity index 100%
rename from src/matlab_octave/tensorGrad2D.m
rename to src/octave/tensorGrad2D.m
diff --git a/src/matlab_octave/tfi.m b/src/octave/tfi.m
similarity index 100%
rename from src/matlab_octave/tfi.m
rename to src/octave/tfi.m
diff --git a/src/matlab_octave/ttm.m b/src/octave/ttm.m
similarity index 100%
rename from src/matlab_octave/ttm.m
rename to src/octave/ttm.m
diff --git a/src/matlab_octave/weightsP.m b/src/octave/weightsP.m
similarity index 100%
rename from src/matlab_octave/weightsP.m
rename to src/octave/weightsP.m
diff --git a/src/matlab_octave/weightsP2D.m b/src/octave/weightsP2D.m
similarity index 100%
rename from src/matlab_octave/weightsP2D.m
rename to src/octave/weightsP2D.m
diff --git a/src/matlab_octave/weightsQ.m b/src/octave/weightsQ.m
similarity index 100%
rename from src/matlab_octave/weightsQ.m
rename to src/octave/weightsQ.m
diff --git a/src/matlab_octave/weightsQ2D.m b/src/octave/weightsQ2D.m
similarity index 100%
rename from src/matlab_octave/weightsQ2D.m
rename to src/octave/weightsQ2D.m
diff --git a/tests/matlab_octave/CMakeLists.txt b/tests/octave/CMakeLists.txt
similarity index 53%
rename from tests/matlab_octave/CMakeLists.txt
rename to tests/octave/CMakeLists.txt
index a20e0de6e..bee31a4d0 100644
--- a/tests/matlab_octave/CMakeLists.txt
+++ b/tests/octave/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Find all MATLAB/Octave test files (test*.m)
+# Find all GNU Octave test files (test*.m)
 file(GLOB TEST_SOURCES test*.m)
 
 # Enable testing
 enable_testing()
 
-# Loop through all MATLAB/Octave test files and register them as tests
+# Loop through all GNU Octave test files and register them as tests
 foreach(TEST_SOURCE ${TEST_SOURCES})
     get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
 
@@ -13,13 +13,13 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
         COMMAND matlab
           -nojvm
           -batch
-          "addpath('${CMAKE_CURRENT_SOURCE_DIR}'); addpath('${CMAKE_SOURCE_DIR}/src/matlab_octave'); assertSuccess(runtests('${TEST_NAME}'))"
+          "addpath('${CMAKE_CURRENT_SOURCE_DIR}'); addpath('${CMAKE_SOURCE_DIR}/src/octave'); assertSuccess(runtests('${TEST_NAME}'))"
     )
 endforeach()
 
-# Custom target to run all MATLAB/Octave tests using CTest
-add_custom_target(run_matlab_octave_tests
+# Custom target to run all GNU Octave tests using CTest
+add_custom_target(run_octave_tests
     COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
-    COMMENT "Running all MATLAB/Octave unit tests..."
+    COMMENT "Running all GNU Octave unit tests..."
 )
 
diff --git a/tests/matlab_octave/testAddScalarBC.m b/tests/octave/testAddScalarBC.m
similarity index 98%
rename from tests/matlab_octave/testAddScalarBC.m
rename to tests/octave/testAddScalarBC.m
index 064a12380..48a9a96dd 100644
--- a/tests/matlab_octave/testAddScalarBC.m
+++ b/tests/octave/testAddScalarBC.m
@@ -3,7 +3,7 @@
         function testBC1D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
 
             k = 2;
             dx = 0.1;
@@ -70,7 +70,7 @@ function testBC1D(testCase)
         function testBC2D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
 
             k = 2;
             dx = 0.1;
@@ -168,7 +168,7 @@ function testBC2D(testCase)
         function testBC3D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
 
             k = 2;
             dx = 0.1;
diff --git a/tests/matlab_octave/testBCConsistency.m b/tests/octave/testBCConsistency.m
similarity index 95%
rename from tests/matlab_octave/testBCConsistency.m
rename to tests/octave/testBCConsistency.m
index 0feaad84c..75fbb8600 100644
--- a/tests/matlab_octave/testBCConsistency.m
+++ b/tests/octave/testBCConsistency.m
@@ -4,7 +4,7 @@ function test1DCase(testCase)
             % 1D Boundary Conditions Consistency Test
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
             
             k = 4;  % Order of accuracy
             m = 50; % Number of cells
@@ -39,7 +39,7 @@ function test2DCase(testCase)
             % 2D Boundary Conditions Consistency Test
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
             
             k = 4;  % Order of accuracy
             m = 50; % Number of cells (x-direction)
@@ -57,7 +57,7 @@ function test3DCase(testCase)
             % 3D Boundary Conditions Consistency Test
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'));
+            addpath(genpath('../../src/octave'));
             
             k = 4;  % Order of accuracy
             m = 50; % Number of cells (x-direction)
diff --git a/tests/matlab_octave/testDivPolynomial.m b/tests/octave/testDivPolynomial.m
similarity index 96%
rename from tests/matlab_octave/testDivPolynomial.m
rename to tests/octave/testDivPolynomial.m
index d4acb20bc..0264ba886 100644
--- a/tests/matlab_octave/testDivPolynomial.m
+++ b/tests/octave/testDivPolynomial.m
@@ -3,7 +3,7 @@
         function testDivOfPolynomial1D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
@@ -33,7 +33,7 @@ function testDivOfPolynomial1D(testCase)
         function testDivOfPolynomial2D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
@@ -84,7 +84,7 @@ function testDivOfPolynomial2D(testCase)
         function testDivOfPolynomial3D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
diff --git a/tests/matlab_octave/testDivergence.m b/tests/octave/testDivergence.m
similarity index 92%
rename from tests/matlab_octave/testDivergence.m
rename to tests/octave/testDivergence.m
index 223300e07..85f1cb3e6 100644
--- a/tests/matlab_octave/testDivergence.m
+++ b/tests/octave/testDivergence.m
@@ -3,7 +3,7 @@
         function testNullityOfDivergence(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-10;
diff --git a/tests/matlab_octave/testEnergy.m b/tests/octave/testEnergy.m
similarity index 95%
rename from tests/matlab_octave/testEnergy.m
rename to tests/octave/testEnergy.m
index 5b4ae280d..25b04d3f8 100644
--- a/tests/matlab_octave/testEnergy.m
+++ b/tests/octave/testEnergy.m
@@ -3,7 +3,7 @@
         function testforEnergy(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             %parameteres
             k = 4;
diff --git a/tests/matlab_octave/testGradPolynomial.m b/tests/octave/testGradPolynomial.m
similarity index 96%
rename from tests/matlab_octave/testGradPolynomial.m
rename to tests/octave/testGradPolynomial.m
index b5100fbab..a7068058b 100644
--- a/tests/matlab_octave/testGradPolynomial.m
+++ b/tests/octave/testGradPolynomial.m
@@ -3,7 +3,7 @@
         function testGradOfPolynomial1D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
@@ -32,7 +32,7 @@ function testGradOfPolynomial1D(testCase)
         function testGradOfPolynomial2D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
@@ -82,7 +82,7 @@ function testGradOfPolynomial2D(testCase)
         function testGradOfPolynomial3D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-11;
diff --git a/tests/matlab_octave/testGradient.m b/tests/octave/testGradient.m
similarity index 91%
rename from tests/matlab_octave/testGradient.m
rename to tests/octave/testGradient.m
index 3c18c5116..f80561823 100644
--- a/tests/matlab_octave/testGradient.m
+++ b/tests/octave/testGradient.m
@@ -3,7 +3,7 @@
         function testNullityofGradient(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks=[2,4,6,8];
             tol = 1e-10;
diff --git a/tests/matlab_octave/testLapPolynomial.m b/tests/octave/testLapPolynomial.m
similarity index 96%
rename from tests/matlab_octave/testLapPolynomial.m
rename to tests/octave/testLapPolynomial.m
index fc06c8d16..68151bfbf 100644
--- a/tests/matlab_octave/testLapPolynomial.m
+++ b/tests/octave/testLapPolynomial.m
@@ -3,7 +3,7 @@
         function testLapOfPolynomial1D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-10;
@@ -32,7 +32,7 @@ function testLapOfPolynomial1D(testCase)
         function testLapOfPolynomial2D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-10;
@@ -79,7 +79,7 @@ function testLapOfPolynomial2D(testCase)
         function testLapOfPolynomial3D(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks = [2, 4, 6, 8];  % Different orders of accuracy
             tol = 1e-10;
diff --git a/tests/matlab_octave/testLaplacian.m b/tests/octave/testLaplacian.m
similarity index 91%
rename from tests/matlab_octave/testLaplacian.m
rename to tests/octave/testLaplacian.m
index 7c98eaff9..65b1a07c7 100644
--- a/tests/matlab_octave/testLaplacian.m
+++ b/tests/octave/testLaplacian.m
@@ -3,7 +3,7 @@
         function testNullityofLaplacian(testCase)
             origPath = path;
             cleanupObj = onCleanup(@() path(origPath));
-            addpath(genpath('../../src/matlab_octave'))
+            addpath(genpath('../../src/octave'))
             
             ks=[2,4,6,8];
             tol = 1e-10;
diff --git a/tests/matlab_octave/testPoissonAccuracy.m b/tests/octave/testPoissonAccuracy.m
similarity index 100%
rename from tests/matlab_octave/testPoissonAccuracy.m
rename to tests/octave/testPoissonAccuracy.m