diff --git a/web/ajax/modal.php b/web/ajax/modal.php
index 64200f559..4166e72e8 100644
--- a/web/ajax/modal.php
+++ b/web/ajax/modal.php
@@ -9,10 +9,6 @@ $modal = validJsStr($_REQUEST['modal']);
 $data = array();
 
 switch ( $modal ) {
-  case 'storage' :
-    if ( !isset($_REQUEST['id']) ) ajaxError('Storage Id Not Provided');
-    $data['html'] = getStorageModalHTML($_REQUEST['id']);
-    break;
   case 'server' :
     if ( !isset($_REQUEST['id']) ) ajaxError('Storage Id Not Provided');
     $data['html'] = getServerModalHTML($_REQUEST['id']);
diff --git a/web/ajax/modals/storage.php b/web/ajax/modals/storage.php
new file mode 100644
index 000000000..638fcfd82
--- /dev/null
+++ b/web/ajax/modals/storage.php
@@ -0,0 +1,110 @@
+<?php
+// This is the HTML representing the Storage modal from Options -> Storage
+  if ( !isset($_REQUEST['id']) ) {
+    ajaxError('Storage Id Not Provided');
+    return;
+  }
+
+  $null = '';
+  $checked = 'checked="checked"';
+  $sid = $_REQUEST['id'];
+  
+  if ( !canEdit('System') ) return;
+
+  require_once('includes/Server.php');
+  require_once('includes/Storage.php');
+
+  if ( $_REQUEST['id'] ) {
+    if ( !($newStorage = ZM\Storage::find_one(array('Id'=>$sid)) ) ) {
+      // Perhaps do something different here, rather than return nothing
+      return;
+    }
+  } else {
+    $newStorage = new ZM\Storage();
+    $newStorage->Name(translate('NewStorage'));
+  }
+
+  $type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
+  $scheme_options = array(
+    'Deep' => translate('Deep'),
+    'Medium' => translate('Medium'),
+    'Shallow' => translate('Shallow'),
+  );
+
+  $servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
+  $ServersById = array();
+  foreach ( $servers as $S ) {
+    $ServersById[$S->Id()] = $S;
+  }
+
+?>
+<div class="modal fade" id="storageModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Storage') .' - '. $newStorage->Name() ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="storageModalForm" name="contentForm" method="post" action="?view=storage&action=save" class="validateFormOnSubmit">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="storage"/>
+        <input type="hidden" name="object" value="storage"/>
+        <input type="hidden" name="id" value="' .validHtmlStr($sid). '"/>
+        <table class="major table-sm">
+          <tbody>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage->Name() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Path') ?></th>
+              <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage->Path() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Url') ?></th>
+              <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage->Url() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Server') ?></th>
+              <td><?php echo htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th>
+              <td><?php echo htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageScheme') ?></th>
+              <td><?php echo htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageDoDelete') ?></th>
+              <td>
+              <input type="radio" name="newStorage[DoDelete]" value="1" <?php echo $newStorage->DoDelete() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[DoDelete]" value="0" <?php echo $newStorage->DoDelete() ? $null : $checked ?>>No
+              </td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Enabled') ?></th>
+              <td>
+              <input type="radio" name="newStorage[Enabled]" value="1" <?php echo $newStorage->Enabled() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[Enabled]" value="0" <?php echo $newStorage->Enabled() ? $null : $checked ?>>No
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button name="action" id="storageSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index fdabfce04..b663178ab 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -815,110 +815,6 @@ function getStatsTableHTML($eid, $fid, $row='') {
   return $result;
 }
 
