diff --git a/rally-jobs/README.rst b/rally-jobs/README.rst
index 6a905076..4f42bae7 100644
--- a/rally-jobs/README.rst
+++ b/rally-jobs/README.rst
@@ -37,4 +37,4 @@ Useful links
 
 * About plugins:  https://rally.readthedocs.org/en/latest/plugins.html
 
-* Plugin samples: https://github.com/stackforge/rally/tree/master/doc/samples/plugins
+* Plugin samples: https://github.com/stackforge/rally/tree/master/samples/plugins
diff --git a/samples/tasks/README.rst b/samples/tasks/README.rst
index 863525b9..7825f35a 100644
--- a/samples/tasks/README.rst
+++ b/samples/tasks/README.rst
@@ -27,23 +27,23 @@ General structure of configuration file:
 ScanarioClass should be a subclass of the base Scenario class
 and scenario_method specifies what benchmark task should be run. Section
 "args" is also related to scenario. To learn more about scenarios
-configuration, see samples in `doc/samples/tasks/scenarios
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/scenarios>`_.
+configuration, see samples in `samples/tasks/scenarios
+<https://github.com/stackforge/rally/tree/master/samples/tasks/scenarios>`_.
 
 Section "runners" specifies the way, how task should be run. To learn
-more about runners configurations, see samples in `doc/samples/tasks/runners
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/runners>`_.
+more about runners configurations, see samples in `samples/tasks/runners
+<https://github.com/stackforge/rally/tree/master/samples/tasks/runners>`_.
 
 Section "context" defines different types of environments in which task can
-be launched. Look at `doc/samples/tasks/contexts
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/contexts>`_
+be launched. Look at `samples/tasks/contexts
+<https://github.com/stackforge/rally/tree/master/samples/tasks/contexts>`_
 for samples.
 
 Section "sla" defines details for determining compliance with contracted values
 such as maximum error rate or minimum response time.
-Look at `doc/samples/tasks/sla
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/sla>`_ for
+Look at `samples/tasks/sla
+<https://github.com/stackforge/rally/tree/master/samples/tasks/sla>`_ for
 samples.
 
 See a `detailed description of benchmark scenarios, contexts & runners
-<https://github.com/stackforge/rally/tree/master/doc/source/concepts.rst>`_.
+<https://github.com/stackforge/rally/tree/master/source/concepts.rst>`_.
diff --git a/samples/tasks/runners/README.rst b/samples/tasks/runners/README.rst
index c3e233d5..4a00efcb 100644
--- a/samples/tasks/runners/README.rst
+++ b/samples/tasks/runners/README.rst
@@ -4,6 +4,6 @@ Runners Configuration Samples
 This directory contains task runners conficuration samples.
 
 Samples here are presented with methods of Dummy scenario. To see samples
-of usage other scenarios, go to `doc/samples/tasks/scenarios
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/scenarios>`_.
+of usage other scenarios, go to `samples/tasks/scenarios
+<https://github.com/stackforge/rally/tree/master/samples/tasks/scenarios>`_.
 
diff --git a/samples/tasks/scenarios/README.rst b/samples/tasks/scenarios/README.rst
index 07e75d64..5aa285a4 100644
--- a/samples/tasks/scenarios/README.rst
+++ b/samples/tasks/scenarios/README.rst
@@ -6,6 +6,6 @@ To successfully start this samples you may need to substitute some values
 from "args" section to actual values for your deployment.
 
 Samples here are presented with constant runner. To see samples of using
-other runners, go to `doc/samples/tasks/runners
-<https://github.com/stackforge/rally/tree/master/doc/samples/tasks/runners>`_.
+other runners, go to `samples/tasks/runners
+<https://github.com/stackforge/rally/tree/master/samples/tasks/runners>`_.
 
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json
index e0dd59cf..ee807ace 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json
@@ -15,7 +15,7 @@
                 "floating_network": "public",
                 "use_floatingip": true,
                 "force_delete": false,
-                "script": "doc/samples/tasks/support/instance_dd_test.sh",
+                "script": "samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
                 "username": "cirros"
             },
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml
index 9627c1ad..8484f074 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml
@@ -12,7 +12,7 @@
         floating_network: "public"
         use_floatingip: true
         force_delete: false
-        script: "doc/samples/tasks/support/instance_dd_test.sh"
+        script: "samples/tasks/support/instance_dd_test.sh"
         interpreter: "/bin/sh"
         username: "cirros"
       runner:
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.json b/samples/tasks/scenarios/vm/boot-runcommand-delete.json
index 5e3015cd..65586798 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete.json
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.json
@@ -10,7 +10,7 @@
                 },
                 "floating_network": "public",
                 "force_delete": false,
-                "script": "doc/samples/tasks/support/instance_dd_test.sh",
+                "script": "samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
                 "username": "cirros"
             },
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
index fa222705..70fe1d41 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
@@ -8,7 +8,7 @@
             name: "^cirros.*uec$"
         floating_network: "public"
         force_delete: false
-        script: "doc/samples/tasks/support/instance_dd_test.sh"
+        script: "samples/tasks/support/instance_dd_test.sh"
         interpreter: "/bin/sh"
         username: "cirros"
       runner: