Index: docs/sphinx-docs/source/user/user.rst
===================================================================
--- docs/sphinx-docs/source/user/user.rst	(revision 2e5ca089b3452d373071786c8aa58afa098b3734)
+++ docs/sphinx-docs/source/user/user.rst	(revision e0bbb7c77043bded2a28ecb9af676f5e8c2af3f7)
@@ -6,36 +6,36 @@
 .. toctree::
    :maxdepth: 1
+
+   Model Documentation <models/model_functions>
+
+   Data Formats <sasgui/guiframe/data_formats_help>
    
-   Model Documentation <models/model_functions>
+   Loading Data <sasgui/guiframe/data_explorer_help>
    
-   Data Formats <guiframe/data_formats_help>
+   Plotting Data/Models <sasgui/guiframe/graph_help>
    
-   Loading Data <guiframe/data_explorer_help>
+   Fitting Perspective <sasgui/perspectives/fitting/fitting>
    
-   Plotting Data/Models <guiframe/graph_help>
+   P(r) Inversion Perspective <sasgui/perspectives/pr/pr_help>
    
-   Fitting Perspective <perspectives/fitting/fitting>
+   Invariant Calculation Perspective <sasgui/perspectives/invariant/invariant_help>
    
-   P(r) Inversion Perspective <perspectives/pr/pr_help>
+   Data Operations Tool <sasgui/perspectives/calculator/data_operator_help>
+      
+   Density/Volume Calculator Tool <sasgui/perspectives/calculator/density_calculator_help>
    
-   Invariant Calculation Perspective <perspectives/invariant/invariant_help>
+   Generic SANS Calculator Tool <sasgui/perspectives/calculator/sas_calculator_help>
    
-   Data Operations Tool <perspectives/calculator/data_operator_help>
-      
-   Density/Volume Calculator Tool <perspectives/calculator/density_calculator_help>
+   Image Viewer Tool <sasgui/perspectives/calculator/image_viewer_help>
    
-   Generic SANS Calculator Tool <perspectives/calculator/sas_calculator_help>
+   Kiessig Thickness Calculator Tool <sasgui/perspectives/calculator/kiessig_calculator_help>
    
-   Image Viewer Tool <perspectives/calculator/image_viewer_help>
-      
-   Kiessig Thickness Calculator Tool <perspectives/calculator/kiessig_calculator_help>
+   SLD Calculator Tool <sasgui/perspectives/calculator/sld_calculator_help>
    
-   SLD Calculator Tool <perspectives/calculator/sld_calculator_help>
+   Slit Size Calculator Tool <sasgui/perspectives/calculator/slit_calculator_help>
    
-   Slit Size Calculator Tool <perspectives/calculator/slit_calculator_help>
+   Q Resolution Estimator Tool <sasgui/perspectives/calculator/resolution_calculator_help>
    
-   Q Resolution Estimator Tool <perspectives/calculator/resolution_calculator_help>
-   
-   Python Shell Tool <perspectives/calculator/python_shell_help>
-   
+   Python Shell Tool <sasgui/perspectives/calculator/python_shell_help>
+
    Test Data <../test/testdata_help.rst>
Index: setup.py
===================================================================
--- setup.py	(revision 4adf48e6377f8f7256f7048f4bb7a48df44c8007)
+++ setup.py	(revision e0bbb7c77043bded2a28ecb9af676f5e8c2af3f7)
@@ -164,7 +164,15 @@
 packages.append("sas")
 
-# sas.invariant
-package_dir["sas.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
-packages.extend(["sas.invariant"])
+# sas module
+package_dir["sas.sasgui"] = os.path.join("src", "sas", "sasgui")
+packages.append("sas.sasgui")
+
+# sas module
+package_dir["sas.sascalc"] = os.path.join("src", "sas", "sascalc")
+packages.append("sas.sascalc")
+
+# sas.sascalc.invariant
+package_dir["sas.sascalc.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
+packages.extend(["sas.sascalc.invariant"])
 
 # sas.sasgui.guiframe
@@ -181,11 +189,11 @@
         package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", d)
 
-# sas.dataloader
-package_dir["sas.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
-package_data["sas.dataloader.readers"] = ['defaults.json','schema/*.xsd']
-packages.extend(["sas.dataloader","sas.dataloader.readers","sas.dataloader.readers.schema"])
-
-# sas.calculator
-package_dir["sas.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
+# sas.sascalc.dataloader
+package_dir["sas.sascalc.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
+package_data["sas.sascalc.dataloader.readers"] = ['defaults.json','schema/*.xsd']
+packages.extend(["sas.sascalc.dataloader","sas.sascalc.dataloader.readers","sas.sascalc.dataloader.readers.schema"])
+
+# sas.sascalc.calculator
+package_dir["sas.sascalc.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
 packages.extend(["sas.sascalc.calculator"])
     
@@ -227,5 +235,5 @@
     
 # Data util
-package_dir["data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
+package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
 packages.append("sas.sascalc.data_util")
 
