Index: sansmodels/src/c_extensions/barbell.h
===================================================================
--- sansmodels/src/c_extensions/barbell.h	(revision 67424cdc019bde2f4cbc089828ff660e6f914c2c)
+++ sansmodels/src/c_extensions/barbell.h	(revision f425805ce128273a62ba1890166627177d3fa0fd)
@@ -1,5 +1,5 @@
 #if !defined(barbell_h)
 #define barbell_h
-
+#include "parameters.hh"
 /**
  * Structure definition for BarBell parameters
@@ -29,51 +29,53 @@
  //[ORIENTATION_PARAMS]= <text> phi; theta; phi.width; theta.width</text>
 
-typedef struct {
-    /// Scale factor
-    //  [DEFAULT]=scale= 1.0
-    double scale;
+class BarBellModel {
+public:
+  // Model parameters
 
-    ///	rad_bar [A]
-    //  [DEFAULT]=rad_bar=20.0 [A]
-    double rad_bar;
+  /// Scale factor
+  //  [DEFAULT]=scale= 1.0
+  Parameter scale;
 
-    ///	length of the bar [A]
-    //  [DEFAULT]=len_bar=400.0 [A]
-    double len_bar;
+  /// rad_bar [A]
+  //  [DEFAULT]=rad_bar=20.0 [A]
+  Parameter rad_bar;
 
-    ///	Radius of sphere [A]
-    //  [DEFAULT]=rad_bell=40.0 [A]
-    double rad_bell;
+  /// length of the bar [A]
+  //  [DEFAULT]=len_bar=400.0 [A]
+  Parameter len_bar;
 
-    ///	sld_barbell [1/A^(2)]
-    //  [DEFAULT]=sld_barbell= 1.0e-6 [1/A^(2)]
-    double sld_barbell;
+  /// Radius of sphere [A]
+  //  [DEFAULT]=rad_bell=40.0 [A]
+  Parameter rad_bell;
 
-    ///	sld_solv [1/A^(2)]
-    //  [DEFAULT]=sld_solv= 6.3e-6 [1/A^(2)]
-    double sld_solv;
+  /// sld_barbell [1/A^(2)]
+  //  [DEFAULT]=sld_barbell= 1.0e-6 [1/A^(2)]
+  Parameter sld_barbell;
 
-	/// Incoherent Background [1/cm]
-	//  [DEFAULT]=background=0.0 [1/cm]
-	double background;
+  /// sld_solv [1/A^(2)]
+  //  [DEFAULT]=sld_solv= 6.3e-6 [1/A^(2)]
+  Parameter sld_solv;
 
-    /// Angle of the main axis against z-axis in detector plane [deg]
-    //  [DEFAULT]=theta=0.0 [deg]
-    double theta;
-    /// Azimuthal angle around z-axis in detector plane [deg]
-    //  [DEFAULT]=phi=0.0 [deg]
-    double phi;
+  /// Incoherent Background [1/cm]
+  //  [DEFAULT]=background=0.0 [1/cm]
+  Parameter background;
 
-} BarBellParameters;
+  /// Angle of the main axis against z-axis in detector plane [deg]
+  //  [DEFAULT]=theta=0.0 [deg]
+  Parameter theta;
 
+  /// Azimuthal angle around z-axis in detector plane [deg]
+  //  [DEFAULT]=phi=0.0 [deg]
+  Parameter phi;
 
+  // Constructor
+  BarBellModel();
 
-/// 1D scattering function
-double barbell_analytical_1D(BarBellParameters *pars, double q);
-
-/// 2D scattering function
-double barbell_analytical_2D(BarBellParameters *pars, double q, double phi);
-double barbell_analytical_2DXY(BarBellParameters *pars, double qx, double qy);
-double barbell_analytical_2D_scaled(BarBellParameters *pars, double q, double q_x, double q_y);
+  // Operators to get I(Q)
+  double operator()(double q);
+  double operator()(double qx, double qy);
+  double calculate_ER();
+  double evaluate_rphi(double q, double phi);
+};
 
 #endif
Index: sansmodels/src/c_models/barbell.cpp
===================================================================
--- sansmodels/src/c_models/barbell.cpp	(revision 85b856b10209e422952e814499cf0d5fcf0564a0)
+++ sansmodels/src/c_models/barbell.cpp	(revision f425805ce128273a62ba1890166627177d3fa0fd)
@@ -21,5 +21,5 @@
 
 #include <math.h>
-#include "models.hh"
+//#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
Index: sansmodels/src/c_models/models.hh
===================================================================
--- sansmodels/src/c_models/models.hh	(revision 67424cdc019bde2f4cbc089828ff660e6f914c2c)
+++ sansmodels/src/c_models/models.hh	(revision f425805ce128273a62ba1890166627177d3fa0fd)
@@ -41,27 +41,4 @@
 	// Constructor
 	CylinderModel();
-
-	// Operators to get I(Q)
-	double operator()(double q);
-	double operator()(double qx, double qy);
-	double calculate_ER();
-	double evaluate_rphi(double q, double phi);
-};
-
-class BarBellModel{
-public:
-	// Model parameters
-	Parameter scale;
-	Parameter rad_bar;
-	Parameter len_bar;
-	Parameter rad_bell;
-	Parameter sld_barbell;
-	Parameter sld_solv;
-	Parameter background;
-	Parameter theta;
-	Parameter phi;
-
-	// Constructor
-	BarBellModel();
 
 	// Operators to get I(Q)
Index: sansmodels/src/python_wrapper/CBarBellModel.cpp
===================================================================
--- sansmodels/src/python_wrapper/CBarBellModel.cpp	(revision 85b856b10209e422952e814499cf0d5fcf0564a0)
+++ sansmodels/src/python_wrapper/CBarBellModel.cpp	(revision f425805ce128273a62ba1890166627177d3fa0fd)
@@ -18,5 +18,5 @@
  *
  * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
- *          DO NOT MODIFY THIS FILE, MODIFY barbell.h
+ *          DO NOT MODIFY THIS FILE, MODIFY [INCLUDE_FILE]
  *          AND RE-RUN THE GENERATOR SCRIPT
  *
@@ -33,8 +33,8 @@
 #include <math.h>
 #include <time.h>
-//#include "barbell.h"
-}
-
-#include "models.hh"
+
+}
+
+#include "barbell.h"
 #include "dispersion_visitor.hh"
 
