diff --git a/demo/README.txt b/demo/README.txt
new file mode 100644
index 0000000..8d14569
--- /dev/null
+++ b/demo/README.txt
@@ -0,0 +1,6 @@
+== RemoteApplications Demo ==
+
+This is a simple demonstration using RemoteApplications library.
+
+Up to date instructions for running the demo are online at:
+http://code.google.com/p/robotframework-remoteapplications/wiki/Demo
diff --git a/doc/example/lib/example_application.jar b/demo/lib/example_application.jar
similarity index 100%
rename from doc/example/lib/example_application.jar
rename to demo/lib/example_application.jar
diff --git a/doc/example/lib/swinglibrary-1.1.1.jar b/demo/lib/swinglibrary-1.1.1.jar
similarity index 100%
rename from doc/example/lib/swinglibrary-1.1.1.jar
rename to demo/lib/swinglibrary-1.1.1.jar
diff --git a/doc/example/robot-tests/javaws_application.txt b/demo/robot-tests/javaws_application.txt
similarity index 100%
rename from doc/example/robot-tests/javaws_application.txt
rename to demo/robot-tests/javaws_application.txt
diff --git a/doc/example/robot-tests/standalone_application.txt b/demo/robot-tests/standalone_application.txt
similarity index 100%
rename from doc/example/robot-tests/standalone_application.txt
rename to demo/robot-tests/standalone_application.txt
diff --git a/doc/example/run.py b/demo/run.py
similarity index 100%
rename from doc/example/run.py
rename to demo/run.py
diff --git a/doc/example/src/main/java/org/robotframework/example/Application.java b/demo/src/main/java/org/robotframework/example/Application.java
similarity index 100%
rename from doc/example/src/main/java/org/robotframework/example/Application.java
rename to demo/src/main/java/org/robotframework/example/Application.java
diff --git a/doc/example/README.txt b/doc/example/README.txt
deleted file mode 100644
index b24f57e..0000000
--- a/doc/example/README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-== RemoteApplications Demo ==
-
-This is a simple demonstration using RemoteApplications library.
-
-There are two examples: both for connecting to a standalone application and
-connecting to a Java Web Start application. The standalone example uses
-pre-built application from `lib` directory and the Web Start example connects
-to RemoteApplications project pages to download the application.
-
-The test cases are in separate files under `robot-tests` directory.
-
-To run both the test cases, execute:
-
-  python run.py robot-tests
diff --git a/create_example.py b/package_demo.py
similarity index 73%
rename from create_example.py
rename to package_demo.py
index b8c4530..47aa80c 100755
--- a/create_example.py
+++ b/package_demo.py
@@ -8,11 +8,10 @@
 import zipfile
 
 _ROOT = os.path.abspath(os.path.dirname(__file__))
-DOC = os.path.join(_ROOT, 'doc')
-EXAMPLE = os.path.join(DOC, 'example')
+DEMO = os.path.join(_ROOT, 'demo')
 TARGET = os.path.join(_ROOT, 'target')
-LIB = os.path.join(EXAMPLE, 'lib')
-TESTS = os.path.join(EXAMPLE, 'robot-tests')
+LIB = os.path.join(DEMO, 'lib')
+TESTS = os.path.join(DEMO, 'robot-tests')
 
 
 def main():
@@ -31,17 +30,17 @@ def _run_tests():
         sys.exit(1)
 
 def _run():
-    runner = os.path.join(EXAMPLE, 'run.py')
+    runner = os.path.join(DEMO, 'run.py')
     return subprocess.call(['python', runner, TESTS],
                            shell=os.name=='nt')
 
 def _zip_example():
-    zip_target_path = os.path.join(TARGET, 'remoteapplications_example.zip')
+    zip_target_path = os.path.join(TARGET, 'remoteapplications-demo.zip')
     zip = zipfile.ZipFile(zip_target_path, 'w')
-    paths = _get_paths([(LIB, '*.jar'), (TESTS, '*.*'), (EXAMPLE, '*.*')])
+    paths = _get_paths([(LIB, '*.jar'), (TESTS, '*.*'), (DEMO, '*.*')])
     print 'Zipping files...'
     for path in paths:
-    	path_in_zip_file = path.replace(DOC, '')
+    	path_in_zip_file = path.replace(DEMO, 'remoteapplications-demo')
     	print '  %s' % (path_in_zip_file)
         zip.write(path, path_in_zip_file)
     print "Created zip file '%s'." % (zip_target_path)