diff --git a/include/bounce/softbody/softbody_contact_solver.h b/include/bounce/softbody/contacts/softbody_contact_solver.h
similarity index 100%
rename from include/bounce/softbody/softbody_contact_solver.h
rename to include/bounce/softbody/contacts/softbody_contact_solver.h
diff --git a/include/bounce/softbody/softbody_node_body_contact.h b/include/bounce/softbody/contacts/softbody_node_body_contact.h
similarity index 100%
rename from include/bounce/softbody/softbody_node_body_contact.h
rename to include/bounce/softbody/contacts/softbody_node_body_contact.h
diff --git a/include/bounce/softbody/softbody_contact_manager.h b/include/bounce/softbody/softbody_contact_manager.h
index 60c1f01..5e57310 100644
--- a/include/bounce/softbody/softbody_contact_manager.h
+++ b/include/bounce/softbody/softbody_contact_manager.h
@@ -19,7 +19,7 @@
 #ifndef B3_SOFTBODY_CONTACT_MANAGER_H
 #define B3_SOFTBODY_CONTACT_MANAGER_H
 
-#include <bounce/softbody/softbody_node_body_contact.h>
+#include <bounce/softbody/contacts/softbody_node_body_contact.h>
 #include <bounce/collision/broad_phase.h>
 #include <bounce/common/memory/block_pool.h>
 #include <bounce/common/template/list.h>
diff --git a/src/bounce/softbody/softbody_contact_solver.cpp b/src/bounce/softbody/contacts/softbody_contact_solver.cpp
similarity index 98%
rename from src/bounce/softbody/softbody_contact_solver.cpp
rename to src/bounce/softbody/contacts/softbody_contact_solver.cpp
index bd69ab8..21721c9 100644
--- a/src/bounce/softbody/softbody_contact_solver.cpp
+++ b/src/bounce/softbody/contacts/softbody_contact_solver.cpp
@@ -16,8 +16,8 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <bounce/softbody/softbody_contact_solver.h>
-#include <bounce/softbody/softbody_node_body_contact.h>
+#include <bounce/softbody/contacts/softbody_contact_solver.h>
+#include <bounce/softbody/contacts/softbody_node_body_contact.h>
 #include <bounce/softbody/softbody_node.h>
 #include <bounce/dynamics/shapes/shape.h>
 #include <bounce/dynamics/body.h>
diff --git a/src/bounce/softbody/softbody_node_body_contact.cpp b/src/bounce/softbody/contacts/softbody_node_body_contact.cpp
similarity index 96%
rename from src/bounce/softbody/softbody_node_body_contact.cpp
rename to src/bounce/softbody/contacts/softbody_node_body_contact.cpp
index 9cf6401..483ae3a 100644
--- a/src/bounce/softbody/softbody_node_body_contact.cpp
+++ b/src/bounce/softbody/contacts/softbody_node_body_contact.cpp
@@ -16,7 +16,7 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <bounce/softbody/softbody_node_body_contact.h>
+#include <bounce/softbody/contacts/softbody_node_body_contact.h>
 #include <bounce/softbody/softbody_node.h>
 #include <bounce/dynamics/shapes/shape.h>
 #include <bounce/dynamics/body.h>
diff --git a/src/bounce/softbody/softbody_solver.cpp b/src/bounce/softbody/softbody_solver.cpp
index c7a25ca..42b4ad6 100644
--- a/src/bounce/softbody/softbody_solver.cpp
+++ b/src/bounce/softbody/softbody_solver.cpp
@@ -21,7 +21,7 @@
 #include <bounce/softbody/softbody_node.h>
 #include <bounce/softbody/softbody.h>
 #include <bounce/softbody/softbody_force_solver.h>
-#include <bounce/softbody/softbody_contact_solver.h>
+#include <bounce/softbody/contacts/softbody_contact_solver.h>
 #include <bounce/dynamics/body.h>
 #include <bounce/dynamics/shapes/shape.h>
 
@@ -32,7 +32,7 @@ b3SoftBodySolver::b3SoftBodySolver(const b3SoftBodySolverDef& def)
 	m_mesh = m_body->m_mesh;
 	m_nodes = m_body->m_nodes;
 	m_elements = m_body->m_elements;
-	m_bodyContactCapacity = m_mesh->vertexCount;
+	m_bodyContactCapacity = m_body->m_contactManager.m_nodeBodyContactList.m_count;
 	m_bodyContactCount = 0;
 	m_bodyContacts = (b3NodeBodyContact**)m_allocator->Allocate(m_bodyContactCapacity * sizeof(b3NodeBodyContact*));
 }