diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
index 5f45a51528..0a048a050f 100644
--- a/akka-docs/intro/getting-started-first-java.rst
+++ b/akka-docs/intro/getting-started-first-java.rst
@@ -397,17 +397,25 @@ When this in done we can run our application directly inside Maven::
 
 Yippee! It is working.
 
-Overriding Configuration Externally
------------------------------------
+Overriding Configuration Externally (Optional)
+----------------------------------------------
 
 The sample project includes an ``application.conf`` file in the resources directory:
 
 .. includecode:: ../../akka-tutorials/akka-tutorial-first/src/main/resources/application.conf
 
 If you uncomment the two lines, you should see a change in performance,
-hopefully for the better. It should be noted that overriding only works if a
-router type is given, so just uncommenting ``nr-of-instances`` does not work;
-see :ref:`routing-java` for more details.
+hopefully for the better (you might want to increase the number of messages in
+the code to prolong the time the application runs). It should be noted that
+overriding only works if a router type is given, so just uncommenting
+``nr-of-instances`` does not work; see :ref:`routing-java` for more details.
+
+.. note::
+
+  Make sure that your ``application.conf`` is on the class path when you run
+  the application. If running from inside Maven that should already be the
+  case, otherwise you need to add the directory containing this file to the
+  JVM’s ``-classpath`` option.
 
 Conclusion
 ----------
diff --git a/akka-docs/intro/getting-started-first-scala-eclipse.rst b/akka-docs/intro/getting-started-first-scala-eclipse.rst
index 9d45270ebd..4e8fdfdae9 100644
--- a/akka-docs/intro/getting-started-first-scala-eclipse.rst
+++ b/akka-docs/intro/getting-started-first-scala-eclipse.rst
@@ -421,17 +421,25 @@ arguments to the JVM on the ``Arguments`` page, for instance to define where :re
 Once you finished your run configuration, click ``Run``. You should see the same output in the ``Console`` window.
 You can use the same configuration for debugging the application, by choosing ``Run/Debug History`` or just ``Debug As``.
 
-Overriding Configuration Externally
------------------------------------
+Overriding Configuration Externally (Optional)
+----------------------------------------------
 
 The sample project includes an ``application.conf`` file in the resources directory:
 
 .. includecode:: ../../akka-tutorials/akka-tutorial-first/src/main/resources/application.conf
 
 If you uncomment the two lines, you should see a change in performance,
-hopefully for the better. It should be noted that overriding only works if a
-router type is given, so just uncommenting ``nr-of-instances`` does not work;
-see :ref:`routing-java` for more details.
+hopefully for the better (you might want to increase the number of messages in
+the code to prolong the time the application runs). It should be noted that
+overriding only works if a router type is given, so just uncommenting
+``nr-of-instances`` does not work; see :ref:`routing-scala` for more details.
+
+.. note::
+
+  Make sure that your ``application.conf`` is on the class path when you run
+  the application. If running from inside SBT that should already be the case,
+  otherwise you need to add the directory containing this file to the JVM’s
+  ``-classpath`` option.
 
 Conclusion
 ----------
diff --git a/akka-docs/intro/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst
index 10386ca334..88a2b2c130 100644
--- a/akka-docs/intro/getting-started-first-scala.rst
+++ b/akka-docs/intro/getting-started-first-scala.rst
@@ -442,17 +442,25 @@ When this in done we can run our application directly inside SBT::
 
 Yippee! It is working.
 
-Overriding Configuration Externally
-===================================
+Overriding Configuration Externally (Optional)
+==============================================
 
 The sample project includes an ``application.conf`` file in the resources directory:
 
 .. includecode:: ../../akka-tutorials/akka-tutorial-first/src/main/resources/application.conf
 
 If you uncomment the two lines, you should see a change in performance,
-hopefully for the better. It should be noted that overriding only works if a
-router type is given, so just uncommenting ``nr-of-instances`` does not work;
-see :ref:`routing-scala` for more details.
+hopefully for the better (you might want to increase the number of messages in
+the code to prolong the time the application runs). It should be noted that
+overriding only works if a router type is given, so just uncommenting
+``nr-of-instances`` does not work; see :ref:`routing-scala` for more details.
+
+.. note::
+
+  Make sure that your ``application.conf`` is on the class path when you run
+  the application. If running from inside SBT that should already be the case,
+  otherwise you need to add the directory containing this file to the JVM’s
+  ``-classpath`` option.
 
 Conclusion
 ==========
diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/akka/tutorial/first/scala/Pi.scala
similarity index 100%
rename from akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
rename to akka-tutorials/akka-tutorial-first/src/main/scala/akka/tutorial/first/scala/Pi.scala