Index: src/Actions/CommandAction/BondLengthTableAction.cpp
===================================================================
--- src/Actions/CommandAction/BondLengthTableAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/CommandAction/BondLengthTableAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -20,5 +20,5 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Actions/CommandAction/BondLengthTableAction.def
===================================================================
--- src/Actions/CommandAction/BondLengthTableAction.def	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/CommandAction/BondLengthTableAction.def	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -8,5 +8,5 @@
 // all includes and forward declarations necessary for non-integral types below
 
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
Index: src/Actions/FragmentationAction/CreateAdjacencyAction.cpp
===================================================================
--- src/Actions/FragmentationAction/CreateAdjacencyAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/FragmentationAction/CreateAdjacencyAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -25,5 +25,5 @@
 #include "atom.hpp"
 #include "bond.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Range.hpp"
Index: src/Actions/FragmentationAction/DepthFirstSearchAction.cpp
===================================================================
--- src/Actions/FragmentationAction/DepthFirstSearchAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/FragmentationAction/DepthFirstSearchAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -21,5 +21,5 @@
 
 #include "atom.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Actions/FragmentationAction/FragmentationAction.cpp
===================================================================
--- src/Actions/FragmentationAction/FragmentationAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/FragmentationAction/FragmentationAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -21,5 +21,5 @@
 
 #include "atom.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Actions/FragmentationAction/SubgraphDissectionAction.cpp
===================================================================
--- src/Actions/FragmentationAction/SubgraphDissectionAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/FragmentationAction/SubgraphDissectionAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -25,5 +25,5 @@
 #include "atom.hpp"
 #include "bond.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Actions/MoleculeAction/BondFileAction.cpp
===================================================================
--- src/Actions/MoleculeAction/BondFileAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/MoleculeAction/BondFileAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -20,5 +20,5 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "CodePatterns/Log.hpp"
 #include "molecule.hpp"
Index: src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp
===================================================================
--- src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -21,5 +21,5 @@
 
 #include "atom.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "boundary.hpp"
 #include "CodePatterns/Verbose.hpp"
Index: src/Actions/MoleculeAction/FillWithMoleculeAction.cpp
===================================================================
--- src/Actions/MoleculeAction/FillWithMoleculeAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/MoleculeAction/FillWithMoleculeAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -21,5 +21,5 @@
 
 #include "atom.hpp"
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "boundary.hpp"
 #include "CodePatterns/Verbose.hpp"
Index: src/Actions/MoleculeAction/SaveAdjacencyAction.cpp
===================================================================
--- src/Actions/MoleculeAction/SaveAdjacencyAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/MoleculeAction/SaveAdjacencyAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -20,5 +20,5 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Actions/MoleculeAction/SaveBondsAction.cpp
===================================================================
--- src/Actions/MoleculeAction/SaveBondsAction.cpp	(revision 607eab6774ab70357425ace73b68c00a831b78da)
+++ src/Actions/MoleculeAction/SaveBondsAction.cpp	(revision 9e23a3785b6bdd916d370ba9157e9b76a1905c53)
@@ -20,5 +20,5 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "bondgraph.hpp"
+#include "Graph/BondGraph.hpp"
 #include "config.hpp"
 #include "CodePatterns/Log.hpp"
