diff --git a/python/modules/py_igl_bbw.cpp b/python/modules/py_igl_bbw.cpp
deleted file mode 100644
index 9508064e8..000000000
--- a/python/modules/py_igl_bbw.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//#include <Eigen/Geometry>
-//#include <Eigen/Dense>
-//#include <Eigen/Sparse>
-
-
-#include "../python_shared.h"
-
-#include <igl/bbw.h>
-
-
-void python_export_igl_bbw(py::module &me) {
-
-  py::module m = me.def_submodule(
-    "bbw", "Wrappers for libigl functions that use bbw");
-
-  #include "../py_igl/py_bbw.cpp"
-
-}
diff --git a/python/py_igl.cpp b/python/py_igl.cpp
index 44ce16b31..335417582 100644
--- a/python/py_igl.cpp
+++ b/python/py_igl.cpp
@@ -13,6 +13,7 @@
 #include <igl/barycenter.h>
 #include <igl/barycentric_coordinates.h>
 #include <igl/barycentric_to_global.h>
+#include <igl/bbw.h>
 #include <igl/boundary_conditions.h>
 #include <igl/boundary_facets.h>
 #include <igl/boundary_loop.h>
@@ -107,6 +108,7 @@ void python_export_igl(py::module &m)
 #include "py_igl/py_barycenter.cpp"
 #include "py_igl/py_barycentric_coordinates.cpp"
 #include "py_igl/py_barycentric_to_global.cpp"
+#include "py_igl/py_bbw.cpp"
 #include "py_igl/py_boundary_conditions.cpp"
 #include "py_igl/py_boundary_facets.cpp"
 #include "py_igl/py_boundary_loop.cpp"
diff --git a/python/py_igl/py_bbw.cpp b/python/py_igl/py_bbw.cpp
index f9e2279b6..a629b046b 100644
--- a/python/py_igl/py_bbw.cpp
+++ b/python/py_igl/py_bbw.cpp
@@ -1,13 +1,14 @@
 // Wrap the BBWData class
-py::class_<iglData > BBWData(m, "BBWData");
+py::class_<igl::BBWData > BBWData(m, "BBWData");
 
 BBWData
 .def(py::init<>())
-.def_readwrite("partition_unity", &iglData::partition_unity)
-.def_readwrite("W0", &iglData::W0)
-.def_readwrite("active_set_params", &iglData::active_set_params)
-.def_readwrite("verbosity", &iglData::verbosity)
-.def("print", [](iglData& data)
+.def_readwrite("partition_unity", &igl::BBWData::partition_unity)
+.def_readwrite("W0", &igl::BBWData::W0)
+.def_readwrite("active_set_params", &igl::BBWData::active_set_params)
+.def_readwrite("verbosity", &igl::BBWData::verbosity)
+
+.def("print", [](igl::BBWData& data)
 {
     return data.print();
 })
@@ -19,7 +20,7 @@ m.def("bbw", []
   const Eigen::MatrixXi& Ele,
   const Eigen::MatrixXi& b,
   const Eigen::MatrixXd& bc,
-  iglData& data,
+  igl::BBWData& data,
   Eigen::MatrixXd& W
 )
 {
@@ -27,6 +28,6 @@ m.def("bbw", []
   Eigen::VectorXi bv;
   if (b.size() != 0)
     bv = b;
-  return igl(V, Ele, bv, bc, data, W);
+  return igl::bbw(V, Ele, bv, bc, data, W);
 }, __doc_igl_bbw,
 py::arg("V"), py::arg("Ele"), py::arg("b"), py::arg("bc"), py::arg("data"), py::arg("W"));