diff --git a/.gitignore b/.gitignore
index d52635902a70439f8cb1c9a190d19f27009e4659..08012d564bb9f07d7beaeb2254da225716ee467e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ __pycache__/
 __pycache__/
 bin/
 lib/
+build/
 version.py
 
 # Virtual environments
diff --git a/AppUtils/CMakeLists.txt b/AppUtils/CMakeLists.txt
index 73565162e5bdc02b7dabbe898b22103640118129..e65f065577127c18d2b562843dbc2a2e92997799 100644
--- a/AppUtils/CMakeLists.txt
+++ b/AppUtils/CMakeLists.txt
@@ -1,6 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(AppUtils
-  AppBase.cc
-  LhFactory.cc  
+  ${sourcefiles}  
 )
 
 target_include_directories(AppUtils
diff --git a/ConfigParser/CMakeLists.txt b/ConfigParser/CMakeLists.txt
index a242df664f4e20619d4f6586892e0f972b088608..b3d5deb8533ba61adcc2a194d4483504ca780952 100644
--- a/ConfigParser/CMakeLists.txt
+++ b/ConfigParser/CMakeLists.txt
@@ -1,13 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(ConfigParser  
-  epemParser.cc
-  gammapParser.cc
-  ggParser.cc
-  globalParser.cc
-  KMatrixParser.cc
-  ParserBase.cc
-  pbarpParser.cc
-  pipiScatteringParser.cc
-  resParser.cc  
+  ${sourcefiles}  
 )
 
 target_include_directories(ConfigParser
diff --git a/ErrLogger/CMakeLists.txt b/ErrLogger/CMakeLists.txt
index e1700ab23545345460aa93f52e4d47a0ef81dd1f..99ca0f94f236886d9e011617049b95d123686cba 100644
--- a/ErrLogger/CMakeLists.txt
+++ b/ErrLogger/CMakeLists.txt
@@ -1,5 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(ErrLogger
-  ErrLogger.cc
+  ${sourcefiles}
 )
 
 install(TARGETS ErrLogger
diff --git a/Event/CMakeLists.txt b/Event/CMakeLists.txt
index 585faa7850926748291f96a5f264f31cde2c679d..d638da86dc5ba2ac052a7e201880dfc88f270f47 100644
--- a/Event/CMakeLists.txt
+++ b/Event/CMakeLists.txt
@@ -1,10 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(Event  
-  Event.cc
-  EventList.cc
-  EventReader.cc
-  EventReaderDefault.cc
-  EventReaderScattering.cc
-  MassRangeCut.cc
+  ${sourcefiles}
 )
 
 target_include_directories(Event
diff --git a/FitParams/CMakeLists.txt b/FitParams/CMakeLists.txt
index aeccafade59a9a523cdbe7a855afccf2280a16cc..7a7979373e55874b91661df3c4daf29887e42ac6 100644
--- a/FitParams/CMakeLists.txt
+++ b/FitParams/CMakeLists.txt
@@ -1,17 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(FitParams
-  AbsParamHandler.cc
-  AbsPawianParameters.cc
-  AbsPawianParamStreamer.cc
-  MnPawianParameters.cc
-  ParamDep.cc
-  ParamDepEqual.cc
-  ParamDepFixedRatio.cc
-  ParamDepGFacToFixGFacsWidthMass.cc
-  ParamDepGFactorToFixFullWidth.cc
-  ParamDepHandler.cc
-  ParamFactory.cc
-  PawianParameters.cc
-  PwaCovMatrix.cc
+  ${sourcefiles}
 )
 
 target_include_directories(FitParams
diff --git a/KMatrixExtract/CMakeLists.txt b/KMatrixExtract/CMakeLists.txt
index b41f1b83203202af673442c1ccad2e76ad9e51d1..1c088fddc6e40a688c21d66a0941b319edad33c9 100644
--- a/KMatrixExtract/CMakeLists.txt
+++ b/KMatrixExtract/CMakeLists.txt
@@ -1,18 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(KMatrixExtract  
-  ArgandModuloConverter.cc
-  FVectorIntensityGeneral.cc
-  FVectorResidueExtr.cc
-  FVectorResiduePathExtr.cc
-  RiemannSheetAnalyzer.cc
-  RiemannSheetFVectorAnalyzer.cc
-  TMatrixErrorExtr.cc
-  TMatrixExtrBase.cc
-  TMatrixExtrFcn.cc
-  TMatrixGeneral.cc
-  TMatrixGeneralBase.cc
-  TMatrixPiPiSWaveSimple4piPhp.cc  
-  TMatrixResidueExtr.cc  
-  TMatrixResiduePathExtr.cc 
+  ${sourcefiles}
 )
 
 target_include_directories(KMatrixExtract
diff --git a/MinFunctions/CMakeLists.txt b/MinFunctions/CMakeLists.txt
index 7191ba91c8e21397e2d8bd30d249747864d666b0..0f8eeee369c71d32e56e022de90f71a0bcaad55c 100644
--- a/MinFunctions/CMakeLists.txt
+++ b/MinFunctions/CMakeLists.txt
@@ -1,10 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(MinFunctions
-  AbsFcn.cc
-  AbsPawianMinimizer.cc
-  EvoMinimizer.cc
-  MinuitMinimizer.cc
-  PwaFcnBase.cc
-  PwaFcnServer.cc
+  ${sourcefiles}
 )
 
 target_include_directories(MinFunctions
diff --git a/Particle/CMakeLists.txt b/Particle/CMakeLists.txt
index 6807e0586cc47812566f799706794ed137e3e568..b17647dee078d346c5641fabdd3e900a4810faa1 100644
--- a/Particle/CMakeLists.txt
+++ b/Particle/CMakeLists.txt
@@ -1,8 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(Particle  
-  Parity.cc
-  Particle.cc
-  ParticleTable.cc
-  PdtParser.cc  
+  ${sourcefiles}
 )
 
 target_include_directories(Particle
diff --git a/PspGen/CMakeLists.txt b/PspGen/CMakeLists.txt
index f59f1c6f0d9985e878a7a3d88142093afd8b74a5..d4295a363d900edf6aa2c6eae650187082f9fcc8 100644
--- a/PspGen/CMakeLists.txt
+++ b/PspGen/CMakeLists.txt
@@ -1,19 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(PspGen
-  EvtComplex.cc
-  EvtConst.cc
-  EvtGenKine.cc
-  EvtKine.cc
-  EvtMTRandomEngine.cc
-  EvtRandom.cc
-  EvtReport.cc
-  EvtSimpleRandomEngine.cc
-  EvtTensor4C.cc
-  EvtVector3C.cc
-  EvtVector3R.cc
-  EvtVector4C.cc
-  EvtVector4R.cc
-  EvtdFunction.cc
-  EvtdFunctionSingle.cc  
+  ${sourcefiles} 
 )
 
 target_include_directories(PspGen
diff --git a/PwaApps/CMakeLists.txt b/PwaApps/CMakeLists.txt
index 3f84ffcc8bbd70934ee1249060f19cfa4371ea49..c349c46db036bc4156ce665e96275d99690d5b67 100644
--- a/PwaApps/CMakeLists.txt
+++ b/PwaApps/CMakeLists.txt
@@ -1,5 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(PwaApps  
-  Dummy.cc  
+  ${sourcefiles}  
 )
 
 target_include_directories(PwaApps
diff --git a/PwaDynamics/CMakeLists.txt b/PwaDynamics/CMakeLists.txt
index ec1a6b9300c30175b1720470c69935ec72547ba9..6156927d32c889a54eb029090fbc6769520091dc 100644
--- a/PwaDynamics/CMakeLists.txt
+++ b/PwaDynamics/CMakeLists.txt
@@ -1,51 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(PwaDynamics  
-  BBUnstableParFit.cc  
-  BBUnstableParFitFcn.cc
-  BarrierFactor.cc
-  BreitWignerFunction.cc
-  FVector.cc
-  FVectorOmnes.cc
-  Flatte.cc
-  Johnson.cc
-  KMatrixBase.cc
-  KMatrixFunctions.cc
-  KMatrixKPiSFocus.cc
-  KMatrixNonRel.cc
-  KMatrixOmnes.cc
-  KMatrixPiPiS.cc
-  KMatrixPiPiSsimple4piPhp.cc
-  KMatrixRel.cc
-  KMatrixRelBg.cc
-  KMatrixSlowAdlerCorRel.cc
-  KPole.cc
-  KPoleBarrier.cc
-  KPoleOmnes.cc
-  LASS.cc  
-  PPole.cc
-  PPoleBarrier.cc
-  PPoleOmnes.cc
-  PVectorBgOmnes.cc
-  PVectorKPiSFocus.cc
-  PVectorRel.cc
-  PVectorRelBg.cc
-  PVectorSlowCorRel.cc
-  PhaseSpace4Pi.cc
-  PhaseSpaceFactory.cc
-  PhaseSpaceIsobar.cc
-  PhaseSpaceIsobarAS.cc
-  PhaseSpaceIsobarDudek.cc
-  PhaseSpaceIsobarDudekAngularMomentum.cc
-  PhaseSpaceIsobarDudekUnstableRhoPi.cc
-  PhaseSpaceIsobarLUT.cc
-  PhaseSpaceIsobarLUT1D.cc
-  PhaseSpaceIsobarReid.cc
-  PhaseSpaceIsobarReidAngularMomentum.cc
-  PhaseSpaceList.cc
-  RadMultipoleFormFactor.cc
-  TMatrixBase.cc
-  TMatrixNonRel.cc
-  TMatrixRel.cc
-  Voigtian.cc
+  ${sourcefiles}
 )
 
 target_include_directories(PwaDynamics
diff --git a/PwaUtils/CMakeLists.txt b/PwaUtils/CMakeLists.txt
index feaec0fbbcc7841c5d1e3208e8e16655a8c12b5a..72a0cf0885c47d5f99ddc499ad8446814d6e1faa 100644
--- a/PwaUtils/CMakeLists.txt
+++ b/PwaUtils/CMakeLists.txt
@@ -1,75 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(PwaUtils
-  AbsChannelEnv.cc
-  AbsDecay.cc
-  AbsDecayList.cc
-  AbsDynamics.cc
-  AbsHist.cc
-  AbsLh.cc
-  AbsStates.cc
-  AbsXdecAmp.cc
-  BlattWBarrierDynamics.cc
-  BlattWBarrierTensorDynamics.cc
-  BreitWignerBlattWRelDynamics.cc
-  BreitWignerBlattWTensorRelDynamics.cc
-  BreitWignerDynamics.cc
-  BreitWignerRelDynamics.cc
-  DataUtils.cc
-  DynRegistry.cc
-  EvtDataBaseList.cc
-  EvtDataListFactory.cc
-  EvtDataScatteringList.cc
-  FVectorCompareDynamics.cc
-  FVectorIntensityDynamics.cc
-  FixedKMatrixDynamics.cc
-  FlatteDynamics.cc
-  FormXDecAmps.cc
-  FormationDecay.cc
-  FsParticleProjections.cc
-  GlobalEnv.cc
-  HeliDecAmps.cc
-  HeliMultipoleDecNonRefAmps.cc
-  HeliMultipoleGeneralDecAmps.cc
-  IsobarHeliDecay.cc
-  IsobarLSDecay.cc
-  IsobarTensorDecay.cc
-  IsobarTensorPsiToGamXDecay.cc
-  IsobarTensorReducedRadDecay.cc
-  JohnsonDynamics.cc
-  K0star1430LassDynamics.cc
-  KMatrixDynamics.cc
-  KPiSWaveIso12Dynamics.cc
-  KPiSWaveIso32Dynamics.cc
-  KinUtils.cc
-  LSDecAmps.cc
-  LSOmegaTo3PiDecAmps.cc
-  LinearDynamics.cc
-  NetworkClient.cc
-  NetworkServer.cc
-  OmegaTo3PiDecay.cc
-  OmegaTo3PiLSDecay.cc
-  OmegaTo3PiTensorDecay.cc
-  OmnesDynamics.cc
-  PhpGenDynamics.cc
-  PiPiSWaveASDynamics.cc
-  PiPiScatteringDecay.cc
-  PiPiScatteringXdecAmps.cc
-  ProdChannelInfo.cc
-  ProdParamDynamics.cc
-  PwaGen.cc
-  RadM1Dynamics.cc
-  RootHist.cc
-  RootPiPiScatteringHist.cc
-  SExpDynamics.cc
-  TMatrixCompareDynamics.cc
-  TMatrixDynamics.cc
-  TensorDecAmps.cc
-  TensorOmegaTo3PiDecAmps.cc
-  TensorPsiToGamXDecAmps.cc
-  VoigtBlattWRelDynamics.cc
-  VoigtDynamics.cc
-  WoDynamics.cc
-  XdecAmpRegistry.cc
-  pbarpState.cc
+  ${sourcefiles}
 )
 
 target_include_directories(PwaUtils
diff --git a/Utils/CMakeLists.txt b/Utils/CMakeLists.txt
index 2dc022b0040fcc11d57b92d66db4f6824060f640..29e4ced83650a075be46c2a0b684dbc1ececf377 100644
--- a/Utils/CMakeLists.txt
+++ b/Utils/CMakeLists.txt
@@ -1,8 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(Utils  
-  Faddeeva.cc
-  FunctionUtils.cc
-  IdStringMapRegistry.cc
-  PawianIOUtils.cc
+  ${sourcefiles}
 )
 
 target_include_directories(Utils
diff --git a/Utils/FunctionUtils.hh b/Utils/FunctionUtils.hh
index 262ae482467671a8e41df07b82785dce36184d30..7ea0d13eada8370125b7131689acd8de89fd6cfa 100644
--- a/Utils/FunctionUtils.hh
+++ b/Utils/FunctionUtils.hh
@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include <sys/types.h>
+#include <cstdint>
 
 class Particle;
 class Spin;
diff --git a/epemUtils/CMakeLists.txt b/epemUtils/CMakeLists.txt
index a2839cc2ee636928da4c5accc684db7ea7ee76d8..7fa3181ed0fb90e6b5699bafcbaf6f5c0f1db85a 100644
--- a/epemUtils/CMakeLists.txt
+++ b/epemUtils/CMakeLists.txt
@@ -1,10 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(epemUtils
-  EpemChannelEnv.cc
-  epemBaseLh.cc
-  epemCanoLh.cc
-  epemHeliLh.cc
-  epemReaction.cc
-  epemTensorLh.cc
+  ${sourcefiles}
 )
 
 target_include_directories(epemUtils
diff --git a/ggUtils/CMakeLists.txt b/ggUtils/CMakeLists.txt
index 48f22d016a7b0efced3b80df9d840aa66967c059..358f59afc54b4d494a9171d2e5dc6440b5e5017d 100644
--- a/ggUtils/CMakeLists.txt
+++ b/ggUtils/CMakeLists.txt
@@ -1,10 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(ggUtils
-  GGChannelEnv.cc
-  centralProdBaseLh.cc
-  gamgamBaseLh.cc
-  ggReaction.cc
-  ggStates.cc  
-  pbarpProductionLh.cc 
+  ${sourcefiles}
 )
 
 target_include_directories(ggUtils
diff --git a/gslUtils/CMakeLists.txt b/gslUtils/CMakeLists.txt
index d5064f47634caa0855ea6e5a06fb3a1c1264f4a1..ea99d47864379bc08edaad39dd7167c0489a1a94 100644
--- a/gslUtils/CMakeLists.txt
+++ b/gslUtils/CMakeLists.txt
@@ -1,9 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(gslUtils  
-  CMIntegration.cc
-  CMIntegration2D.cc  
-  CMIntegration2DReid.cc  
-  CMIntegrationDudek.cc
-  CMIntegrationReid.cc  
+  ${sourcefiles}
 )
 
 target_include_directories(gslUtils
diff --git a/pbarpUtils/CMakeLists.txt b/pbarpUtils/CMakeLists.txt
index d66b43806f5a54f60a27f032022f34df45c7aee7..d972479784f4da771bfe981c79a2e9ce3fa3cc7b 100644
--- a/pbarpUtils/CMakeLists.txt
+++ b/pbarpUtils/CMakeLists.txt
@@ -1,12 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(pbarpUtils
-  PbarpChannelEnv.cc
-  pbarpBaseLh.cc
-  pbarpCanoLh.cc
-  pbarpHeliLh.cc
-  pbarpReaction.cc
-  pbarpStatesLS.cc
-  pbarpTensorLh.cc
-  spinDensityHist.cc
+  ${sourcefiles}
 )
 
 target_include_directories(pbarpUtils
diff --git a/pipiScatteringUtils/CMakeLists.txt b/pipiScatteringUtils/CMakeLists.txt
index c5d4e988d980a3742785c35bd8fc3bb4cc53e0e4..a04103b0bcc9fda88e11733dac16bc238bedba2f 100644
--- a/pipiScatteringUtils/CMakeLists.txt
+++ b/pipiScatteringUtils/CMakeLists.txt
@@ -1,6 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(pipiScatteringUtils
-  PiPiScatteringChannelEnv.cc
-  pipiScatteringBaseLh.cc
+  ${sourcefiles}
 )
 
 target_include_directories(pipiScatteringUtils
diff --git a/qaErrorExtract/CMakeLists.txt b/qaErrorExtract/CMakeLists.txt
index e9c510691f204ae809eca32ae466fddec54ddfe4..82ff09b7423a2c338dfa86d92eeba898cbe785f1 100644
--- a/qaErrorExtract/CMakeLists.txt
+++ b/qaErrorExtract/CMakeLists.txt
@@ -1,7 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(qaErrorExtract  
-  AbsCovMatErrorExtract.cc
-  ScatteringContribution.cc
-  WaveContribution.cc  
+  ${sourcefiles} 
 )
 
 target_include_directories(qaErrorExtract
diff --git a/qft++/CMakeLists.txt b/qft++/CMakeLists.txt
index f6a2967263b5ea9de28b921c946c4c86446d5769..a9775dcc5afee2976e2a560f71a67e3c61db0ec4 100644
--- a/qft++/CMakeLists.txt
+++ b/qft++/CMakeLists.txt
@@ -1,16 +1,35 @@
+file(GLOB sourcefilesRQM relativistic-quantum-mechanics/*.cc)
+file(GLOB sourcefilesTensor tensor/*.cc)
+file(GLOB sourcefilesMatrix matrix/*.cc)
+
+foreach(item IN LISTS sourcefilesRQM)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefilesRQM ${item})
+  endif()
+endforeach()
+
+foreach(item IN LISTS sourcefilesTensor)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefilesTensor ${item})
+  endif()
+endforeach()
+
+foreach(item IN LISTS sourcefilesMatrix)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefilesMatrix ${item})
+  endif()
+endforeach()
+
 add_library(qft++
-  relativistic-quantum-mechanics/BlattWeisskopf.cc
-  relativistic-quantum-mechanics/DiracAntiSpinor.cc
-  relativistic-quantum-mechanics/DiracSpinor.cc
-  relativistic-quantum-mechanics/PolVector.cc
-  relativistic-quantum-mechanics/Utils.cc
-  tensor/TensorIndex.cc
-  tensor/TensorIndexOrder.cc  
+  ${sourcefilesRQM}
+  ${sourcefilesTensor} 
+  ${sourcefilesMatrix} 
 )
 
 target_include_directories(qft++
   PRIVATE 
-    ${CMAKE_SOURCE_DIR}/  
+    ${CMAKE_SOURCE_DIR}/
+    topincludes/  
 )
 
 install(TARGETS qft++
diff --git a/qft++Extension/CMakeLists.txt b/qft++Extension/CMakeLists.txt
index 0764c158315b39fba7e2df0b9ef56af341aec2c9..8ef5592530716a60bf54fd93ea22457b077d3121 100644
--- a/qft++Extension/CMakeLists.txt
+++ b/qft++Extension/CMakeLists.txt
@@ -1,13 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(qft++Extension
-  AbsComplexFunction.cc
-  InputOmnesMatrixPiPiS5Channel.cc
-  InputSelfEnergyMatrixPiPiS5Channel.cc
-  OmnesMatrixFactory.cc
-  OmnesMatrixGeneral.cc
-  OmnesMatrixPiPiS3Channelwrhorho.cc
-  OmnesMatrixPiPiS5Channel.cc
-  PawianUtils.cc
-  SphericalHarmonic.cc
+  ${sourcefiles}
 )
 
 target_include_directories(qft++Extension
diff --git a/resUtils/CMakeLists.txt b/resUtils/CMakeLists.txt
index ffaf365a1f29bf5b82d69ff218c9edd05a180bbd..8d28257ca49dad2849cd8d1264f00ebf6186e6c4 100644
--- a/resUtils/CMakeLists.txt
+++ b/resUtils/CMakeLists.txt
@@ -1,8 +1,12 @@
+file(GLOB sourcefiles *.cc)
+foreach(item IN LISTS sourcefiles)  
+  if(${item} MATCHES "App.cc")
+    list(REMOVE_ITEM sourcefiles ${item})
+  endif()
+endforeach()
+
 add_library(resUtils
-  ResChannelEnv.cc
-  res1DMassShapeLh.cc
-  resBaseLh.cc
-  resReaction.cc 
+  ${sourcefiles} 
 )
 
 target_include_directories(resUtils