-function getStorageModalHTML($sid) {
-  $result = '';
-  $null = '';
-  $checked = 'checked="checked"';
-  
-  if ( !canEdit('System') ) return;
-
-  require_once('includes/Server.php');
-  require_once('includes/Storage.php');
-
-  if ( $_REQUEST['id'] ) {
-    if ( !($newStorage = ZM\Storage::find_one(array('Id'=>$sid)) ) ) {
-      // Perhaps do something different here, rather than return nothing
-      return;
-    }
-  } else {
-    $newStorage = new ZM\Storage();
-    $newStorage->Name(translate('NewStorage'));
-  }
-
-  $type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
-  $scheme_options = array(
-    'Deep' => translate('Deep'),
-    'Medium' => translate('Medium'),
-    'Shallow' => translate('Shallow'),
-  );
-
-  $servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
-  $ServersById = array();
-  foreach ( $servers as $S ) {
-    $ServersById[$S->Id()] = $S;
-  }
-
-  $result .= '<div class="modal fade" id="storageModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">'.PHP_EOL;
-    $result .= '<div class="modal-dialog">'.PHP_EOL;
-      $result .= '<div class="modal-content">'.PHP_EOL;
-        $result .= '<div class="modal-header">'.PHP_EOL;
-          $result .= '<h5 class="modal-title">' .translate('Storage').' - '.$newStorage->Name(). '</h5>'.PHP_EOL;
-          $result .= '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'.PHP_EOL;
-            $result .= '<span aria-hidden="true">&times;</span>'.PHP_EOL;
-          $result .= '</button>'.PHP_EOL;
-        $result .= '</div>'.PHP_EOL;
-        $result .= '<div class="modal-body">'.PHP_EOL;
-        $result .= '<form id="storageModalForm" name="contentForm" method="post" action="?view=storage&action=save" class="validateFormOnSubmit">'.PHP_EOL;
-          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
-          $result .= getCSRFinputHTML();
-          $result .= '<input type="hidden" name="view" value="storage"/>'.PHP_EOL;
-          $result .= '<input type="hidden" name="object" value="storage"/>'.PHP_EOL;
-          $result .= '<input type="hidden" name="id" value="' .validHtmlStr($sid). '"/>'.PHP_EOL;
-          $result .= '<table class="major table-sm">'.PHP_EOL;
-            $result .= '<tbody>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Name'). '</th>'.PHP_EOL;
-                $result .= '<td><input type="text" name="newStorage[Name]" value="' .$newStorage->Name(). '"/></td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Path'). '</th>'.PHP_EOL;
-                $result .= '<td><input type="text" name="newStorage[Path]" value="' .$newStorage->Path(). '"/></td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Url'). '</th>'.PHP_EOL;
-                $result .= '<td><input type="text" name="newStorage[Url]" value="' .$newStorage->Url(). '"/></td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Server'). '</th>'.PHP_EOL;
-                $result .= '<td>' .htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()). '</td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Type'). '</th>'.PHP_EOL;
-                $result .= '<td>' .htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()). '</td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('StorageScheme'). '</th>'.PHP_EOL;
-                $result .= '<td>' .htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()). '</td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('StorageDoDelete'). '</th>'.PHP_EOL;
-                $result .= '<td>'.PHP_EOL;
-                $result .= '<input type="radio" name="newStorage[DoDelete]" value="1" ' .($newStorage->DoDelete() ? $checked : $null). '>Yes'.PHP_EOL;
-                $result .= '<input type="radio" name="newStorage[DoDelete]" value="0" ' .($newStorage->DoDelete() ? $null : $checked). '>No'.PHP_EOL;
-                $result .= '</td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-              $result .= '<tr>'.PHP_EOL;
-                $result .= '<th class="text-right pr-3" scope="row">' .translate('Enabled'). '</th>'.PHP_EOL;
-                $result .= '<td>'.PHP_EOL;
-                $result .= '<input type="radio" name="newStorage[Enabled]" value="1" ' .($newStorage->Enabled() ? $checked : $null). '>Yes'.PHP_EOL;
-                $result .= '<input type="radio" name="newStorage[Enabled]" value="0" ' .($newStorage->Enabled() ? $null : $checked). '>No'.PHP_EOL;
-                $result .= '</td>'.PHP_EOL;
-              $result .= '</tr>'.PHP_EOL;
-            $result .= '</tbody>'.PHP_EOL;
-          $result .= '</table>'.PHP_EOL;
-        $result .= '</div>'.PHP_EOL;
-        $result .= '<div class="modal-footer">'.PHP_EOL;
-          $result .= '<button name="action" id="storageSubmitBtn" type="submit" class="btn btn-primary" value="Save">' .translate('Save'). '</button>'.PHP_EOL;
-          $result .= '<button type="button" class="btn btn-secondary" data-dismiss="modal">' .translate('Cancel'). '</button>'.PHP_EOL;
-        $result .= '</div>'.PHP_EOL;
-      $result .= '</form>'.PHP_EOL;
-      $result .= '</div>'.PHP_EOL;
-    $result .= '</div>'.PHP_EOL;
-  $result .= '</div>'.PHP_EOL;
-
-  return $result;
-}
-
 function getEventDetailHTML($eid='', $eids='') {
   $result = '';
   $inputs = '';