diff --git a/matlab/+pac/+bgp/get.m b/matlab/pac-tools/+pac/+bgp/get.m
similarity index 100%
rename from matlab/+pac/+bgp/get.m
rename to matlab/pac-tools/+pac/+bgp/get.m
diff --git a/matlab/+pac/+bgp/set.m b/matlab/pac-tools/+pac/+bgp/set.m
similarity index 100%
rename from matlab/+pac/+bgp/set.m
rename to matlab/pac-tools/+pac/+bgp/set.m
diff --git a/matlab/warning_config.m b/matlab/warning_config.m
index 930e72db061ebfbb8f978630d6c24ab1d5d7d84f..8970917b25efea0bbd544d62359a31321c728fdc 100644
--- a/matlab/warning_config.m
+++ b/matlab/warning_config.m
@@ -49,9 +49,11 @@ if isoctave
     warning('off', 'Octave:classdef-to-struct');
     warning('off', 'Octave:legacy-function'); % For strmatch and isdir
 
-    % The following is necessary because of matlab/+pac/+bgp/{get,set}.m
+    % The following is necessary because of matlab/pac-tools/+pac/+bgp/{get,set}.m
     % which triggers this bug: https://savannah.gnu.org/bugs/?46849
-    % The warning can be reenabled once the bug is fixed.
+    % The warning can be reenabled once the bug is fixed (and the files
+    % mentioned above can then be moved back to matlab/+pac/+bgp/,
+    % see #1817).
     warning('off', 'Octave:shadowed-function');
 else
     % In MATLAB >= 7.7, don't display a warning if we use deprecated