diff --git a/VERSION b/VERSION
index a3c25e38..3990eafc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.08.27.16.17.15
+Version 2.6.0-development+timestamp.2013.08.27.16.49.41
diff --git a/handlers/README b/handlers/README
new file mode 100644
index 00000000..d999feca
--- /dev/null
+++ b/handlers/README
@@ -0,0 +1,3 @@
+This folder contains example files. 
+They much be copied to the web2py root folder in order to work properly.
+They should not be linked in the handlers folder.
diff --git a/cgihandler.py b/handlers/cgihandler.py
similarity index 100%
rename from cgihandler.py
rename to handlers/cgihandler.py
diff --git a/fcgihandler.py b/handlers/fcgihandler.py
similarity index 100%
rename from fcgihandler.py
rename to handlers/fcgihandler.py
diff --git a/gaehandler.py b/handlers/gaehandler.py
similarity index 100%
rename from gaehandler.py
rename to handlers/gaehandler.py
diff --git a/isapiwsgihandler.py b/handlers/isapiwsgihandler.py
similarity index 100%
rename from isapiwsgihandler.py
rename to handlers/isapiwsgihandler.py
diff --git a/modpythonhandler.py b/handlers/modpythonhandler.py
similarity index 100%
rename from modpythonhandler.py
rename to handlers/modpythonhandler.py
diff --git a/scgihandler.py b/handlers/scgihandler.py
similarity index 100%
rename from scgihandler.py
rename to handlers/scgihandler.py
diff --git a/wsgihandler.py b/handlers/wsgihandler.py
similarity index 100%
rename from wsgihandler.py
rename to handlers/wsgihandler.py