Index: src/Analysis/analysis_bonds.cpp
===================================================================
--- src/Analysis/analysis_bonds.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/analysis_bonds.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -23,5 +23,5 @@
 #include "atom.hpp"
 #include "Bond/bond.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Verbose.hpp"
Index: src/Analysis/analysis_correlation.cpp
===================================================================
--- src/Analysis/analysis_correlation.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/analysis_correlation.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -27,5 +27,5 @@
 #include "Tesselation/BoundaryTriangleSet.hpp"
 #include "Box.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
Index: src/Analysis/unittests/AnalysisBondsUnitTest.cpp
===================================================================
--- src/Analysis/unittests/AnalysisBondsUnitTest.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/unittests/AnalysisBondsUnitTest.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -31,8 +31,8 @@
 #include "atom.hpp"
 #include "Bond/bond.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "Graph/BondGraph.hpp"
 #include "molecule.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "World.hpp"
Index: src/Analysis/unittests/AnalysisCorrelationToPointUnitTest.cpp
===================================================================
--- src/Analysis/unittests/AnalysisCorrelationToPointUnitTest.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/unittests/AnalysisCorrelationToPointUnitTest.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -31,8 +31,8 @@
 
 #include "atom.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "molecule.hpp"
 #include "linkedcell.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "World.hpp"
 
Index: src/Analysis/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
===================================================================
--- src/Analysis/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -31,8 +31,8 @@
 #include "CodePatterns/Assert.hpp"
 #include "Descriptors/MoleculeDescriptor.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "molecule.hpp"
 #include "linkedcell.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "PointCloudAdaptor.hpp"
 #include "Tesselation/tesselation.hpp"
Index: src/Analysis/unittests/AnalysisPairCorrelationUnitTest.cpp
===================================================================
--- src/Analysis/unittests/AnalysisPairCorrelationUnitTest.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/unittests/AnalysisPairCorrelationUnitTest.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -32,8 +32,8 @@
 #include "atom.hpp"
 #include "Tesselation/boundary.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "molecule.hpp"
 #include "linkedcell.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "Tesselation/tesselation.hpp"
 #include "World.hpp"
Index: src/Analysis/unittests/CountBondsUnitTest.cpp
===================================================================
--- src/Analysis/unittests/CountBondsUnitTest.cpp	(revision 9b5a2c623129c569571d4a77eabff8bb2bc84231)
+++ src/Analysis/unittests/CountBondsUnitTest.cpp	(revision 592be9a388decc9a41c3507b7e5f23289522e8f5)
@@ -33,8 +33,8 @@
 #include "atom.hpp"
 #include "Bond/bond.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "Graph/BondGraph.hpp"
 #include "molecule.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "World.hpp"
 
