diff --git a/api-ref/source/servers-action-fixed-ip.inc b/api-ref/source/servers-action-fixed-ip.inc
index 502085eca372..f9a7a1c83d66 100644
--- a/api-ref/source/servers-action-fixed-ip.inc
+++ b/api-ref/source/servers-action-fixed-ip.inc
@@ -27,7 +27,7 @@ Request
 
 **Example Add (Associate) Fixed Ip (Addfixedip Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/multinic-add-fixed-ip-req.json
+.. literalinclude:: ../../doc/api_samples/os-multinic/multinic-add-fixed-ip-req.json
    :language: javascript
 
 Response
@@ -60,7 +60,7 @@ Request
 
 **Example Remove (Disassociate) Fixed Ip (Removefixedip Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/multinic-remove-fixed-ip-req.json
+.. literalinclude:: ../../doc/api_samples/os-multinic/multinic-remove-fixed-ip-req.json
    :language: javascript
 
 Response
diff --git a/api-ref/source/servers-action-remote-consoles.inc b/api-ref/source/servers-action-remote-consoles.inc
index 64e43a7c6f37..75b374996112 100644
--- a/api-ref/source/servers-action-remote-consoles.inc
+++ b/api-ref/source/servers-action-remote-consoles.inc
@@ -25,7 +25,7 @@ Request
 
 **Example Get Rdp Console (Os-Getrdpconsole Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getRDPConsole-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-rdp-console-post-req.json
    :language: javascript
 
 Response
@@ -33,7 +33,7 @@ Response
 
 **Example Get Rdp Console (Os-Getrdpconsole Action): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getRDPConsole-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-rdp-console-post-resp.json
    :language: javascript
 
 Get Serial Console (Os-Getserialconsole Action)
@@ -61,7 +61,7 @@ Request
 
 **Example Get Serial Console (Os-Getserialconsole Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getSerialConsole-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-serial-console-post-req.json
    :language: javascript
 
 Response
@@ -69,7 +69,7 @@ Response
 
 **Example Get Serial Console (Os-Getserialconsole Action): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getSerialConsole-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-serial-console-post-resp.json
    :language: javascript
 
 Get Spice Console (Os-Getspiceconsole Action)
@@ -97,7 +97,7 @@ Request
 
 **Example Get Spice Console (Os-Getspiceconsole Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getSPICEConsole-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-spice-console-post-req.json
    :language: javascript
 
 Response
@@ -105,7 +105,7 @@ Response
 
 **Example Get Spice Console (Os-Getspiceconsole Action): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getSPICEConsole-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-spice-console-post-resp.json
    :language: javascript
 
 Get Vnc Console (Os-Getvncconsole Action)
@@ -133,7 +133,7 @@ Request
 
 **Example Get Vnc Console (Os-Getvncconsole Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getVNCConsole-create-req.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-vnc-console-post-req.json
    :language: javascript
 
 Response
@@ -141,6 +141,6 @@ Response
 
 **Example Get Vnc Console (Os-Getvncconsole Action): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers-action/getVNCConsole-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-remote-consoles/get-vnc-console-post-resp.json
    :language: javascript
 
diff --git a/api-ref/source/servers-actions.inc b/api-ref/source/servers-actions.inc
index b3094b08e858..a840eaf43804 100644
--- a/api-ref/source/servers-actions.inc
+++ b/api-ref/source/servers-actions.inc
@@ -55,6 +55,7 @@ Request
   - address: address
   - fixed_address: fixed_address
 
+.. TODO(gmann) Need to create the sample file for this action.
 **Example Add (Associate) Floating Ip (Addfloatingip Action): JSON request**
 
 .. literalinclude:: ../../doc/api_samples/os-floating-ips/floating-ips-create-resp.json
@@ -362,7 +363,7 @@ Response
 
 **Example Rebuild Server (Rebuild Action): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers/server-action-rebuild.json
+.. literalinclude:: ../../doc/api_samples/servers/server-action-rebuild-resp.json
    :language: javascript
 
 Remove (Disassociate) Floating Ip (Removefloatingip Action)
@@ -477,7 +478,7 @@ Response
 
 **Example Extended rescue server: JSON response**
 
-.. literalinclude:: ../../doc/api_samples/os-rescue/server-get-resp-rescue.json
+.. literalinclude:: ../../doc/api_samples/os-rescue/server-rescue.json
    :language: javascript
 
 Resize Server (Resize Action)
diff --git a/api-ref/source/servers-admin-action.inc b/api-ref/source/servers-admin-action.inc
index 711118436ebf..c514a491dd9e 100644
--- a/api-ref/source/servers-admin-action.inc
+++ b/api-ref/source/servers-admin-action.inc
@@ -40,7 +40,7 @@ Request
 
 **Example Create Server Back Up (Createbackup Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/createBackup-req.json
+.. literalinclude:: ../../doc/api_samples/os-create-backup/create-backup-req.json
    :language: javascript
 
 Response
@@ -73,7 +73,7 @@ Request
 
 **Example Inject Network Information (Injectnetworkinfo Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/injectNetworkInfo-req.json
+.. literalinclude:: ../../doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json
    :language: javascript
 
 Response
@@ -106,7 +106,7 @@ Request
 
 **Example Migrate Server (Migrate Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/migrate-req.json
+.. literalinclude:: ../../doc/api_samples/os-migrate-server/migrate-server.json
    :language: javascript
 
 Response
@@ -143,7 +143,7 @@ Request
 
 **Example Live-Migrate Server (Os-Migratelive Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/os-migrateLive-req.json
+.. literalinclude:: ../../doc/api_samples/os-migrate-server/live-migrate-server.json
    :language: javascript
 
 Response
@@ -176,7 +176,7 @@ Request
 
 **Example Reset Networking On A Server (Resetnetwork Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/resetNetwork-req.json
+.. literalinclude:: ../../doc/api_samples/os-admin-actions/admin-actions-reset-network.json
    :language: javascript
 
 Response
@@ -209,7 +209,7 @@ Request
 
 **Example Reset Server State (Os-Resetstate Action): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/servers-action-admin/os-resetState-req.json
+.. literalinclude:: ../../doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json
    :language: javascript
 
 Response
diff --git a/api-ref/source/servers-multiple-create.inc b/api-ref/source/servers-multiple-create.inc
index ffa78a0e9b3f..23e0c3e504c1 100644
--- a/api-ref/source/servers-multiple-create.inc
+++ b/api-ref/source/servers-multiple-create.inc
@@ -57,7 +57,7 @@ Request
 
 **Example Create multiple servers without reservation ID: JSON request**
 
-.. literalinclude:: ../../doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
+.. literalinclude:: ../../doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json
    :language: javascript
 
 Response
@@ -74,7 +74,7 @@ Response
 
 **Example Create multiple servers without reservation ID: JSON response**
 
-.. literalinclude:: ../../doc/api_samples/servers/server-create-resp.json
+.. literalinclude:: ../../doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
    :language: javascript
 
 Create Multiple Servers With Reservation Id