From: degomme <augustin.degomme@unibas.ch>
Date: Sat, 11 Mar 2017 17:53:31 +0000 (+0100)
Subject: Move collective algorithms to separate folders
X-Git-Tag: v3_15~118
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/40616078da72e823931c1fb884949054699ec39d

Move collective algorithms to separate folders
---

diff --git a/src/smpi/colls/allgather-2dmesh.cpp b/src/smpi/colls/allgather/allgather-2dmesh.cpp
similarity index 99%
rename from src/smpi/colls/allgather-2dmesh.cpp
rename to src/smpi/colls/allgather/allgather-2dmesh.cpp
index 9217ab3900..21be3ac9e2 100644
--- a/src/smpi/colls/allgather-2dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-2dmesh.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgather-3dmesh.cpp b/src/smpi/colls/allgather/allgather-3dmesh.cpp
similarity index 99%
rename from src/smpi/colls/allgather-3dmesh.cpp
rename to src/smpi/colls/allgather/allgather-3dmesh.cpp
index 911c432837..dfe154d01f 100644
--- a/src/smpi/colls/allgather-3dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-3dmesh.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgather-GB.cpp b/src/smpi/colls/allgather/allgather-GB.cpp
similarity index 96%
rename from src/smpi/colls/allgather-GB.cpp
rename to src/smpi/colls/allgather/allgather-GB.cpp
index 054947a26a..1a107b02c9 100644
--- a/src/smpi/colls/allgather-GB.cpp
+++ b/src/smpi/colls/allgather/allgather-GB.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 // Allgather - gather/bcast algorithm
 int smpi_coll_tuned_allgather_GB(void *send_buff, int send_count,
diff --git a/src/smpi/colls/allgather-NTSLR-NB.cpp b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
similarity index 98%
rename from src/smpi/colls/allgather-NTSLR-NB.cpp
rename to src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
index 9b5571742d..dd1018a592 100644
--- a/src/smpi/colls/allgather-NTSLR-NB.cpp
+++ b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 // Allgather-Non-Topoloty-Scecific-Logical-Ring algorithm
 int
diff --git a/src/smpi/colls/allgather-NTSLR.cpp b/src/smpi/colls/allgather/allgather-NTSLR.cpp
similarity index 98%
rename from src/smpi/colls/allgather-NTSLR.cpp
rename to src/smpi/colls/allgather/allgather-NTSLR.cpp
index 8900708554..5191e85e28 100644
--- a/src/smpi/colls/allgather-NTSLR.cpp
+++ b/src/smpi/colls/allgather/allgather-NTSLR.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 // Allgather-Non-Topoloty-Scecific-Logical-Ring algorithm
 int
diff --git a/src/smpi/colls/allgather-SMP-NTS.cpp b/src/smpi/colls/allgather/allgather-SMP-NTS.cpp
similarity index 99%
rename from src/smpi/colls/allgather-SMP-NTS.cpp
rename to src/smpi/colls/allgather/allgather-SMP-NTS.cpp
index 634eb21917..0ea5ff7d24 100644
--- a/src/smpi/colls/allgather-SMP-NTS.cpp
+++ b/src/smpi/colls/allgather/allgather-SMP-NTS.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allgather_SMP_NTS(void *sbuf, int scount,
                                       MPI_Datatype stype, void *rbuf,
diff --git a/src/smpi/colls/allgather-bruck.cpp b/src/smpi/colls/allgather/allgather-bruck.cpp
similarity index 99%
rename from src/smpi/colls/allgather-bruck.cpp
rename to src/smpi/colls/allgather/allgather-bruck.cpp
index c674f1746c..68edee294d 100644
--- a/src/smpi/colls/allgather-bruck.cpp
+++ b/src/smpi/colls/allgather/allgather-bruck.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgather-loosely-lr.cpp b/src/smpi/colls/allgather/allgather-loosely-lr.cpp
similarity index 99%
rename from src/smpi/colls/allgather-loosely-lr.cpp
rename to src/smpi/colls/allgather/allgather-loosely-lr.cpp
index 5bc889ea0b..1d31885092 100644
--- a/src/smpi/colls/allgather-loosely-lr.cpp
+++ b/src/smpi/colls/allgather/allgather-loosely-lr.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allgather_loosely_lr(void *sbuf, int scount,
                                          MPI_Datatype stype, void *rbuf,
diff --git a/src/smpi/colls/allgather-mvapich-smp.cpp b/src/smpi/colls/allgather/allgather-mvapich-smp.cpp
similarity index 99%
rename from src/smpi/colls/allgather-mvapich-smp.cpp
rename to src/smpi/colls/allgather/allgather-mvapich-smp.cpp
index e69b3c83d8..32d4aea198 100644
--- a/src/smpi/colls/allgather-mvapich-smp.cpp
+++ b/src/smpi/colls/allgather/allgather-mvapich-smp.cpp
@@ -34,7 +34,7 @@
  *  (C) 2001 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
- #include "colls_private.h"
+ #include "../colls_private.h"
 
 
 
diff --git a/src/smpi/colls/allgather-ompi-neighborexchange.cpp b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
similarity index 99%
rename from src/smpi/colls/allgather-ompi-neighborexchange.cpp
rename to src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
index 4a2fa1cce8..d8f9e8d968 100644
--- a/src/smpi/colls/allgather-ompi-neighborexchange.cpp
+++ b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
@@ -62,7 +62,7 @@
  *         [5]    [5]    [5]    [5]    [5]    [5]
  */
  
- #include "colls_private.h"
+ #include "../colls_private.h"
 int 
 smpi_coll_tuned_allgather_ompi_neighborexchange(void *sbuf, int scount,
                                                  MPI_Datatype sdtype,
diff --git a/src/smpi/colls/allgather-pair.cpp b/src/smpi/colls/allgather/allgather-pair.cpp
similarity index 99%
rename from src/smpi/colls/allgather-pair.cpp
rename to src/smpi/colls/allgather/allgather-pair.cpp
index 5dd17f7fc4..cfec7c89fb 100644
--- a/src/smpi/colls/allgather-pair.cpp
+++ b/src/smpi/colls/allgather/allgather-pair.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgather-rdb.cpp b/src/smpi/colls/allgather/allgather-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allgather-rdb.cpp
rename to src/smpi/colls/allgather/allgather-rdb.cpp
index 93b0e77f65..8fb6efa6ef 100644
--- a/src/smpi/colls/allgather-rdb.cpp
+++ b/src/smpi/colls/allgather/allgather-rdb.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int
 smpi_coll_tuned_allgather_rdb(void *sbuf, int send_count,
diff --git a/src/smpi/colls/allgather-rhv.cpp b/src/smpi/colls/allgather/allgather-rhv.cpp
similarity index 99%
rename from src/smpi/colls/allgather-rhv.cpp
rename to src/smpi/colls/allgather/allgather-rhv.cpp
index 4b9db92878..8e7f44bd28 100644
--- a/src/smpi/colls/allgather-rhv.cpp
+++ b/src/smpi/colls/allgather/allgather-rhv.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 // now only work with power of two processes
 
diff --git a/src/smpi/colls/allgather-ring.cpp b/src/smpi/colls/allgather/allgather-ring.cpp
similarity index 99%
rename from src/smpi/colls/allgather-ring.cpp
rename to src/smpi/colls/allgather/allgather-ring.cpp
index 01c5b13f07..c638b25bd1 100644
--- a/src/smpi/colls/allgather-ring.cpp
+++ b/src/smpi/colls/allgather/allgather-ring.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgather-smp-simple.cpp b/src/smpi/colls/allgather/allgather-smp-simple.cpp
similarity index 99%
rename from src/smpi/colls/allgather-smp-simple.cpp
rename to src/smpi/colls/allgather/allgather-smp-simple.cpp
index 17967526e8..8d7f190a86 100644
--- a/src/smpi/colls/allgather-smp-simple.cpp
+++ b/src/smpi/colls/allgather/allgather-smp-simple.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allgather_smp_simple(void *send_buf, int scount,
                                          MPI_Datatype stype, void *recv_buf,
diff --git a/src/smpi/colls/allgather-spreading-simple.cpp b/src/smpi/colls/allgather/allgather-spreading-simple.cpp
similarity index 99%
rename from src/smpi/colls/allgather-spreading-simple.cpp
rename to src/smpi/colls/allgather/allgather-spreading-simple.cpp
index 3f7a55145e..539358f2f1 100644
--- a/src/smpi/colls/allgather-spreading-simple.cpp
+++ b/src/smpi/colls/allgather/allgather-spreading-simple.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgatherv-GB.cpp b/src/smpi/colls/allgatherv/allgatherv-GB.cpp
similarity index 97%
rename from src/smpi/colls/allgatherv-GB.cpp
rename to src/smpi/colls/allgatherv/allgatherv-GB.cpp
index 7941bcacf4..bd53450ae0 100644
--- a/src/smpi/colls/allgatherv-GB.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-GB.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 // Allgather - gather/bcast algorithm
 int smpi_coll_tuned_allgatherv_GB(void *send_buff, int send_count,
diff --git a/src/smpi/colls/allgatherv-mpich-rdb.cpp b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-mpich-rdb.cpp
rename to src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp
index 384dbc2e2a..c224fbd7d8 100644
--- a/src/smpi/colls/allgatherv-mpich-rdb.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp
@@ -6,7 +6,7 @@
 
         /* Short or medium size message and power-of-two no. of processes. Use
          * recursive doubling algorithm */
-#include "colls_private.h"
+#include "../colls_private.h"
 int smpi_coll_tuned_allgatherv_mpich_rdb (
   void *sendbuf,
   int sendcount,
diff --git a/src/smpi/colls/allgatherv-mpich-ring.cpp b/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-mpich-ring.cpp
rename to src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp
index 4dcca0a457..2deb294b6d 100644
--- a/src/smpi/colls/allgatherv-mpich-ring.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp
@@ -10,7 +10,7 @@
  *      See COPYRIGHT in top-level directory.
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
  * Function: allgather_mpich_ring
diff --git a/src/smpi/colls/allgatherv-ompi-bruck.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-ompi-bruck.cpp
rename to src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp
index c18c40032a..f93667533b 100644
--- a/src/smpi/colls/allgatherv-ompi-bruck.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp
@@ -20,7 +20,7 @@
  * Additional copyrights may follow
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*
  * ompi_coll_tuned_allgatherv_intra_bruck
  *
diff --git a/src/smpi/colls/allgatherv-ompi-neighborexchange.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
rename to src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
index 1679e38c9c..025c8b8779 100644
--- a/src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
@@ -63,7 +63,7 @@
  *         [5]    [5]    [5]    [5]    [5]    [5]
  */
  
- #include "colls_private.h"
+ #include "../colls_private.h"
  
 int 
 smpi_coll_tuned_allgatherv_ompi_neighborexchange(void *sbuf, int scount,
diff --git a/src/smpi/colls/allgatherv-pair.cpp b/src/smpi/colls/allgatherv/allgatherv-pair.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-pair.cpp
rename to src/smpi/colls/allgatherv/allgatherv-pair.cpp
index 4a618c7b80..438c8634b4 100644
--- a/src/smpi/colls/allgatherv-pair.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-pair.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allgatherv-ring.cpp b/src/smpi/colls/allgatherv/allgatherv-ring.cpp
similarity index 99%
rename from src/smpi/colls/allgatherv-ring.cpp
rename to src/smpi/colls/allgatherv/allgatherv-ring.cpp
index 3b0c6ccefe..7d7927ec7b 100644
--- a/src/smpi/colls/allgatherv-ring.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-ring.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/allreduce-lr.cpp b/src/smpi/colls/allreduce/allreduce-lr.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-lr.cpp
rename to src/smpi/colls/allreduce/allreduce-lr.cpp
index 1a56a3be2b..ab847ee411 100644
--- a/src/smpi/colls/allreduce-lr.cpp
+++ b/src/smpi/colls/allreduce/allreduce-lr.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /* IMPLEMENTED BY PITCH PATARASUK 
    Non-topoloty-specific all-reduce operation designed bandwidth optimally 
diff --git a/src/smpi/colls/allreduce-mvapich-rs.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-mvapich-rs.cpp
rename to src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
index e887175454..e8789a11d9 100644
--- a/src/smpi/colls/allreduce-mvapich-rs.cpp
+++ b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allreduce_mvapich2_rs(void *sendbuf,
                             void *recvbuf,
diff --git a/src/smpi/colls/allreduce-mvapich-two-level.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-mvapich-two-level.cpp
rename to src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp
index b09b50d54f..d2a2264c82 100644
--- a/src/smpi/colls/allreduce-mvapich-two-level.cpp
+++ b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp
@@ -35,7 +35,7 @@
  *      See COPYRIGHT in top-level directory.
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 #define MPIR_Allreduce_pt2pt_rd_MV2 smpi_coll_tuned_allreduce_rdb
 #define MPIR_Allreduce_pt2pt_rs_MV2 smpi_coll_tuned_allreduce_mvapich2_rs
diff --git a/src/smpi/colls/allreduce-ompi-ring-segmented.cpp b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-ompi-ring-segmented.cpp
rename to src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
index 8ed4e69284..595a189ff8 100644
--- a/src/smpi/colls/allreduce-ompi-ring-segmented.cpp
+++ b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
@@ -153,7 +153,7 @@
         EARLY_BLOCK_COUNT = EARLY_BLOCK_COUNT + 1;                           \
     }                                                                        \
 
-#include "colls_private.h"
+#include "../colls_private.h"
 int 
 smpi_coll_tuned_allreduce_ompi_ring_segmented(void *sbuf, void *rbuf, int count,
                                                MPI_Datatype dtype,
diff --git a/src/smpi/colls/allreduce-rab-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-rab-rdb.cpp
rename to src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
index 29d727fcbd..f72175bd09 100644
--- a/src/smpi/colls/allreduce-rab-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allreduce_rab_rdb(void *sbuff, void *rbuff, int count,
                                       MPI_Datatype dtype, MPI_Op op,
diff --git a/src/smpi/colls/allreduce-rab1.cpp b/src/smpi/colls/allreduce/allreduce-rab1.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-rab1.cpp
rename to src/smpi/colls/allreduce/allreduce-rab1.cpp
index 687aa7d34c..96c71055af 100644
--- a/src/smpi/colls/allreduce-rab1.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rab1.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 // NP pow of 2 for now
diff --git a/src/smpi/colls/allreduce-rab2.cpp b/src/smpi/colls/allreduce/allreduce-rab2.cpp
similarity index 98%
rename from src/smpi/colls/allreduce-rab2.cpp
rename to src/smpi/colls/allreduce/allreduce-rab2.cpp
index d11b9f20bb..007a42b842 100644
--- a/src/smpi/colls/allreduce-rab2.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rab2.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 // this requires that count >= NP
diff --git a/src/smpi/colls/allreduce-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-rdb.cpp
rename to src/smpi/colls/allreduce/allreduce-rdb.cpp
index 5fc1f2bd36..cb99c01b54 100644
--- a/src/smpi/colls/allreduce-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rdb.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
diff --git a/src/smpi/colls/allreduce-redbcast.cpp b/src/smpi/colls/allreduce/allreduce-redbcast.cpp
similarity index 95%
rename from src/smpi/colls/allreduce-redbcast.cpp
rename to src/smpi/colls/allreduce/allreduce-redbcast.cpp
index 20b4481dd7..26b9585300 100644
--- a/src/smpi/colls/allreduce-redbcast.cpp
+++ b/src/smpi/colls/allreduce/allreduce-redbcast.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_allreduce_redbcast(void *buf, void *buf2, int count,
                                        MPI_Datatype datatype, MPI_Op op,
diff --git a/src/smpi/colls/allreduce-smp-binomial-pipeline.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
index d0255a5fc4..9484f2652f 100644
--- a/src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /* IMPLEMENTED BY PITCH PATARASUK 
    Non-topoloty-specific (however, number of cores/node need to be changed) 
    all-reduce operation designed for smp clusters
diff --git a/src/smpi/colls/allreduce-smp-binomial.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-binomial.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
index a813a45765..2545da91f6 100644
--- a/src/smpi/colls/allreduce-smp-binomial.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /* IMPLEMENTED BY PITCH PATARASUK 
    Non-topoloty-specific (however, number of cores/node need to be changed) 
    all-reduce operation designed for smp clusters
diff --git a/src/smpi/colls/allreduce-smp-rdb.cpp b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-rdb.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
index c82a3eabb4..a5b40f1707 100644
--- a/src/smpi/colls/allreduce-smp-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /* IMPLEMENTED BY PITCH PATARASUK 
    Non-topoloty-specific (however, number of cores/node need to be changed) 
    all-reduce operation designed for smp clusters
diff --git a/src/smpi/colls/allreduce-smp-rsag-lr.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-rsag-lr.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp
index e005025ca1..23abf0fde2 100644
--- a/src/smpi/colls/allreduce-smp-rsag-lr.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 /*
diff --git a/src/smpi/colls/allreduce-smp-rsag-rab.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-rsag-rab.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
index 5b54dc136d..021279555e 100644
--- a/src/smpi/colls/allreduce-smp-rsag-rab.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
@@ -7,7 +7,7 @@
 /* 
  * implemented by Pitch Patarasuk, 07/01/2007
  */
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 
diff --git a/src/smpi/colls/allreduce-smp-rsag.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp
similarity index 99%
rename from src/smpi/colls/allreduce-smp-rsag.cpp
rename to src/smpi/colls/allreduce/allreduce-smp-rsag.cpp
index 1af69494e3..4cb5d31b03 100644
--- a/src/smpi/colls/allreduce-smp-rsag.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*
 This fucntion performs all-reduce operation as follow.
diff --git a/src/smpi/colls/alltoall-2dmesh.cpp b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
similarity index 99%
rename from src/smpi/colls/alltoall-2dmesh.cpp
rename to src/smpi/colls/alltoall/alltoall-2dmesh.cpp
index 28a3c772ed..ca0702735e 100644
--- a/src/smpi/colls/alltoall-2dmesh.cpp
+++ b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 #include <math.h>
 
 /*****************************************************************************
diff --git a/src/smpi/colls/alltoall-3dmesh.cpp b/src/smpi/colls/alltoall/alltoall-3dmesh.cpp
similarity index 99%
rename from src/smpi/colls/alltoall-3dmesh.cpp
rename to src/smpi/colls/alltoall/alltoall-3dmesh.cpp
index 10735e0a4d..742998e92c 100644
--- a/src/smpi/colls/alltoall-3dmesh.cpp
+++ b/src/smpi/colls/alltoall/alltoall-3dmesh.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 #include <math.h>
 
 /*****************************************************************************
diff --git a/src/smpi/colls/alltoall-bruck.cpp b/src/smpi/colls/alltoall/alltoall-bruck.cpp
similarity index 100%
rename from src/smpi/colls/alltoall-bruck.cpp
rename to src/smpi/colls/alltoall/alltoall-bruck.cpp
diff --git a/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp b/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
similarity index 99%
rename from src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
rename to src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
index 348f069bcc..047c876779 100644
--- a/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
+++ b/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
@@ -41,7 +41,7 @@
 //correct on stampede
 #define MV2_ALLTOALL_THROTTLE_FACTOR         4
  
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_alltoall_mvapich2_scatter_dest(
                             void *sendbuf,
diff --git a/src/smpi/colls/alltoall-pair-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-pair-light-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
index 82d80dee91..6b5f3e8d39 100644
--- a/src/smpi/colls/alltoall-pair-light-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair_light_barrier
diff --git a/src/smpi/colls/alltoall-pair-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-pair-mpi-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
index 33823414bf..2493ca433e 100644
--- a/src/smpi/colls/alltoall-pair-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair_mpi_barrier
diff --git a/src/smpi/colls/alltoall-pair-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-pair-one-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
index 75ac17b338..6a12962759 100644
--- a/src/smpi/colls/alltoall-pair-one-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair
diff --git a/src/smpi/colls/alltoall-pair.cpp b/src/smpi/colls/alltoall/alltoall-pair.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-pair.cpp
rename to src/smpi/colls/alltoall/alltoall-pair.cpp
index 3e5c4f406f..4d2956af3d 100644
--- a/src/smpi/colls/alltoall-pair.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/alltoall-rdb.cpp b/src/smpi/colls/alltoall/alltoall-rdb.cpp
similarity index 99%
rename from src/smpi/colls/alltoall-rdb.cpp
rename to src/smpi/colls/alltoall/alltoall-rdb.cpp
index 709e4542d9..92a0722e7d 100644
--- a/src/smpi/colls/alltoall-rdb.cpp
+++ b/src/smpi/colls/alltoall/alltoall-rdb.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/alltoall-ring-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-ring-light-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
index 8bd4dcfb26..f670da3b63 100644
--- a/src/smpi/colls/alltoall-ring-light-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring_light_barrier
diff --git a/src/smpi/colls/alltoall-ring-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-ring-mpi-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
index 20a1a43e0b..aefe70fe5b 100644
--- a/src/smpi/colls/alltoall-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring_mpi_barrier
diff --git a/src/smpi/colls/alltoall-ring-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-ring-one-barrier.cpp
rename to src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
index 577496dd25..7ad212aa86 100644
--- a/src/smpi/colls/alltoall-ring-one-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring
diff --git a/src/smpi/colls/alltoall-ring.cpp b/src/smpi/colls/alltoall/alltoall-ring.cpp
similarity index 98%
rename from src/smpi/colls/alltoall-ring.cpp
rename to src/smpi/colls/alltoall/alltoall-ring.cpp
index 34138e811a..dea762e39b 100644
--- a/src/smpi/colls/alltoall-ring.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring
diff --git a/src/smpi/colls/alltoallv-bruck.cpp b/src/smpi/colls/alltoallv/alltoallv-bruck.cpp
similarity index 99%
rename from src/smpi/colls/alltoallv-bruck.cpp
rename to src/smpi/colls/alltoallv/alltoallv-bruck.cpp
index 3be1b0b5f6..3a6f9e5a03 100644
--- a/src/smpi/colls/alltoallv-bruck.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-bruck.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /**
  * Alltoall Bruck
diff --git a/src/smpi/colls/alltoallv-ompi-basic-linear.cpp b/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp
similarity index 99%
rename from src/smpi/colls/alltoallv-ompi-basic-linear.cpp
rename to src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp
index 3439a7932a..0dfa76eb26 100644
--- a/src/smpi/colls/alltoallv-ompi-basic-linear.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*  
  * Linear functions are copied from the basic coll module.  For
  * some small number of nodes and/or small data sizes they are just as
diff --git a/src/smpi/colls/alltoallv-pair-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-pair-light-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
index d5ad392852..13b0396291 100644
--- a/src/smpi/colls/alltoallv-pair-light-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair_light_barrier
diff --git a/src/smpi/colls/alltoallv-pair-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
index 454a11012a..a24b0fb392 100644
--- a/src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair_mpi_barrier
diff --git a/src/smpi/colls/alltoallv-pair-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-pair-one-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
index 66b04e29b4..2118658225 100644
--- a/src/smpi/colls/alltoallv-pair-one-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_pair
diff --git a/src/smpi/colls/alltoallv-pair.cpp b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-pair.cpp
rename to src/smpi/colls/alltoallv/alltoallv-pair.cpp
index f816e7a7bb..c8e276c4a0 100644
--- a/src/smpi/colls/alltoallv-pair.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/alltoallv-ring-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-ring-light-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
index d363abc275..eb9ef77798 100644
--- a/src/smpi/colls/alltoallv-ring-light-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring_light_barrier
diff --git a/src/smpi/colls/alltoallv-ring-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
index 988d63c29b..840a9d5e0d 100644
--- a/src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring_mpi_barrier
diff --git a/src/smpi/colls/alltoallv-ring-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-ring-one-barrier.cpp
rename to src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
index e972a3759a..1bb68f7fe1 100644
--- a/src/smpi/colls/alltoallv-ring-one-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring
diff --git a/src/smpi/colls/alltoallv-ring.cpp b/src/smpi/colls/alltoallv/alltoallv-ring.cpp
similarity index 98%
rename from src/smpi/colls/alltoallv-ring.cpp
rename to src/smpi/colls/alltoallv/alltoallv-ring.cpp
index e64fe12898..4ac63179aa 100644
--- a/src/smpi/colls/alltoallv-ring.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 /*****************************************************************************
 
  * Function: alltoall_ring
diff --git a/src/smpi/colls/barrier-mvapich2-pair.cpp b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
similarity index 98%
rename from src/smpi/colls/barrier-mvapich2-pair.cpp
rename to src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
index 67b3f7b368..bdcb4456d0 100644
--- a/src/smpi/colls/barrier-mvapich2-pair.cpp
+++ b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
@@ -39,8 +39,8 @@
  *
  */
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 int smpi_coll_tuned_barrier_mvapich2_pair(MPI_Comm comm)
 {
diff --git a/src/smpi/colls/barrier-ompi.cpp b/src/smpi/colls/barrier/barrier-ompi.cpp
similarity index 99%
rename from src/smpi/colls/barrier-ompi.cpp
rename to src/smpi/colls/barrier/barrier-ompi.cpp
index 69a9a94d03..2b08bdf772 100644
--- a/src/smpi/colls/barrier-ompi.cpp
+++ b/src/smpi/colls/barrier/barrier-ompi.cpp
@@ -20,8 +20,8 @@
  * Additional copyrights may follow
  */
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 
 /*
diff --git a/src/smpi/colls/bcast-NTSB.cpp b/src/smpi/colls/bcast/bcast-NTSB.cpp
similarity index 99%
rename from src/smpi/colls/bcast-NTSB.cpp
rename to src/smpi/colls/bcast/bcast-NTSB.cpp
index 6d32644f10..74225c12d3 100644
--- a/src/smpi/colls/bcast-NTSB.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSB.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int bcast_NTSB_segment_size_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-NTSL-Isend.cpp b/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
similarity index 99%
rename from src/smpi/colls/bcast-NTSL-Isend.cpp
rename to src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
index e259cba30c..78cb092044 100644
--- a/src/smpi/colls/bcast-NTSL-Isend.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 static int bcast_NTSL_segment_size_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-NTSL.cpp b/src/smpi/colls/bcast/bcast-NTSL.cpp
similarity index 99%
rename from src/smpi/colls/bcast-NTSL.cpp
rename to src/smpi/colls/bcast/bcast-NTSL.cpp
index 80a1167fb0..740efeb704 100644
--- a/src/smpi/colls/bcast-NTSL.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSL.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 static int bcast_NTSL_segment_size_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-SMP-binary.cpp b/src/smpi/colls/bcast/bcast-SMP-binary.cpp
similarity index 99%
rename from src/smpi/colls/bcast-SMP-binary.cpp
rename to src/smpi/colls/bcast/bcast-SMP-binary.cpp
index 5cdf4d5227..fa9cf451ae 100644
--- a/src/smpi/colls/bcast-SMP-binary.cpp
+++ b/src/smpi/colls/bcast/bcast-SMP-binary.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 
 int bcast_SMP_binary_segment_byte = 8192;
diff --git a/src/smpi/colls/bcast-SMP-binomial.cpp b/src/smpi/colls/bcast/bcast-SMP-binomial.cpp
similarity index 99%
rename from src/smpi/colls/bcast-SMP-binomial.cpp
rename to src/smpi/colls/bcast/bcast-SMP-binomial.cpp
index 57c0b4cfa1..5ac33b6cd5 100644
--- a/src/smpi/colls/bcast-SMP-binomial.cpp
+++ b/src/smpi/colls/bcast/bcast-SMP-binomial.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int smpi_coll_tuned_bcast_SMP_binomial(void *buf, int count,
                                        MPI_Datatype datatype, int root,
diff --git a/src/smpi/colls/bcast-SMP-linear.cpp b/src/smpi/colls/bcast/bcast-SMP-linear.cpp
similarity index 99%
rename from src/smpi/colls/bcast-SMP-linear.cpp
rename to src/smpi/colls/bcast/bcast-SMP-linear.cpp
index c440a11e7d..356c53ac2a 100644
--- a/src/smpi/colls/bcast-SMP-linear.cpp
+++ b/src/smpi/colls/bcast/bcast-SMP-linear.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int bcast_SMP_linear_segment_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp
similarity index 99%
rename from src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
rename to src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp
index b6cb24767c..b070bef4e8 100644
--- a/src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
+++ b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int bcast_arrival_pattern_aware_wait_segment_size_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-arrival-pattern-aware.cpp b/src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp
similarity index 99%
rename from src/smpi/colls/bcast-arrival-pattern-aware.cpp
rename to src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp
index ff1a1c6b54..81eb7ae73f 100644
--- a/src/smpi/colls/bcast-arrival-pattern-aware.cpp
+++ b/src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 static int bcast_NTSL_segment_size_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-arrival-scatter.cpp b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
similarity index 99%
rename from src/smpi/colls/bcast-arrival-scatter.cpp
rename to src/smpi/colls/bcast/bcast-arrival-scatter.cpp
index 7ca4fd6189..2f0ab213c1 100644
--- a/src/smpi/colls/bcast-arrival-scatter.cpp
+++ b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 #ifndef BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE
 #define BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE 128
diff --git a/src/smpi/colls/bcast-binomial-tree.cpp b/src/smpi/colls/bcast/bcast-binomial-tree.cpp
similarity index 99%
rename from src/smpi/colls/bcast-binomial-tree.cpp
rename to src/smpi/colls/bcast/bcast-binomial-tree.cpp
index 9e729da8c1..0ab2538705 100644
--- a/src/smpi/colls/bcast-binomial-tree.cpp
+++ b/src/smpi/colls/bcast/bcast-binomial-tree.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/bcast-flattree-pipeline.cpp b/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
similarity index 98%
rename from src/smpi/colls/bcast-flattree-pipeline.cpp
rename to src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
index 21e247ea06..bac37d28dd 100644
--- a/src/smpi/colls/bcast-flattree-pipeline.cpp
+++ b/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int flattree_segment_in_byte = 8192;
 
diff --git a/src/smpi/colls/bcast-flattree.cpp b/src/smpi/colls/bcast/bcast-flattree.cpp
similarity index 97%
rename from src/smpi/colls/bcast-flattree.cpp
rename to src/smpi/colls/bcast/bcast-flattree.cpp
index 5fe60c16d2..2a307f5f17 100644
--- a/src/smpi/colls/bcast-flattree.cpp
+++ b/src/smpi/colls/bcast/bcast-flattree.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 int
 smpi_coll_tuned_bcast_flattree(void *buff, int count, MPI_Datatype data_type,
diff --git a/src/smpi/colls/bcast-mvapich-smp.cpp b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp
similarity index 99%
rename from src/smpi/colls/bcast-mvapich-smp.cpp
rename to src/smpi/colls/bcast/bcast-mvapich-smp.cpp
index 084bc406e1..af641acf40 100644
--- a/src/smpi/colls/bcast-mvapich-smp.cpp
+++ b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp
@@ -34,7 +34,7 @@
  *  (C) 2001 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
-#include "colls_private.h"
+#include "../colls_private.h"
 
 
 extern int (*MV2_Bcast_function) (void *buffer, int count, MPI_Datatype datatype,
diff --git a/src/smpi/colls/bcast-ompi-pipeline.cpp b/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp
similarity index 99%
rename from src/smpi/colls/bcast-ompi-pipeline.cpp
rename to src/smpi/colls/bcast/bcast-ompi-pipeline.cpp
index 7701fce4da..7f7893b23c 100644
--- a/src/smpi/colls/bcast-ompi-pipeline.cpp
+++ b/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
- #include "colls_private.h"
- #include "coll_tuned_topo.h"
+ #include "../colls_private.h"
+ #include "../coll_tuned_topo.h"
 
 #define MAXTREEFANOUT 32
 
diff --git a/src/smpi/colls/bcast-ompi-split-bintree.cpp b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
similarity index 99%
rename from src/smpi/colls/bcast-ompi-split-bintree.cpp
rename to src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
index c2de44c9c7..332d6cdda5 100644
--- a/src/smpi/colls/bcast-ompi-split-bintree.cpp
+++ b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
@@ -55,8 +55,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-  #include "colls_private.h"
-  #include "coll_tuned_topo.h"
+  #include "../colls_private.h"
+  #include "../coll_tuned_topo.h"
   #define MAXTREEFANOUT 32
  
 int
diff --git a/src/smpi/colls/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
similarity index 99%
rename from src/smpi/colls/bcast-scatter-LR-allgather.cpp
rename to src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
index 9dae6f1263..c9d2b20023 100644
--- a/src/smpi/colls/bcast-scatter-LR-allgather.cpp
+++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*****************************************************************************
 
diff --git a/src/smpi/colls/bcast-scatter-rdb-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp
similarity index 99%
rename from src/smpi/colls/bcast-scatter-rdb-allgather.cpp
rename to src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp
index e5e0beffc0..7b98385f0b 100644
--- a/src/smpi/colls/bcast-scatter-rdb-allgather.cpp
+++ b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp
@@ -1,4 +1,4 @@
-#include "colls_private.h"
+#include "../colls_private.h"
 
 static int scatter_for_bcast(
     int root,
diff --git a/src/smpi/colls/gather-mvapich.cpp b/src/smpi/colls/gather/gather-mvapich.cpp
similarity index 99%
rename from src/smpi/colls/gather-mvapich.cpp
rename to src/smpi/colls/gather/gather-mvapich.cpp
index b7574c1c36..97e14116aa 100644
--- a/src/smpi/colls/gather-mvapich.cpp
+++ b/src/smpi/colls/gather/gather-mvapich.cpp
@@ -35,7 +35,7 @@
  *      See COPYRIGHT in top-level directory.
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 #define MPIR_Gather_MV2_Direct smpi_coll_tuned_gather_ompi_basic_linear
 #define MPIR_Gather_MV2_two_level_Direct smpi_coll_tuned_gather_ompi_basic_linear
diff --git a/src/smpi/colls/gather-ompi.cpp b/src/smpi/colls/gather/gather-ompi.cpp
similarity index 99%
rename from src/smpi/colls/gather-ompi.cpp
rename to src/smpi/colls/gather/gather-ompi.cpp
index c6c8f5e7c1..e5133fd925 100644
--- a/src/smpi/colls/gather-ompi.cpp
+++ b/src/smpi/colls/gather/gather-ompi.cpp
@@ -19,8 +19,8 @@
  * Additional copyrights may follow
  */
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 /* Todo: gather_intra_generic, gather_intra_binary, gather_intra_chain,
  * gather_intra_pipeline, segmentation? */
diff --git a/src/smpi/colls/reduce-NTSL.cpp b/src/smpi/colls/reduce/reduce-NTSL.cpp
similarity index 99%
rename from src/smpi/colls/reduce-NTSL.cpp
rename to src/smpi/colls/reduce/reduce-NTSL.cpp
index 1de7678984..22823123eb 100644
--- a/src/smpi/colls/reduce-NTSL.cpp
+++ b/src/smpi/colls/reduce/reduce-NTSL.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 int reduce_NTSL_segment_size_in_byte = 8192;
diff --git a/src/smpi/colls/reduce-arrival-pattern-aware.cpp b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
similarity index 99%
rename from src/smpi/colls/reduce-arrival-pattern-aware.cpp
rename to src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
index 8edaf648a9..8e68f07a94 100644
--- a/src/smpi/colls/reduce-arrival-pattern-aware.cpp
+++ b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 int reduce_arrival_pattern_aware_segment_size_in_byte = 8192;
diff --git a/src/smpi/colls/reduce-binomial.cpp b/src/smpi/colls/reduce/reduce-binomial.cpp
similarity index 98%
rename from src/smpi/colls/reduce-binomial.cpp
rename to src/smpi/colls/reduce/reduce-binomial.cpp
index ebf0c1e1e7..05105b20f0 100644
--- a/src/smpi/colls/reduce-binomial.cpp
+++ b/src/smpi/colls/reduce/reduce-binomial.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 //#include <star-reduction.c>
 
diff --git a/src/smpi/colls/reduce-flat-tree.cpp b/src/smpi/colls/reduce/reduce-flat-tree.cpp
similarity index 98%
rename from src/smpi/colls/reduce-flat-tree.cpp
rename to src/smpi/colls/reduce/reduce-flat-tree.cpp
index c556f9bc38..66e5ebe1a1 100644
--- a/src/smpi/colls/reduce-flat-tree.cpp
+++ b/src/smpi/colls/reduce/reduce-flat-tree.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 //#include <star-reduction.c>
 
 int
diff --git a/src/smpi/colls/reduce-mvapich-knomial.cpp b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp
similarity index 99%
rename from src/smpi/colls/reduce-mvapich-knomial.cpp
rename to src/smpi/colls/reduce/reduce-mvapich-knomial.cpp
index 3af0007d5a..c23f09451b 100644
--- a/src/smpi/colls/reduce-mvapich-knomial.cpp
+++ b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp
@@ -38,7 +38,7 @@
  *
  */
  
-#include "colls_private.h"
+#include "../colls_private.h"
 extern int mv2_reduce_intra_knomial_factor;
 extern int mv2_reduce_inter_knomial_factor;
 
diff --git a/src/smpi/colls/reduce-mvapich-two-level.cpp b/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp
similarity index 99%
rename from src/smpi/colls/reduce-mvapich-two-level.cpp
rename to src/smpi/colls/reduce/reduce-mvapich-two-level.cpp
index c7e0c6c144..4905ae0a68 100644
--- a/src/smpi/colls/reduce-mvapich-two-level.cpp
+++ b/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp
@@ -35,7 +35,7 @@
  *      See COPYRIGHT in top-level directory.
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 #define MV2_INTRA_SHMEM_REDUCE_MSG 2048
 
 #define mv2_g_shmem_coll_max_msg_size (1 << 17)
diff --git a/src/smpi/colls/reduce-ompi.cpp b/src/smpi/colls/reduce/reduce-ompi.cpp
similarity index 99%
rename from src/smpi/colls/reduce-ompi.cpp
rename to src/smpi/colls/reduce/reduce-ompi.cpp
index 32bd615c25..da244bc837 100644
--- a/src/smpi/colls/reduce-ompi.cpp
+++ b/src/smpi/colls/reduce/reduce-ompi.cpp
@@ -19,8 +19,8 @@
  * Additional copyrights may follow
  */
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 
 
diff --git a/src/smpi/colls/reduce-rab.cpp b/src/smpi/colls/reduce/reduce-rab.cpp
similarity index 99%
rename from src/smpi/colls/reduce-rab.cpp
rename to src/smpi/colls/reduce/reduce-rab.cpp
index 46ac70b50c..3a0c2c084f 100644
--- a/src/smpi/colls/reduce-rab.cpp
+++ b/src/smpi/colls/reduce/reduce-rab.cpp
@@ -9,7 +9,7 @@
  * but this header must not be removed.
  */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/smpi/colls/reduce-scatter-gather.cpp b/src/smpi/colls/reduce/reduce-scatter-gather.cpp
similarity index 99%
rename from src/smpi/colls/reduce-scatter-gather.cpp
rename to src/smpi/colls/reduce/reduce-scatter-gather.cpp
index ab769b8949..105a490780 100644
--- a/src/smpi/colls/reduce-scatter-gather.cpp
+++ b/src/smpi/colls/reduce/reduce-scatter-gather.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 /*
   reduce
diff --git a/src/smpi/colls/reduce_scatter-mpich.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
similarity index 99%
rename from src/smpi/colls/reduce_scatter-mpich.cpp
rename to src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
index 0848b17ff3..f2387ee76b 100644
--- a/src/smpi/colls/reduce_scatter-mpich.cpp
+++ b/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "colls_private.h"
+#include "../colls_private.h"
 
 static inline int MPIU_Mirror_permutation(unsigned int x, int bits)
 {
diff --git a/src/smpi/colls/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
similarity index 100%
rename from src/smpi/colls/reduce_scatter-ompi.cpp
rename to src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
diff --git a/src/smpi/colls/scatter-mvapich-two-level.cpp b/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
similarity index 99%
rename from src/smpi/colls/scatter-mvapich-two-level.cpp
rename to src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
index 8badc56583..e76d75625d 100644
--- a/src/smpi/colls/scatter-mvapich-two-level.cpp
+++ b/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
@@ -34,7 +34,7 @@
  *  (C) 2001 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
-#include "colls_private.h"
+#include "../colls_private.h"
 
 #define MPIR_Scatter_MV2_Binomial smpi_coll_tuned_scatter_ompi_binomial
 #define MPIR_Scatter_MV2_Direct smpi_coll_tuned_scatter_ompi_basic_linear
diff --git a/src/smpi/colls/scatter-ompi.cpp b/src/smpi/colls/scatter/scatter-ompi.cpp
similarity index 99%
rename from src/smpi/colls/scatter-ompi.cpp
rename to src/smpi/colls/scatter/scatter-ompi.cpp
index e8391e09f1..1aee0d7392 100644
--- a/src/smpi/colls/scatter-ompi.cpp
+++ b/src/smpi/colls/scatter/scatter-ompi.cpp
@@ -20,8 +20,8 @@
  */
 
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 
 int
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d8e09749a5..8b9365bad1 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -102,103 +102,103 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
-  src/smpi/colls/allgather-2dmesh.cpp
-  src/smpi/colls/allgather-3dmesh.cpp
-  src/smpi/colls/allgather-GB.cpp
-  src/smpi/colls/allgather-NTSLR-NB.cpp
-  src/smpi/colls/allgather-NTSLR.cpp
-  src/smpi/colls/allgather-SMP-NTS.cpp
-  src/smpi/colls/allgather-bruck.cpp
-  src/smpi/colls/allgather-loosely-lr.cpp
-  src/smpi/colls/allgather-ompi-neighborexchange.cpp
-  src/smpi/colls/allgather-pair.cpp
-  src/smpi/colls/allgather-mvapich-smp.cpp
-  src/smpi/colls/allgather-rdb.cpp
-  src/smpi/colls/allgather-rhv.cpp
-  src/smpi/colls/allgather-ring.cpp
-  src/smpi/colls/allgather-smp-simple.cpp
-  src/smpi/colls/allgather-spreading-simple.cpp
-  src/smpi/colls/allgatherv-GB.cpp
-  src/smpi/colls/allgatherv-mpich-rdb.cpp
-  src/smpi/colls/allgatherv-mpich-ring.cpp
-  src/smpi/colls/allgatherv-ompi-bruck.cpp
-  src/smpi/colls/allgatherv-ompi-neighborexchange.cpp
-  src/smpi/colls/allgatherv-pair.cpp
-  src/smpi/colls/allgatherv-ring.cpp
-  src/smpi/colls/allreduce-lr.cpp
-  src/smpi/colls/allreduce-ompi-ring-segmented.cpp
-  src/smpi/colls/allreduce-rab-rdb.cpp
-  src/smpi/colls/allreduce-rab1.cpp
-  src/smpi/colls/allreduce-rab2.cpp
-  src/smpi/colls/allreduce-rdb.cpp
-  src/smpi/colls/allreduce-redbcast.cpp
-  src/smpi/colls/allreduce-smp-binomial-pipeline.cpp
-  src/smpi/colls/allreduce-smp-binomial.cpp
-  src/smpi/colls/allreduce-smp-rdb.cpp
-  src/smpi/colls/allreduce-smp-rsag-lr.cpp
-  src/smpi/colls/allreduce-smp-rsag-rab.cpp
-  src/smpi/colls/allreduce-smp-rsag.cpp
-  src/smpi/colls/allreduce-mvapich-rs.cpp
-  src/smpi/colls/allreduce-mvapich-two-level.cpp
-  src/smpi/colls/alltoall-2dmesh.cpp
-  src/smpi/colls/alltoall-3dmesh.cpp
-#  src/smpi/colls/alltoall-bruck.cpp
-  src/smpi/colls/alltoall-pair-light-barrier.cpp
-  src/smpi/colls/alltoall-pair-mpi-barrier.cpp
-  src/smpi/colls/alltoall-pair-one-barrier.cpp
-  src/smpi/colls/alltoall-pair.cpp
-  src/smpi/colls/alltoall-rdb.cpp
-  src/smpi/colls/alltoall-ring-light-barrier.cpp
-  src/smpi/colls/alltoall-ring-mpi-barrier.cpp
-  src/smpi/colls/alltoall-ring-one-barrier.cpp
-  src/smpi/colls/alltoall-ring.cpp
-  src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
-  src/smpi/colls/alltoallv-bruck.cpp
-  src/smpi/colls/alltoallv-ompi-basic-linear.cpp
-  src/smpi/colls/alltoallv-pair-light-barrier.cpp
-  src/smpi/colls/alltoallv-pair-mpi-barrier.cpp
-  src/smpi/colls/alltoallv-pair-one-barrier.cpp
-  src/smpi/colls/alltoallv-pair.cpp
-  src/smpi/colls/alltoallv-ring-light-barrier.cpp
-  src/smpi/colls/alltoallv-ring-mpi-barrier.cpp
-  src/smpi/colls/alltoallv-ring-one-barrier.cpp
-  src/smpi/colls/alltoallv-ring.cpp
-  src/smpi/colls/barrier-ompi.cpp
-  src/smpi/colls/barrier-mvapich2-pair.cpp
-  src/smpi/colls/bcast-NTSB.cpp
-  src/smpi/colls/bcast-NTSL-Isend.cpp
-  src/smpi/colls/bcast-NTSL.cpp
-  src/smpi/colls/bcast-SMP-binary.cpp
-  src/smpi/colls/bcast-SMP-binomial.cpp
-  src/smpi/colls/bcast-SMP-linear.cpp
-  src/smpi/colls/bcast-arrival-pattern-aware-wait.cpp
-  src/smpi/colls/bcast-arrival-pattern-aware.cpp
-  src/smpi/colls/bcast-arrival-scatter.cpp
-  src/smpi/colls/bcast-binomial-tree.cpp
-  src/smpi/colls/bcast-flattree-pipeline.cpp
-  src/smpi/colls/bcast-flattree.cpp
-  src/smpi/colls/bcast-ompi-pipeline.cpp
-  src/smpi/colls/bcast-ompi-split-bintree.cpp
-  src/smpi/colls/bcast-mvapich-smp.cpp
-  src/smpi/colls/bcast-scatter-LR-allgather.cpp
-  src/smpi/colls/bcast-scatter-rdb-allgather.cpp
+  src/smpi/colls/allgather/allgather-2dmesh.cpp
+  src/smpi/colls/allgather/allgather-3dmesh.cpp
+  src/smpi/colls/allgather/allgather-GB.cpp
+  src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
+  src/smpi/colls/allgather/allgather-NTSLR.cpp
+  src/smpi/colls/allgather/allgather-SMP-NTS.cpp
+  src/smpi/colls/allgather/allgather-bruck.cpp
+  src/smpi/colls/allgather/allgather-loosely-lr.cpp
+  src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
+  src/smpi/colls/allgather/allgather-pair.cpp
+  src/smpi/colls/allgather/allgather-mvapich-smp.cpp
+  src/smpi/colls/allgather/allgather-rdb.cpp
+  src/smpi/colls/allgather/allgather-rhv.cpp
+  src/smpi/colls/allgather/allgather-ring.cpp
+  src/smpi/colls/allgather/allgather-smp-simple.cpp
+  src/smpi/colls/allgather/allgather-spreading-simple.cpp
+  src/smpi/colls/allgatherv/allgatherv-GB.cpp
+  src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp
+  src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp
+  src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp
+  src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
+  src/smpi/colls/allgatherv/allgatherv-pair.cpp
+  src/smpi/colls/allgatherv/allgatherv-ring.cpp
+  src/smpi/colls/allreduce/allreduce-lr.cpp
+  src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
+  src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-rab1.cpp
+  src/smpi/colls/allreduce/allreduce-rab2.cpp
+  src/smpi/colls/allreduce/allreduce-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-redbcast.cpp
+  src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
+  src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag.cpp
+  src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
+  src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp
+  src/smpi/colls/alltoall/alltoall-2dmesh.cpp
+  src/smpi/colls/alltoall/alltoall-3dmesh.cpp
+#  src/smpi/colls/alltoall/alltoall-bruck.cpp
+  src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair.cpp
+  src/smpi/colls/alltoall/alltoall-rdb.cpp
+  src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring.cpp
+  src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
+  src/smpi/colls/alltoallv/alltoallv-bruck.cpp
+  src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring.cpp
+  src/smpi/colls/barrier/barrier-ompi.cpp
+  src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
+  src/smpi/colls/bcast/bcast-NTSB.cpp
+  src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
+  src/smpi/colls/bcast/bcast-NTSL.cpp
+  src/smpi/colls/bcast/bcast-SMP-binary.cpp
+  src/smpi/colls/bcast/bcast-SMP-binomial.cpp
+  src/smpi/colls/bcast/bcast-SMP-linear.cpp
+  src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp
+  src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp
+  src/smpi/colls/bcast/bcast-arrival-scatter.cpp
+  src/smpi/colls/bcast/bcast-binomial-tree.cpp
+  src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
+  src/smpi/colls/bcast/bcast-flattree.cpp
+  src/smpi/colls/bcast/bcast-ompi-pipeline.cpp
+  src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
+  src/smpi/colls/bcast/bcast-mvapich-smp.cpp
+  src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
+  src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp
   src/smpi/colls/coll_tuned_topo.cpp
   src/smpi/colls/colls_global.cpp
-  src/smpi/colls/gather-ompi.cpp
-  src/smpi/colls/gather-mvapich.cpp
-  src/smpi/colls/reduce-NTSL.cpp
-  src/smpi/colls/reduce-arrival-pattern-aware.cpp
-  src/smpi/colls/reduce-binomial.cpp
-  src/smpi/colls/reduce-flat-tree.cpp
-  src/smpi/colls/reduce-ompi.cpp
-  src/smpi/colls/reduce-scatter-gather.cpp
-  src/smpi/colls/reduce_scatter-mpich.cpp
-  src/smpi/colls/reduce_scatter-ompi.cpp
-  src/smpi/colls/reduce-mvapich-knomial.cpp
-  src/smpi/colls/reduce-mvapich-two-level.cpp
-  src/smpi/colls/reduce-rab.cpp
-  src/smpi/colls/scatter-ompi.cpp
-  src/smpi/colls/scatter-mvapich-two-level.cpp
+  src/smpi/colls/gather/gather-ompi.cpp
+  src/smpi/colls/gather/gather-mvapich.cpp
+  src/smpi/colls/reduce/reduce-NTSL.cpp
+  src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
+  src/smpi/colls/reduce/reduce-binomial.cpp
+  src/smpi/colls/reduce/reduce-flat-tree.cpp
+  src/smpi/colls/reduce/reduce-ompi.cpp
+  src/smpi/colls/reduce/reduce-scatter-gather.cpp
+  src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
+  src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
+  src/smpi/colls/reduce/reduce-mvapich-knomial.cpp
+  src/smpi/colls/reduce/reduce-mvapich-two-level.cpp
+  src/smpi/colls/reduce/reduce-rab.cpp
+  src/smpi/colls/scatter/scatter-ompi.cpp
+  src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
   src/smpi/colls/smpi_automatic_selector.cpp
   src/smpi/colls/smpi_mpich_selector.cpp
   src/smpi/colls/smpi_intel_mpi_selector.cpp