diff --git a/lib/atc/Makefile.g++ b/lib/atc/Makefile.g++
index 5b12e403ab..d15e6cb3b8 100644
--- a/lib/atc/Makefile.g++
+++ b/lib/atc/Makefile.g++
@@ -5,91 +5,8 @@ SHELL = /bin/sh
 EXTRAMAKE = Makefile.lammps.installed
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 
diff --git a/lib/atc/Makefile.icc b/lib/atc/Makefile.icc
index 3d644397a5..502f103ba4 100644
--- a/lib/atc/Makefile.icc
+++ b/lib/atc/Makefile.icc
@@ -5,91 +5,8 @@ SHELL = /bin/sh
 EXTRAMAKE = Makefile.lammps.installed
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 
diff --git a/lib/atc/Makefile.mingw32-cross b/lib/atc/Makefile.mingw32-cross
index 6834410408..13c81b4e12 100644
--- a/lib/atc/Makefile.mingw32-cross
+++ b/lib/atc/Makefile.mingw32-cross
@@ -2,91 +2,8 @@
 SHELL = /bin/sh
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 # which file will be copied to Makefile.lammps
diff --git a/lib/atc/Makefile.mingw32-cross-mpi b/lib/atc/Makefile.mingw32-cross-mpi
index 4c372edf38..734fb8a579 100644
--- a/lib/atc/Makefile.mingw32-cross-mpi
+++ b/lib/atc/Makefile.mingw32-cross-mpi
@@ -2,91 +2,8 @@
 SHELL = /bin/sh
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 # which file will be copied to Makefile.lammps
diff --git a/lib/atc/Makefile.mingw64-cross b/lib/atc/Makefile.mingw64-cross
index 997cbcd35c..3b8e23620f 100644
--- a/lib/atc/Makefile.mingw64-cross
+++ b/lib/atc/Makefile.mingw64-cross
@@ -2,91 +2,8 @@
 SHELL = /bin/sh
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 # which file will be copied to Makefile.lammps
diff --git a/lib/atc/Makefile.mingw64-cross-mpi b/lib/atc/Makefile.mingw64-cross-mpi
index 81b4ee207e..aca96597e2 100644
--- a/lib/atc/Makefile.mingw64-cross-mpi
+++ b/lib/atc/Makefile.mingw64-cross-mpi
@@ -2,91 +2,8 @@
 SHELL = /bin/sh
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------
 # which file will be copied to Makefile.lammps
diff --git a/lib/atc/Makefile.serial b/lib/atc/Makefile.serial
index bc4ff7e2af..ced890e3ce 100644
--- a/lib/atc/Makefile.serial
+++ b/lib/atc/Makefile.serial
@@ -5,91 +5,8 @@ SHELL = /bin/sh
 EXTRAMAKE = Makefile.lammps.installed
 
 # ------ FILES ------
-
-SRC = ATC_HardyKernel.cpp \
-ATC_Transfer.cpp \
-ATC_TransferHardy.cpp \
-ATC_TransferThermal.cpp \
-ATC_TransferUtility.cpp \
-AtomicRegulator.cpp \
-ElasticTimeIntegrator.cpp \
-ElectronFlux.cpp \
-ElectronHeatCapacity.cpp \
-ElectronHeatFlux.cpp \
-ElectronPhononExchange.cpp \
-ExtrinsicModel.cpp \
-ExtrinsicModelTwoTemperature.cpp \
-FE_Element.cpp \
-FE_Engine.cpp \
-FE_Mesh.cpp \
-FieldEulerIntegrator.cpp \
-ImplicitSolveOperator.cpp \
-Kinetostat.cpp \
-LammpsInterface.cpp \
-Material.cpp \
-Matrix.cpp \
-OutputManager.cpp \
-PhysicsModelThermal.cpp \
-PhysicsModelTwoTemperature.cpp \
-PrescribedDataManager.cpp \
-Solver.cpp \
-Thermostat.cpp \
-TimeFilter.cpp \
-TimeIntegrator.cpp \
-Vector.cpp \
-XT_Function.cpp
-
-INC = Array2D.h \
-Array.h \
-ATC_Error.h \
-ATC_HardyKernel.h \
-ATC_Transfer.h \
-ATC_TransferHardy.h \
-ATC_TransferThermal.h \
-ATC_TypeDefs.h \ \
-AtomicRegulator.h \
-CG.h \
-CloneVector.h \
-DenseMatrix.h \
-DenseVector.h \
-DiagonalMatrix.h \
-ElasticTimeIntegrator.h \
-ElectronFlux.h \
-ElectronHeatCapacity.h \
-ElectronHeatFlux.h \
-ElectronPhononExchange.h \
-ExtrinsicModel.h \
-ExtrinsicModelTwoTemperature.h \
-FE_Element.h \
-FE_Engine.h \
-FE_Mesh.h \
-FieldEulerIntegrator.h \
-GMRES.h \
-ImplicitSolveOperator.h \
-Kinetostat.h \
-LammpsInterface.h \
-Material.h \
-MatrixDef.h \
-Matrix.h \
-MatrixLibrary.h \
-OutputManager.h \
-PhysicsModel.h \
-PhysicsModelThermal.h \
-PhysicsModelTwoTemperature.h \
-PrescribedDataManager.h \
-Quadrature.h \
-Solver.h \
-SparseMatrix.h \
-SparseMatrix-inl.h \
-SparseVector.h \
-SparseVector-inl.h \
-StringManip.h \
-Thermostat.h \
-TimeFilter.h \
-TimeIntegrator.h \
-Utility.h \
-Vector.h \
-XT_Function.h
+SRC = $(wildcard *.cpp)
+INC = $(wildcard *.h)
 
 # ------ DEFINITIONS ------