diff --git a/Core/Algorithms/inc/SpecularMatrix.h b/Core/Algorithms/inc/SpecularMatrix.h
index 20daac5f9232756292ca6899d89285d163e209db..56bf891bc3c183c022b78d93c212cf2af36f103c 100644
--- a/Core/Algorithms/inc/SpecularMatrix.h
+++ b/Core/Algorithms/inc/SpecularMatrix.h
@@ -17,6 +17,8 @@
 #define SPECULARMATRIX_H_
 
 #include "Types.h"
+#include "ISimulation.h"
+#include "MultiLayer.h"
 
 //! Implements the matrix formalism for the calculation of wave amplitudes of
 //! the coherent wave solution in a multilayer
@@ -50,13 +52,13 @@ public:
        inline size_t size() const { return m_data.size(); }
        inline void clear() { m_data.clear(); }
        inline void resize(size_t size) { m_data.resize(size); }
-   private:
-       std::vector<LayerMatrixCoeff > m_data;
        complex_t R; // total reflection coefficient
        complex_t L11;
        complex_t L12;
        complex_t L21;
        complex_t L22;
+   private:
+       std::vector<LayerMatrixCoeff > m_data;
    };
 
    typedef MultiLayerMatrixCoeff MultiLayerCoeff_t; // set of layer coefficients for matrix formalism
diff --git a/App/src/SpecularMatrix.cpp b/Core/Algorithms/src/SpecularMatrix.cpp
similarity index 100%
rename from App/src/SpecularMatrix.cpp
rename to Core/Algorithms/src/SpecularMatrix.cpp
diff --git a/Core/Core.pro b/Core/Core.pro
index 4e5d541cffe1369f33ac43f3dfe163c017841c6e..fead580a35efa7d3b2d94a3051642c7d301187fa 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -72,6 +72,7 @@ SOURCES += \
     Algorithms/src/ResolutionFunction2DSimple.cpp \
     Algorithms/src/Simulation.cpp \
     Algorithms/src/SizeSpacingCorrelationApproximationStrategy.cpp \
+    Algorithms/src/SpecularMatrix.cpp \
     Algorithms/src/StrategyBuilder.cpp \
     \
     FormFactors/src/FormFactorBox.cpp \
@@ -219,6 +220,7 @@ HEADERS += \
     Algorithms/inc/Simulation.h \
     Algorithms/inc/SimulationParameters.h \
     Algorithms/inc/SizeSpacingCorrelationApproximationStrategy.h \
+    Algorithms/inc/SpecularMatrix.h \
     Algorithms/inc/StrategyBuilder.h \
     Algorithms/inc/ThreadInfo.h \
     \