10 files changed, 15 insertions, 8 deletions
diff --git a/Source/Particles/Collision/BackgroundMCCCollision.H b/Source/Particles/Collision/BackgroundMCC/BackgroundMCCCollision.H
index ac08f6102..ff447c407 100644
--- a/Source/Particles/Collision/BackgroundMCCCollision.H
+++ b/Source/Particles/Collision/BackgroundMCC/BackgroundMCCCollision.H
@@ -7,9 +7,9 @@
 #ifndef WARPX_PARTICLES_COLLISION_BACKGROUNDMCCCOLLISION_H_
 #define WARPX_PARTICLES_COLLISION_BACKGROUNDMCCCOLLISION_H_
 
-#include "Particles/MultiParticleContainer.H"
-#include "CollisionBase.H"
 #include "MCCProcess.H"
+#include "Particles/MultiParticleContainer.H"
+#include "Particles/Collision/CollisionBase.H"
 
 #include <AMReX_Parser.H>
 #include <AMReX_REAL.H>
diff --git a/Source/Particles/Collision/BackgroundMCCCollision.cpp b/Source/Particles/Collision/BackgroundMCC/BackgroundMCCCollision.cpp
index 615fb9418..615fb9418 100644
--- a/Source/Particles/Collision/BackgroundMCCCollision.cpp
+++ b/Source/Particles/Collision/BackgroundMCC/BackgroundMCCCollision.cpp
diff --git a/Source/Particles/Collision/BackgroundMCC/CMakeLists.txt b/Source/Particles/Collision/BackgroundMCC/CMakeLists.txt
new file mode 100644
index 000000000..82df1d965
--- /dev/null
+++ b/Source/Particles/Collision/BackgroundMCC/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(WarpX
+  PRIVATE
+    BackgroundMCCCollision.cpp
+    MCCProcess.cpp
+)
diff --git a/Source/Particles/Collision/MCCProcess.H b/Source/Particles/Collision/BackgroundMCC/MCCProcess.H
index 36e7635d0..36e7635d0 100644
--- a/Source/Particles/Collision/MCCProcess.H
+++ b/Source/Particles/Collision/BackgroundMCC/MCCProcess.H
diff --git a/Source/Particles/Collision/MCCProcess.cpp b/Source/Particles/Collision/BackgroundMCC/MCCProcess.cpp
index 4fa0bc744..4fa0bc744 100644
--- a/Source/Particles/Collision/MCCProcess.cpp
+++ b/Source/Particles/Collision/BackgroundMCC/MCCProcess.cpp
diff --git a/Source/Particles/Collision/MCCScattering.H b/Source/Particles/Collision/BackgroundMCC/MCCScattering.H
index 71bd7cb2b..71bd7cb2b 100644
--- a/Source/Particles/Collision/MCCScattering.H
+++ b/Source/Particles/Collision/BackgroundMCC/MCCScattering.H
diff --git a/Source/Particles/Collision/BackgroundMCC/Make.package b/Source/Particles/Collision/BackgroundMCC/Make.package
new file mode 100644
index 000000000..0b007e64e
--- /dev/null
+++ b/Source/Particles/Collision/BackgroundMCC/Make.package
@@ -0,0 +1,4 @@
+CEXE_sources += BackgroundMCCCollision.cpp
+CEXE_sources += MCCProcess.cpp
+
+VPATH_LOCATIONS   += $(WARPX_HOME)/Source/Particles/Collision/BackgroundMCC
diff --git a/Source/Particles/Collision/CMakeLists.txt b/Source/Particles/Collision/CMakeLists.txt
index d0348fdb4..8cc8da713 100644
--- a/Source/Particles/Collision/CMakeLists.txt
+++ b/Source/Particles/Collision/CMakeLists.txt
@@ -2,9 +2,8 @@ target_sources(WarpX
   PRIVATE
     CollisionHandler.cpp
     CollisionBase.cpp
-    BackgroundMCCCollision.cpp
-    MCCProcess.cpp
 )
 
 add_subdirectory(BinaryCollision)
+add_subdirectory(BackgroundMCC)
 add_subdirectory(BackgroundStopping)
diff --git a/Source/Particles/Collision/CollisionHandler.cpp b/Source/Particles/Collision/CollisionHandler.cpp
index 1c1fff447..0c5304823 100644
--- a/Source/Particles/Collision/CollisionHandler.cpp
+++ b/Source/Particles/Collision/CollisionHandler.cpp
@@ -6,12 +6,12 @@
  */
 #include "CollisionHandler.H"
 
-#include "BackgroundMCCCollision.H"
+#include "Particles/Collision/BackgroundMCC/BackgroundMCCCollision.H"
+#include "Particles/Collision/BackgroundStopping/BackgroundStopping.H"
 #include "Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H"
 #include "Particles/Collision/BinaryCollision/BinaryCollision.H"
 #include "Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H"
 #include "Particles/Collision/BinaryCollision/ParticleCreationFunc.H"
-#include "Particles/Collision/BackgroundStopping/BackgroundStopping.H"
 #include "Utils/TextMsg.H"
 
 #include <AMReX_ParmParse.H>
diff --git a/Source/Particles/Collision/Make.package b/Source/Particles/Collision/Make.package
index 330e99e08..e9aad3691 100644
--- a/Source/Particles/Collision/Make.package
+++ b/Source/Particles/Collision/Make.package
@@ -1,9 +1,8 @@
 CEXE_sources += CollisionHandler.cpp
 CEXE_sources += CollisionBase.cpp
-CEXE_sources += BackgroundMCCCollision.cpp
-CEXE_sources += MCCProcess.cpp
 
 include $(WARPX_HOME)/Source/Particles/Collision/BinaryCollision/Make.package
+include $(WARPX_HOME)/Source/Particles/Collision/BackgroundMCC/Make.package
 include $(WARPX_HOME)/Source/Particles/Collision/BackgroundStopping/Make.package
 
 VPATH_LOCATIONS   += $(WARPX_HOME)/Source/Particles/Collision