diff --git a/docs/index.rst b/docs/index.rst
index 9f1f82b94608cae988901aa5cf07800cb74e4e7b..71a56b2fdb8d385032e609917d6e97ecb2c46c61 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,7 +5,6 @@
 
 the Multiscale Object-Oriented Simulation Environment
 =====================================================
-
 What is MOOSE and what is it good for?
 --------------------------------------
 MOOSE is the Multiscale Object-Oriented Simulation Environment. It is designed to simulate neural systems ranging from subcellular components and biochemical reactions to complex models of single neurons, circuits, and large networks. MOOSE can operate at many levels of detail, from stochastic chemical computations, to multicompartment single-neuron models, to spiking neuron network models.
@@ -29,8 +28,10 @@ Contents:
    :numbered:
 
    introduction/index
-
-   user/py/index
+   user/py/quickstart/index
+   user/py/cookbook/index
+   user/py/builtins/index
+   user/py/classes/index
 
 Indices and tables
 ==================
diff --git a/docs/user/py/moose_builtins.rst b/docs/user/py/builtins/index.rst
similarity index 100%
rename from docs/user/py/moose_builtins.rst
rename to docs/user/py/builtins/index.rst
diff --git a/docs/user/py/moose_classes.rst b/docs/user/py/classes/index.rst
similarity index 100%
rename from docs/user/py/moose_classes.rst
rename to docs/user/py/classes/index.rst
diff --git a/docs/user/py/moose_cookbook.rst b/docs/user/py/cookbook/index.rst
similarity index 100%
rename from docs/user/py/moose_cookbook.rst
rename to docs/user/py/cookbook/index.rst
diff --git a/docs/user/py/index.rst b/docs/user/py/index.rst
index 1606c5d075459007c9bf3e43496ce3949580fb5b..e7f4ced96a97391acc4ef04c0d8e07a51fed6f9c 100644
--- a/docs/user/py/index.rst
+++ b/docs/user/py/index.rst
@@ -1,12 +1,9 @@
-User documentation
-=================
-
 Contents:
 
 .. toctree::
    :maxdepth: 2
 
-   moose_quickstart
-   moose_cookbook
-   moose_builtins
-   moose_classes
+   quickstart/index
+   cookbook/index
+   builtins/index
+   classes/index
diff --git a/docs/user/py/moose_quickstart.rst b/docs/user/py/quickstart/index.rst
similarity index 99%
rename from docs/user/py/moose_quickstart.rst
rename to docs/user/py/quickstart/index.rst
index 38107eb4b08ea171c232a36668c76156078ab71b..8b749313162d4df8e7b5c969e7c87362859154ee 100644
--- a/docs/user/py/moose_quickstart.rst
+++ b/docs/user/py/quickstart/index.rst
@@ -1,6 +1,6 @@
-==============================================
-Getting started with python scripting for MOOSE
-==============================================
+=====================================
+Getting started with python scripting 
+=====================================
 
 .. :Author: Subhasis Ray
 .. :Date:   December 12, 2012,