Index: sansmodels/setup.py
===================================================================
--- sansmodels/setup.py	(revision 3e7d1613e170eb46b03ab2960a3013c0a1ca66c3)
+++ sansmodels/setup.py	(revision 73f9a6896c87711a4be612621199f762936a4db1)
@@ -49,8 +49,8 @@
     class_list = ModelFactory().getAllModels()
     for name in class_list:
-        odb = open("sans/models/pyre/%s.odb" % name, 'w')
+        odb = open("src/sans/models/pyre/%s.odb" % name, 'w')
         odb.write(createODBcontent(name))
         odb.close()
-        print "sans/models/pyre/%s.odb created" % name
+        print "src/sans/models/pyre/%s.odb created" % name
         
 #
@@ -73,6 +73,6 @@
 
 # Build the module name
-srcdir  = "sans/models/c_extensions"
-igordir = "sans/models/libigor"
+srcdir  = "src/sans/models/c_extensions"
+igordir = "src/sans/models/libigor"
 
 print "Installing SANS models"
@@ -91,5 +91,6 @@
     
     # Use the pure python modules
-    package_dir = {"sans.models.sans_extension":"sans/models/c_extensions",
+    package_dir = {"sans":"src/sans",
+                   "sans.models.sans_extension":"src/sans/models/c_extensions",
                   },
     package_data={'sans.models': [os.path.join('media', "*")]},
@@ -99,129 +100,129 @@
     ext_modules = [ Extension("sans.models.sans_extension.c_models",
      sources = [
-        "sans/models/c_models/c_models.cpp",
+        "src/sans/models/c_models/c_models.cpp",
         #srcdir+"/CSphereModel.c",
         #srcdir+"/sphere.c",
-        "sans/models/c_models/CSphereModel.cpp",
-        "sans/models/c_models/CPearlNecklaceModel.cpp",
-        "sans/models/c_models/pearlnecklace.cpp",
+        "src/sans/models/c_models/CSphereModel.cpp",
+        "src/sans/models/c_models/CPearlNecklaceModel.cpp",
+        "src/sans/models/c_models/pearlnecklace.cpp",
         srcdir+"/pearlnecklace.c",
-        "sans/models/c_models/COnionModel.cpp",
-        "sans/models/c_models/onion.cpp",
+        "src/sans/models/c_models/COnionModel.cpp",
+        "src/sans/models/c_models/onion.cpp",
         srcdir+"/onion.c",
-        "sans/models/c_models/CReflModel.cpp",
-        "sans/models/c_models/refl.cpp",
+        "src/sans/models/c_models/CReflModel.cpp",
+        "src/sans/models/c_models/refl.cpp",
         srcdir+"/refl.c",
-        "sans/models/c_models/CReflAdvModel.cpp",
-        "sans/models/c_models/refl_adv.cpp",
+        "src/sans/models/c_models/CReflAdvModel.cpp",
+        "src/sans/models/c_models/refl_adv.cpp",
         srcdir+"/refl_adv.c",
         #srcdir+"/SquareWell.c",
-        "sans/models/c_models/CSquareWellStructure.cpp",  
-        "sans/models/c_models/SquareWell.cpp", 
+        "src/sans/models/c_models/CSquareWellStructure.cpp",  
+        "src/sans/models/c_models/SquareWell.cpp", 
         #srcdir+"/StickyHS.c",         
-        "sans/models/c_models/CStickyHSStructure.cpp", 
-        "sans/models/c_models/StickyHS.cpp",              
-        "sans/models/c_models/CHardsphereStructure.cpp", 
-        "sans/models/c_models/Hardsphere.cpp",    
+        "src/sans/models/c_models/CStickyHSStructure.cpp", 
+        "src/sans/models/c_models/StickyHS.cpp",              
+        "src/sans/models/c_models/CHardsphereStructure.cpp", 
+        "src/sans/models/c_models/Hardsphere.cpp",    
         #srcdir+"/DiamCyl.c",         
-        "sans/models/c_models/CDiamCylFunc.cpp", 
-        "sans/models/c_models/DiamCyl.cpp",   
+        "src/sans/models/c_models/CDiamCylFunc.cpp", 
+        "src/sans/models/c_models/DiamCyl.cpp",   
         #srcdir+"/DiamEllip.c",         
-        "sans/models/c_models/CDiamEllipFunc.cpp", 
-        "sans/models/c_models/DiamEllip.cpp",     
+        "src/sans/models/c_models/CDiamEllipFunc.cpp", 
+        "src/sans/models/c_models/DiamEllip.cpp",     
         #srcdir+"/HayterMSA.c",         
-        "sans/models/c_models/CHayterMSAStructure.cpp", 
-        "sans/models/c_models/HayterMSA.cpp",             
-        "sans/models/c_models/sphere.cpp",
+        "src/sans/models/c_models/CHayterMSAStructure.cpp", 
+        "src/sans/models/c_models/HayterMSA.cpp",             
+        "src/sans/models/c_models/sphere.cpp",
         srcdir+"/fuzzysphere.c",
-        "sans/models/c_models/CFuzzySphereModel.cpp",
-        "sans/models/c_models/fuzzysphere.cpp",
+        "src/sans/models/c_models/CFuzzySphereModel.cpp",
+        "src/sans/models/c_models/fuzzysphere.cpp",
         #srcdir+"/CCylinderModel.c",
-        "sans/models/c_models/CCylinderModel.cpp",
-        "sans/models/c_models/cylinder.cpp",
-        "sans/models/c_models/parameters.cpp",
-        "sans/models/c_models/dispersion_visitor.cpp",
+        "src/sans/models/c_models/CCylinderModel.cpp",
+        "src/sans/models/c_models/cylinder.cpp",
+        "src/sans/models/c_models/parameters.cpp",
+        "src/sans/models/c_models/dispersion_visitor.cpp",
         srcdir+"/cylinder.c",
         #srcdir+"/CParallelepiped.c",
-        "sans/models/c_models/CParallelepipedModel.cpp",
-        "sans/models/c_models/parallelepiped.cpp",
+        "src/sans/models/c_models/CParallelepipedModel.cpp",
+        "src/sans/models/c_models/parallelepiped.cpp",
         srcdir+"/parallelepiped.c",
-        "sans/models/c_models/CCSParallelepipedModel.cpp",
-        "sans/models/c_models/csparallelepiped.cpp",
+        "src/sans/models/c_models/CCSParallelepipedModel.cpp",
+        "src/sans/models/c_models/csparallelepiped.cpp",
         srcdir+"/csparallelepiped.c",
         #srcdir+"/CCoreShellCylinderModel.c",
-        "sans/models/c_models/CCoreShellCylinderModel.cpp",
-        "sans/models/c_models/coreshellcylinder.cpp",
+        "src/sans/models/c_models/CCoreShellCylinderModel.cpp",
+        "src/sans/models/c_models/coreshellcylinder.cpp",
         srcdir+"/core_shell_cylinder.c",
         #srcdir+"/CHollowCylinderModel.c",
-        "sans/models/c_models/CHollowCylinderModel.cpp",
-        "sans/models/c_models/hollowcylinder.cpp",
+        "src/sans/models/c_models/CHollowCylinderModel.cpp",
+        "src/sans/models/c_models/hollowcylinder.cpp",
         srcdir+"/hollow_cylinder.c",
         #srcdir+"/CCoreShellModel.c",
         #srcdir+"/core_shell.c",
-        "sans/models/c_models/CCoreShellModel.cpp",
-        "sans/models/c_models/coreshellsphere.cpp",
+        "src/sans/models/c_models/CCoreShellModel.cpp",
+        "src/sans/models/c_models/coreshellsphere.cpp",
         #srcdir+"/CEllipsoidModel.c",
-        "sans/models/c_models/CEllipsoidModel.cpp",
-        "sans/models/c_models/ellipsoid.cpp",        
+        "src/sans/models/c_models/CEllipsoidModel.cpp",
+        "src/sans/models/c_models/ellipsoid.cpp",        
         srcdir+"/ellipsoid.c",
-        "sans/models/c_models/CCoreFourShellModel.cpp",
-        "sans/models/c_models/corefourshell.cpp",
+        "src/sans/models/c_models/CCoreFourShellModel.cpp",
+        "src/sans/models/c_models/corefourshell.cpp",
         #srcdir+"/corefourshell.c",
         #srcdir+"/CEllipticalCylinderModel.c",
-        "sans/models/c_models/CEllipticalCylinderModel.cpp",
-        "sans/models/c_models/ellipticalcylinder.cpp",                
+        "src/sans/models/c_models/CEllipticalCylinderModel.cpp",
+        "src/sans/models/c_models/ellipticalcylinder.cpp",                
         srcdir+"/elliptical_cylinder.c",
         #srcdir+"/CTriaxialEllipsoidModel.c",
-        "sans/models/c_models/CTriaxialEllipsoidModel.cpp",
-        "sans/models/c_models/triaxialellipsoid.cpp",                
+        "src/sans/models/c_models/CTriaxialEllipsoidModel.cpp",
+        "src/sans/models/c_models/triaxialellipsoid.cpp",                
         srcdir+"/triaxial_ellipsoid.c",
         #srcdir+"/CFlexibleCylinderModel.c",
-        "sans/models/c_models/CFlexibleCylinderModel.cpp",
-        "sans/models/c_models/flexiblecylinder.cpp",                
+        "src/sans/models/c_models/CFlexibleCylinderModel.cpp",
+        "src/sans/models/c_models/flexiblecylinder.cpp",                
         srcdir+"/flexible_cylinder.c",
-        "sans/models/c_models/CFlexCylEllipXModel.cpp",
-        "sans/models/c_models/flexcyl_ellipX.cpp",         
+        "src/sans/models/c_models/CFlexCylEllipXModel.cpp",
+        "src/sans/models/c_models/flexcyl_ellipX.cpp",         
         srcdir+"/flexcyl_ellipX.c",
-        "sans/models/c_models/CBarBellModel.cpp",
-        "sans/models/c_models/barbell.cpp",         
+        "src/sans/models/c_models/CBarBellModel.cpp",
+        "src/sans/models/c_models/barbell.cpp",         
         srcdir+"/barbell.c",
-        "sans/models/c_models/CCappedCylinderModel.cpp",
-        "sans/models/c_models/capcyl.cpp",         
+        "src/sans/models/c_models/CCappedCylinderModel.cpp",
+        "src/sans/models/c_models/capcyl.cpp",         
         srcdir+"/capcyl.c",
         #srcdir+"/CStakedDisksModel.c",
-        "sans/models/c_models/CSCCrystalModel.cpp",
-        "sans/models/c_models/sc.cpp",                
+        "src/sans/models/c_models/CSCCrystalModel.cpp",
+        "src/sans/models/c_models/sc.cpp",                
         srcdir+"/sc.c",
-        "sans/models/c_models/CFCCrystalModel.cpp",
-        "sans/models/c_models/fcc.cpp",                
+        "src/sans/models/c_models/CFCCrystalModel.cpp",
+        "src/sans/models/c_models/fcc.cpp",                
         srcdir+"/fcc.c",
-        "sans/models/c_models/CBCCrystalModel.cpp",
-        "sans/models/c_models/bcc.cpp",                
+        "src/sans/models/c_models/CBCCrystalModel.cpp",
+        "src/sans/models/c_models/bcc.cpp",                
         srcdir+"/bcc.c",
-        "sans/models/c_models/CStackedDisksModel.cpp",
-        "sans/models/c_models/stackeddisks.cpp",                
+        "src/sans/models/c_models/CStackedDisksModel.cpp",
+        "src/sans/models/c_models/stackeddisks.cpp",                
         srcdir+"/stacked_disks.c",
         #srcdir+"/CLamellarModel.c",
-        "sans/models/c_models/CLamellarModel.cpp",
-        "sans/models/c_models/lamellar.cpp",                
+        "src/sans/models/c_models/CLamellarModel.cpp",
+        "src/sans/models/c_models/lamellar.cpp",                
         srcdir+"/lamellar.c",
         #srcdir+"/CLamellarFFHGModel.c",
-        "sans/models/c_models/CLamellarFFHGModel.cpp",
-        "sans/models/c_models/lamellarFF_HG.cpp",                
+        "src/sans/models/c_models/CLamellarFFHGModel.cpp",
+        "src/sans/models/c_models/lamellarFF_HG.cpp",                
         #srcdir+"/lamellarFF_HG.c",
         #srcdir+"/CLamellarPSModel.c",
-        "sans/models/c_models/CLamellarPSModel.cpp",
-        "sans/models/c_models/lamellarPS.cpp",                
+        "src/sans/models/c_models/CLamellarPSModel.cpp",
+        "src/sans/models/c_models/lamellarPS.cpp",                
         srcdir+"/lamellarPS.c",
         #srcdir+"/CLamellarPSHGModel.c",
-        "sans/models/c_models/CLamellarPSHGModel.cpp",
-        "sans/models/c_models/lamellarPS_HG.cpp",                
+        "src/sans/models/c_models/CLamellarPSHGModel.cpp",
+        "src/sans/models/c_models/lamellarPS_HG.cpp",                
         #srcdir+"/lamellarPS_HG.c",
-        "sans/models/c_models/CLamellarPCrystalModel.cpp",
-        "sans/models/c_models/lamellarPC.cpp",                
+        "src/sans/models/c_models/CLamellarPCrystalModel.cpp",
+        "src/sans/models/c_models/lamellarPC.cpp",                
         #srcdir+"/lamellarPC.c",
         #srcdir+"/COblateModel.c",
-        "sans/models/c_models/CCoreShellEllipsoidModel.cpp",
-        "sans/models/c_models/spheroid.cpp",   
+        "src/sans/models/c_models/CCoreShellEllipsoidModel.cpp",
+        "src/sans/models/c_models/spheroid.cpp",   
         srcdir+"/spheroid.c",             
         #srcdir+"/COblateModel.c",
@@ -234,28 +235,28 @@
         #srcdir+"/prolate.c",
         #srcdir+"/CMultishellModel.c",
-        "sans/models/c_models/CMultiShellModel.cpp",
-        "sans/models/c_models/multishell.cpp",                
+        "src/sans/models/c_models/CMultiShellModel.cpp",
+        "src/sans/models/c_models/multishell.cpp",                
         #srcdir+"/multishell.c",
-        "sans/models/c_models/CSphereSLDModel.cpp",
-        "sans/models/c_models/spheresld.cpp",                
+        "src/sans/models/c_models/CSphereSLDModel.cpp",
+        "src/sans/models/c_models/spheresld.cpp",                
         srcdir+"/spheresld.c",
         #srcdir+"/CVesicleModel.c",
-        "sans/models/c_models/CVesicleModel.cpp",
-        "sans/models/c_models/vesicle.cpp",                
+        "src/sans/models/c_models/CVesicleModel.cpp",
+        "src/sans/models/c_models/vesicle.cpp",                
         #srcdir+"/vesicle.c",
         #srcdir+"/CBinaryHSModel.c",
-        "sans/models/c_models/CBinaryHSModel.cpp",
-        "sans/models/c_models/binaryHS.cpp",                
-        "sans/models/c_models/CPoly_GaussCoil.cpp",
-        "sans/models/c_models/polygausscoil.cpp",   
+        "src/sans/models/c_models/CBinaryHSModel.cpp",
+        "src/sans/models/c_models/binaryHS.cpp",                
+        "src/sans/models/c_models/CPoly_GaussCoil.cpp",
+        "src/sans/models/c_models/polygausscoil.cpp",   
         srcdir+"/rpa.c",             
-        "sans/models/c_models/CRPAModel.cpp",
-        "sans/models/c_models/rpa.cpp", 
+        "src/sans/models/c_models/CRPAModel.cpp",
+        "src/sans/models/c_models/rpa.cpp", 
         #srcdir+"/fractal.c",             
-        "sans/models/c_models/CFractalModel.cpp",
-        "sans/models/c_models/fractal.cpp", 
+        "src/sans/models/c_models/CFractalModel.cpp",
+        "src/sans/models/c_models/fractal.cpp", 
         srcdir+"/sld_cal.c",         
-        "sans/models/c_models/CSLDCalFunc.cpp", 
-        "sans/models/c_models/sld_cal.cpp",  
+        "src/sans/models/c_models/CSLDCalFunc.cpp", 
+        "src/sans/models/c_models/sld_cal.cpp",  
         #gammainc function need to imported from somewhere  
         #srcdir+"/polyexclvol.c",             
@@ -280,18 +281,18 @@
         srcdir+"/CLorentzian.c"
             ],
-        include_dirs=[igordir,srcdir,"sans/models/c_models",numpy_incl_path]),       
+        include_dirs=[igordir,srcdir,"src/sans/models/c_models",numpy_incl_path]),       
         # Smearer extension
         Extension("sans.models.sans_extension.smearer",
                    sources = [
-        "sans/models/c_smearer/smearer_module.cpp",
-        "sans/models/c_smearer/smearer.cpp",
+        "src/sans/models/c_smearer/smearer_module.cpp",
+        "src/sans/models/c_smearer/smearer.cpp",
         ],
-        include_dirs=["sans/models/c_smearer",numpy_incl_path]),
+        include_dirs=["src/sans/models/c_smearer",numpy_incl_path]),
         Extension("sans.models.sans_extension.smearer2d_helper",
                   sources = [
-        "sans/models/c_smearer/smearer2d_helper_module.cpp",
-        "sans/models/c_smearer/smearer2d_helper.cpp",
+        "src/sans/models/c_smearer/smearer2d_helper_module.cpp",
+        "src/sans/models/c_smearer/smearer2d_helper.cpp",
         ],
-        include_dirs=["sans/models/c_smearer",numpy_incl_path]
+        include_dirs=["src/sans/models/c_smearer",numpy_incl_path]
         )
         ]
