diff --git a/examples/jenkins.py b/examples/jenkins/create.py
similarity index 80%
rename from examples/jenkins.py
rename to examples/jenkins/create.py
index b4b624c5..4f44ae0d 100644
--- a/examples/jenkins.py
+++ b/examples/jenkins/create.py
@@ -16,7 +16,7 @@ Example Create a jenkins server
 Create all the pieces parts to get a jenkins server up and running.
 
 To run:
-    python examples/jenkins.py
+    python examples/jenkins/create.py
 """
 
 import base64
@@ -44,7 +44,6 @@ def create_jenkins(conn, name, opts):
             "name": name,
             "flavorRef": flavor,
             "imageRef": image,
-            "imageRef": image,
             "key_name": name,
             "networks": [{"uuid": net.id}],
             "user_data": b64str,
@@ -72,28 +71,9 @@ def create_jenkins(conn, name, opts):
     return
 
 
-def delete_jenkins(conn, name, opts):
-    server = conn.compute.find_server(name)
-    if server is not None:
-        server = conn.get(server)
-        print(str(server))
-        ips = server.get_floating_ips()
-        for ip in ips:
-            print(str(ip))
-            ip = conn.network.find_ip(ip)
-            conn.network.remove_ip_from_port(ip)
-            conn.delete(ip)
-        conn.delete(server)
-
-    network.delete(conn, name)
-
-
 def run_jenkins(opts):
-    argument = opts.argument
     conn = connection.make_connection(opts)
     name = opts.data.pop('name', 'jenkins')
-    if argument == "delete":
-        return(delete_jenkins(conn, name, opts))
     return(create_jenkins(conn, name, opts))
 
 
diff --git a/examples/jenkins/delete.py b/examples/jenkins/delete.py
new file mode 100644
index 00000000..69086d84
--- /dev/null
+++ b/examples/jenkins/delete.py
@@ -0,0 +1,53 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""
+Example Delete a jenkins server
+
+Delete all the pieces parts to your jenkins server.
+
+To run:
+    python examples/jenkins/delete.py
+"""
+
+import sys
+
+from examples import common
+from examples import connection
+from examples import network
+
+
+def delete_jenkins(conn, name, opts):
+    server = conn.compute.find_server(name)
+    if server is not None:
+        server = conn.get(server)
+        print(str(server))
+        ips = server.get_floating_ips()
+        for ip in ips:
+            print(str(ip))
+            ip = conn.network.find_ip(ip)
+            conn.network.remove_ip_from_port(ip)
+            conn.delete(ip)
+        conn.delete(server)
+
+    network.delete(conn, name)
+
+
+def run_jenkins(opts):
+    conn = connection.make_connection(opts)
+    name = opts.data.pop('name', 'jenkins')
+    return(delete_jenkins(conn, name, opts))
+
+
+if __name__ == "__main__":
+    opts = common.setup()
+    sys.exit(common.main(opts, run_jenkins))