From 8e3274a4905550c64c6f75ef28c9c9f1fc858bf1 Mon Sep 17 00:00:00 2001
From: Berk Hess <hess@kth.se>
Date: Fri, 4 Jan 2019 11:54:27 +0100
Subject: [PATCH] Move nbnxn files to nbnxm directory

This change moves all files related to the nbnxn code to an new
nbnxm subdirectory. This change is only code motion and file renaming.
This is also the start of a renaming from nbnxn to nbnxm, which is
a more correct name, since the i- and j-cluster size can be different.
All nbnxn setup code in forcerec.cpp is moved to nbnxm_setup.cpp.
Removed nbnxn_ and _simd... pre- and postfixes from most files.
Renamed nbnxn_search.cpp to pairlist.cpp and nbnxn_search.h to
nbnxm_pairlistset.h. Although this is currently somewhat inconsistent,
future refactoring will make the contents consistent.
Renamed nbnxn_utility.h/cpp to nbnxm_geometry.h/cpp.

Change-Id: I39c17769c566f78b84211510c5ac17793fd131fa
---
 docs/doxygen/cycle-suppressions.txt           |   2 +
 docs/doxygen/gmxtree.py                       |   2 +-
 docs/doxygen/suppressions.txt                 |  19 +-
 src/gromacs/CMakeLists.txt                    |  25 +-
 src/gromacs/domdec/partition.cpp              |   3 +-
 src/gromacs/ewald/pme_load_balancing.cpp      |   5 +-
 src/gromacs/mdlib/CMakeLists.txt              |  12 +-
 src/gromacs/mdlib/calc_verletbuf.cpp          |   6 +-
 src/gromacs/mdlib/forcerec.cpp                | 379 +---------------
 src/gromacs/mdlib/forcerec.h                  |   7 -
 src/gromacs/mdlib/nbnxn_grid.h                | 100 ----
 .../simd_2xnn/nbnxn_kernel_simd_2xnn.h        | 279 ------------
 .../simd_4xn/nbnxn_kernel_simd_4xn.h          | 279 ------------
 src/gromacs/mdlib/perf_est.cpp                |   5 +-
 src/gromacs/mdlib/resethandler.cpp            |   2 +-
 src/gromacs/mdlib/sim_util.cpp                |  16 +-
 src/gromacs/mdrun/md.cpp                      |   3 +-
 src/gromacs/mdrun/mimic.cpp                   |   2 -
 src/gromacs/mdrun/rerun.cpp                   |   2 -
 src/gromacs/mdrun/runner.cpp                  |   6 +-
 src/gromacs/nbnxm/CMakeLists.txt              |  46 ++
 .../nbnxn_atomdata.cpp => nbnxm/atomdata.cpp} |  11 +-
 .../nbnxn_atomdata.h => nbnxm/atomdata.h}     |   7 +-
 .../nbnxn_consts.h => nbnxm/constants.h}      |   4 +-
 .../nbnxn_cuda => nbnxm/cuda}/CMakeLists.txt  |  26 +-
 .../cuda/nbnxm_cuda.cu}                       |  37 +-
 .../nbnxn_cuda.h => nbnxm/cuda/nbnxm_cuda.h}  |   2 +-
 .../cuda/nbnxm_cuda_data_mgmt.cu}             |   9 +-
 .../cuda/nbnxm_cuda_kernel.cuh}               |   4 +-
 .../cuda/nbnxm_cuda_kernel_F_noprune.cu}      |  11 +-
 .../cuda/nbnxm_cuda_kernel_F_prune.cu}        |  11 +-
 .../cuda/nbnxm_cuda_kernel_VF_noprune.cu}     |  11 +-
 .../cuda/nbnxm_cuda_kernel_VF_prune.cu}       |  11 +-
 .../cuda/nbnxm_cuda_kernel_pruneonly.cu}      |   4 +-
 .../cuda/nbnxm_cuda_kernel_pruneonly.cuh}     |   8 +-
 .../cuda/nbnxm_cuda_kernel_utils.cuh}         |  10 +-
 .../cuda/nbnxm_cuda_kernels.cuh}              |  88 ++--
 .../cuda/nbnxm_cuda_types.h}                  |  14 +-
 .../nbnxn_gpu_common.h => nbnxm/gpu_common.h} |  18 +-
 .../gpu_common_utils.h}                       |  14 +-
 .../gpu_data_mgmt.h}                          |  10 +-
 .../gpu_jit_support.h}                        |   9 +-
 .../nbnxn_gpu_types.h => nbnxm/gpu_types.h}   |  15 +-
 .../gpu_types_common.h}                       |   6 +-
 .../{mdlib/nbnxn_grid.cpp => nbnxm/grid.cpp}  |  13 +-
 .../nbnxn_internal.h => nbnxm/internal.h}     |  24 +-
 .../kernel_common.cpp}                        |   2 +-
 .../kernel_common.h}                          |  10 +-
 .../kernel_simd_2xmm_kernel.cpp.pre}          |   6 +-
 .../kernel_simd_4xm_kernel.cpp.pre}           |   6 +-
 .../kernel_simd_template.h.pre}               |  10 +-
 .../make_verlet_simd_kernel_files.py          |  34 +-
 .../kerneldispatch.cpp}                       |  27 +-
 .../kerneldispatch.h}                         |   4 +-
 .../kernels_reference/kernel_gpu_ref.cpp}     |  10 +-
 .../kernels_reference/kernel_gpu_ref.h}       |   4 +-
 .../kernels_reference/kernel_ref.cpp}         |  40 +-
 .../kernels_reference/kernel_ref.h}           |   4 +-
 .../kernels_reference/kernel_ref_includes.h}  |   8 +-
 .../kernels_reference/kernel_ref_inner.h}     |   0
 .../kernels_reference/kernel_ref_outer.h}     |  12 +-
 .../kernels_reference/kernel_ref_prune.cpp}   |   6 +-
 .../kernels_reference/kernel_ref_prune.h}     |   0
 .../kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp} |  14 +-
 ...kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp} |  14 +-
 ...nel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp}   |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp}  |  14 +-
 ...ernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp} |  14 +-
 ...ernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp} |  14 +-
 ...rnel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp} |  14 +-
 ...l_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_F.cpp}      |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp}     |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_F.cpp}      |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp}     |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_F.cpp}         |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_VF.cpp}        |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp}     |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_F.cpp}        |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_VF.cpp}       |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp}    |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_F.cpp}          |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_VF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_VgrpF.cpp}      |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_F.cpp}      |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_VF.cpp}     |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEw_VdwLJFSw_F.cpp}             |  14 +-
 .../kernel_ElecEw_VdwLJFSw_VF.cpp}            |  14 +-
 .../kernel_ElecEw_VdwLJFSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJPSw_F.cpp}             |  14 +-
 .../kernel_ElecEw_VdwLJPSw_VF.cpp}            |  14 +-
 .../kernel_ElecEw_VdwLJPSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJ_F.cpp}                |  14 +-
 .../kernel_ElecEw_VdwLJ_VF.cpp}               |  14 +-
 .../kernel_ElecEw_VdwLJ_VgrpF.cpp}            |  14 +-
 ...rnel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp} |  14 +-
 ...nel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp} |  14 +-
 ..._ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 ...kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp} |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp} |  14 +-
 ...el_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp} |  14 +-
 ...el_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp} |  14 +-
 ...l_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp} |  14 +-
 ...lecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp}   |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp}  |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp}   |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp}  |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_F.cpp}      |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp}     |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp}  |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_F.cpp}     |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_VF.cpp}    |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_F.cpp}       |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_VF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp}   |  14 +-
 .../kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp}   |  14 +-
 .../kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp}  |  14 +-
 ...ernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_F.cpp}          |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_VF.cpp}         |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_F.cpp}          |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_VF.cpp}         |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJ_F.cpp}             |  14 +-
 .../kernel_ElecQSTab_VdwLJ_VF.cpp}            |  14 +-
 .../kernel_ElecQSTab_VdwLJ_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_F.cpp}        |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_VF.cpp}       |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp}    |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_F.cpp}          |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_VF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_VgrpF.cpp}      |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_F.cpp}      |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_VF.cpp}     |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp}  |  14 +-
 .../kernel_ElecRF_VdwLJFSw_F.cpp}             |  14 +-
 .../kernel_ElecRF_VdwLJFSw_VF.cpp}            |  14 +-
 .../kernel_ElecRF_VdwLJFSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJPSw_F.cpp}             |  14 +-
 .../kernel_ElecRF_VdwLJPSw_VF.cpp}            |  14 +-
 .../kernel_ElecRF_VdwLJPSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJ_F.cpp}                |  14 +-
 .../kernel_ElecRF_VdwLJ_VF.cpp}               |  14 +-
 .../kernel_ElecRF_VdwLJ_VgrpF.cpp}            |  14 +-
 .../kernels_simd_2xmm/kernel_common.h}        |   3 +-
 .../kernels_simd_2xmm/kernel_inner.h}         |   0
 .../kernels_simd_2xmm/kernel_outer.h}         |  12 +-
 .../kernels_simd_2xmm/kernel_prune.cpp}       |   8 +-
 .../kernels_simd_2xmm/kernel_prune.h}         |   0
 src/gromacs/nbnxm/kernels_simd_2xmm/kernels.h | 279 ++++++++++++
 .../kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp} |  14 +-
 ...kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp} |  14 +-
 ...nel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp}   |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp}  |  14 +-
 ...ernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp} |  14 +-
 ...ernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp} |  14 +-
 ...rnel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp} |  14 +-
 ...l_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_F.cpp}      |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp}     |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_F.cpp}      |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp}     |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_F.cpp}         |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_VF.cpp}        |  14 +-
 .../kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp}     |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_F.cpp}        |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_VF.cpp}       |  14 +-
 .../kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp}    |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_F.cpp}          |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_VF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJCombLB_VgrpF.cpp}      |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_F.cpp}      |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_VF.cpp}     |  14 +-
 .../kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp}  |  14 +-
 .../kernel_ElecEw_VdwLJFSw_F.cpp}             |  14 +-
 .../kernel_ElecEw_VdwLJFSw_VF.cpp}            |  14 +-
 .../kernel_ElecEw_VdwLJFSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJPSw_F.cpp}             |  14 +-
 .../kernel_ElecEw_VdwLJPSw_VF.cpp}            |  14 +-
 .../kernel_ElecEw_VdwLJPSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecEw_VdwLJ_F.cpp}                |  14 +-
 .../kernel_ElecEw_VdwLJ_VF.cpp}               |  14 +-
 .../kernel_ElecEw_VdwLJ_VgrpF.cpp}            |  14 +-
 ...rnel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp} |  14 +-
 ...nel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp} |  14 +-
 ..._ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 ...kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp} |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp} |  14 +-
 ...el_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp} |  14 +-
 ...el_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp} |  14 +-
 ...l_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp} |  14 +-
 ...lecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp}   |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp}  |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp}   |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp}  |  14 +-
 ...ernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_F.cpp}      |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp}     |  14 +-
 .../kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp}  |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_F.cpp}     |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_VF.cpp}    |  14 +-
 .../kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_F.cpp}       |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_VF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp}   |  14 +-
 .../kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp}   |  14 +-
 .../kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp}  |  14 +-
 ...ernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp} |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_F.cpp}          |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_VF.cpp}         |  14 +-
 .../kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_F.cpp}          |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_VF.cpp}         |  14 +-
 .../kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp}      |  14 +-
 .../kernel_ElecQSTab_VdwLJ_F.cpp}             |  14 +-
 .../kernel_ElecQSTab_VdwLJ_VF.cpp}            |  14 +-
 .../kernel_ElecQSTab_VdwLJ_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_F.cpp}        |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_VF.cpp}       |  14 +-
 .../kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp}    |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_F.cpp}          |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_VF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJCombLB_VgrpF.cpp}      |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_F.cpp}      |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_VF.cpp}     |  14 +-
 .../kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp}  |  14 +-
 .../kernel_ElecRF_VdwLJFSw_F.cpp}             |  14 +-
 .../kernel_ElecRF_VdwLJFSw_VF.cpp}            |  14 +-
 .../kernel_ElecRF_VdwLJFSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJPSw_F.cpp}             |  14 +-
 .../kernel_ElecRF_VdwLJPSw_VF.cpp}            |  14 +-
 .../kernel_ElecRF_VdwLJPSw_VgrpF.cpp}         |  14 +-
 .../kernel_ElecRF_VdwLJ_F.cpp}                |  14 +-
 .../kernel_ElecRF_VdwLJ_VF.cpp}               |  14 +-
 .../kernel_ElecRF_VdwLJ_VgrpF.cpp}            |  14 +-
 .../kernels_simd_4xm/kernel_common.h}         |   1 -
 .../kernels_simd_4xm/kernel_inner.h}          |   0
 .../kernels_simd_4xm/kernel_outer.h}          |  12 +-
 .../kernels_simd_4xm/kernel_prune.cpp}        |   8 +-
 .../kernels_simd_4xm/kernel_prune.h}          |   0
 src/gromacs/nbnxm/kernels_simd_4xm/kernels.h  | 279 ++++++++++++
 .../{mdlib/nb_verlet.h => nbnxm/nbnxm.h}      | 110 ++++-
 .../nbnxn_util.h => nbnxm/nbnxm_geometry.cpp} |  40 +-
 src/gromacs/nbnxm/nbnxm_geometry.h            |  67 +++
 .../{mdlib/nbnxn_gpu.h => nbnxm/nbnxm_gpu.h}  |  11 +-
 src/gromacs/nbnxm/nbnxm_setup.cpp             | 427 ++++++++++++++++++
 .../nbnxn_simd.h => nbnxm/nbnxm_simd.h}       |   6 +-
 .../nbnxn_ocl => nbnxm/opencl}/CMakeLists.txt |  14 +-
 .../opencl/nbnxm_ocl.cpp}                     |  24 +-
 .../opencl/nbnxm_ocl_consts.h}                |   5 +-
 .../opencl/nbnxm_ocl_data_mgmt.cpp}           |  15 +-
 .../opencl/nbnxm_ocl_internal.h}              |   6 +-
 .../opencl/nbnxm_ocl_jit_support.cpp}         |  19 +-
 .../opencl/nbnxm_ocl_kernel.clh}              |   6 +-
 .../opencl/nbnxm_ocl_kernel_pruneonly.clh}    |   6 +-
 .../opencl/nbnxm_ocl_kernel_utils.clh}        |   6 +-
 .../opencl/nbnxm_ocl_kernels.cl}              |  12 +-
 .../opencl/nbnxm_ocl_kernels.clh}             |  88 ++--
 .../opencl/nbnxm_ocl_kernels_fastgen.clh}     |   6 +-
 ...nbnxm_ocl_kernels_fastgen_add_twincut.clh} |   8 +-
 .../opencl/nbnxm_ocl_types.h}                 |  17 +-
 .../nbnxn_search.cpp => nbnxm/pairlist.cpp}   |  20 +-
 .../nbnxn_pairlist.h => nbnxm/pairlist.h}     |  15 +-
 .../pairlist_simd_2xmm.h}                     |   0
 .../pairlist_simd_4xm.h}                      |   0
 .../pairlist_tuning.cpp}                      |   7 +-
 .../pairlist_tuning.h}                        |   8 +-
 .../nbnxn_search.h => nbnxm/pairlistset.h}    |  32 +-
 .../prunekerneldispatch.cpp}                  |  13 +-
 .../prunekerneldispatch.h}                    |   4 +-
 src/gromacs/taskassignment/decidegpuusage.cpp |   2 +-
 285 files changed, 2999 insertions(+), 2877 deletions(-)
 delete mode 100644 src/gromacs/mdlib/nbnxn_grid.h
 delete mode 100644 src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h
 delete mode 100644 src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h
 create mode 100644 src/gromacs/nbnxm/CMakeLists.txt
 rename src/gromacs/{mdlib/nbnxn_atomdata.cpp => nbnxm/atomdata.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_atomdata.h => nbnxm/atomdata.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_consts.h => nbnxm/constants.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_cuda => nbnxm/cuda}/CMakeLists.txt (74%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda.cu => nbnxm/cuda/nbnxm_cuda.cu} (97%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda.h => nbnxm/cuda/nbnxm_cuda.h} (96%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu => nbnxm/cuda/nbnxm_cuda_data_mgmt.cu} (99%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh => nbnxm/cuda/nbnxm_cuda_kernel.cuh} (99%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu => nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu} (85%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu => nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu} (85%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu => nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu} (85%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu => nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu} (86%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu => nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu} (94%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh => nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh} (98%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh => nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh} (99%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh => nbnxm/cuda/nbnxm_cuda_kernels.cuh} (80%)
 rename src/gromacs/{mdlib/nbnxn_cuda/nbnxn_cuda_types.h => nbnxm/cuda/nbnxm_cuda_types.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_gpu_common.h => nbnxm/gpu_common.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_gpu_common_utils.h => nbnxm/gpu_common_utils.h} (89%)
 rename src/gromacs/{mdlib/nbnxn_gpu_data_mgmt.h => nbnxm/gpu_data_mgmt.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_gpu_jit_support.h => nbnxm/gpu_jit_support.h} (91%)
 rename src/gromacs/{mdlib/nbnxn_gpu_types.h => nbnxm/gpu_types.h} (86%)
 rename src/gromacs/{mdlib/nbnxn_gpu_types_common.h => nbnxm/gpu_types_common.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_grid.cpp => nbnxm/grid.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_internal.h => nbnxm/internal.h} (96%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_common.cpp => nbnxm/kernel_common.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_common.h => nbnxm/kernel_common.h} (94%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.cpp.pre => nbnxm/kernel_file_generator/kernel_simd_2xmm_kernel.cpp.pre} (94%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.cpp.pre => nbnxm/kernel_file_generator/kernel_simd_4xm_kernel.cpp.pre} (94%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre => nbnxm/kernel_file_generator/kernel_simd_template.h.pre} (85%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_file_generator => nbnxm/kernel_file_generator}/make_verlet_simd_kernel_files.py (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp => nbnxm/kerneldispatch.cpp} (95%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_cpu.h => nbnxm/kerneldispatch.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.cpp => nbnxm/kernels_reference/kernel_gpu_ref.cpp} (98%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.h => nbnxm/kernels_reference/kernel_gpu_ref.h} (98%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref.cpp => nbnxm/kernels_reference/kernel_ref.cpp} (71%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref.h => nbnxm/kernels_reference/kernel_ref.h} (98%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h => nbnxm/kernels_reference/kernel_ref_includes.h} (88%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h => nbnxm/kernels_reference/kernel_ref_inner.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h => nbnxm/kernels_reference/kernel_ref_outer.h} (96%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.cpp => nbnxm/kernels_reference/kernel_ref_prune.cpp} (97%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.h => nbnxm/kernels_reference/kernel_ref_prune.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.cpp => nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h => nbnxm/kernels_simd_2xmm/kernel_common.h} (99%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h => nbnxm/kernels_simd_2xmm/kernel_inner.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h => nbnxm/kernels_simd_2xmm/kernel_outer.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.cpp => nbnxm/kernels_simd_2xmm/kernel_prune.cpp} (96%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.h => nbnxm/kernels_simd_2xmm/kernel_prune.h} (100%)
 create mode 100644 src/gromacs/nbnxm/kernels_simd_2xmm/kernels.h
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_F.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_F.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VF.cpp} (89%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.cpp => nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VgrpF.cpp} (90%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h => nbnxm/kernels_simd_4xm/kernel_common.h} (99%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h => nbnxm/kernels_simd_4xm/kernel_inner.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h => nbnxm/kernels_simd_4xm/kernel_outer.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.cpp => nbnxm/kernels_simd_4xm/kernel_prune.cpp} (97%)
 rename src/gromacs/{mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.h => nbnxm/kernels_simd_4xm/kernel_prune.h} (100%)
 create mode 100644 src/gromacs/nbnxm/kernels_simd_4xm/kernels.h
 rename src/gromacs/{mdlib/nb_verlet.h => nbnxm/nbnxm.h} (64%)
 rename src/gromacs/{mdlib/nbnxn_util.h => nbnxm/nbnxm_geometry.cpp} (78%)
 create mode 100644 src/gromacs/nbnxm/nbnxm_geometry.h
 rename src/gromacs/{mdlib/nbnxn_gpu.h => nbnxm/nbnxm_gpu.h} (98%)
 create mode 100644 src/gromacs/nbnxm/nbnxm_setup.cpp
 rename src/gromacs/{mdlib/nbnxn_simd.h => nbnxm/nbnxm_simd.h} (94%)
 rename src/gromacs/{mdlib/nbnxn_ocl => nbnxm/opencl}/CMakeLists.txt (88%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl.cpp => nbnxm/opencl/nbnxm_ocl.cpp} (98%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_consts.h => nbnxm/opencl/nbnxm_ocl_consts.h} (91%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp => nbnxm/opencl/nbnxm_ocl_data_mgmt.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_internal.h => nbnxm/opencl/nbnxm_ocl_internal.h} (93%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp => nbnxm/opencl/nbnxm_ocl_jit_support.cpp} (94%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernel.clh => nbnxm/opencl/nbnxm_ocl_kernel.clh} (99%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernel_pruneonly.clh => nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh} (98%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh => nbnxm/opencl/nbnxm_ocl_kernel_utils.clh} (99%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernels.cl => nbnxm/opencl/nbnxm_ocl_kernels.cl} (89%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernels.clh => nbnxm/opencl/nbnxm_ocl_kernels.clh} (87%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen.clh => nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh} (94%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen_add_twincut.clh => nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh} (93%)
 rename src/gromacs/{mdlib/nbnxn_ocl/nbnxn_ocl_types.h => nbnxm/opencl/nbnxm_ocl_types.h} (97%)
 rename src/gromacs/{mdlib/nbnxn_search.cpp => nbnxm/pairlist.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_pairlist.h => nbnxm/pairlist.h} (98%)
 rename src/gromacs/{mdlib/nbnxn_search_simd_2xnn.h => nbnxm/pairlist_simd_2xmm.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_search_simd_4xn.h => nbnxm/pairlist_simd_4xm.h} (100%)
 rename src/gromacs/{mdlib/nbnxn_tuning.cpp => nbnxm/pairlist_tuning.cpp} (99%)
 rename src/gromacs/{mdlib/nbnxn_tuning.h => nbnxm/pairlist_tuning.h} (95%)
 rename src/gromacs/{mdlib/nbnxn_search.h => nbnxm/pairlistset.h} (79%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_prune.cpp => nbnxm/prunekerneldispatch.cpp} (92%)
 rename src/gromacs/{mdlib/nbnxn_kernels/nbnxn_kernel_prune.h => nbnxm/prunekerneldispatch.h} (96%)

diff --git a/docs/doxygen/cycle-suppressions.txt b/docs/doxygen/cycle-suppressions.txt
index 9c8f5a4574..8dfa984a0e 100644
--- a/docs/doxygen/cycle-suppressions.txt
+++ b/docs/doxygen/cycle-suppressions.txt
@@ -12,6 +12,8 @@ mdlib -> imd
 mdlib -> ewald
 mdlib -> pulling
 mdlib -> awh
+nbnxm -> domdec
+nbnxm -> mdlib
 simd -> hardware
 gpu_utils -> hardware
 listed_forces -> mdlib
diff --git a/docs/doxygen/gmxtree.py b/docs/doxygen/gmxtree.py
index 8f0dc41f22..488dcfa656 100644
--- a/docs/doxygen/gmxtree.py
+++ b/docs/doxygen/gmxtree.py
@@ -1080,4 +1080,4 @@ class GromacsTree(object):
         return (self._files['src/config.h'],
                 self._files['src/gromacs/simd/simd.h'],
                 self._files['src/gromacs/ewald/pme_simd.h'],
-                self._files['src/gromacs/mdlib/nbnxn_simd.h'])
+                self._files['src/gromacs/nbnxm/nbnxm_simd.h'])
diff --git a/docs/doxygen/suppressions.txt b/docs/doxygen/suppressions.txt
index dd52e16494..a8c95b0f7a 100644
--- a/docs/doxygen/suppressions.txt
+++ b/docs/doxygen/suppressions.txt
@@ -19,22 +19,19 @@ src/gromacs/ewald/pme_simd4.h: warning: should include "pme_simd.h"
 src/gromacs/ewald/pme_spline_work.cpp: warning: includes "simd.h" unnecessarily
 src/gromacs/ewald/pme_spline_work.h: warning: includes "simd.h" unnecessarily
 src/gromacs/ewald/pme_spread.cpp: warning: includes "simd.h" unnecessarily
-src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h: warning: should include "simd.h"
-src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h: warning: should include "simd.h"
-src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h: warning: should include "simd.h"
-src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h: warning: should include "simd.h"
-src/gromacs/mdlib/nbnxn_search_simd_2xnn.h: warning: should include "simd.h"
-src/gromacs/mdlib/nbnxn_search_simd_4xn.h: warning: should include "simd.h"
+src/gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h: warning: should include "simd.h"
+src/gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h: warning: should include "simd.h"
+src/gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h: warning: should include "simd.h"
+src/gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h: warning: should include "simd.h"
+src/gromacs/nbnxm/pairlist_simd_2xmm.h: warning: should include "simd.h"
+src/gromacs/nbnxm/pairlist_simd_4xm.h: warning: should include "simd.h"
 
 # This module name doesn't really fall into any currently used pattern; needs some thought
 : error: no matching directory for module: module_mdrun_integration_tests
 
 # These would be nice to fix, but can wait for later / deletion / rewrites
-src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.cpp: warning: includes "config.h" unnecessarily
-src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.cpp: warning: includes "config.h" unnecessarily
-src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h: warning: should include "config.h"
-src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h: warning: should include "nbnxn_simd.h"
-src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h: warning: should include "nbnxn_simd.h"
+src/gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h: warning: should include "nbnxm_simd.h"
+src/gromacs/nbnxm/kernels_simd_4xm/kernel_common.h: warning: should include "nbnxm_simd.h"
 
 # Temporary while we change the SIMD implementation
 src/gromacs/simd/impl_sparc64_hpc_ace/impl_sparc64_hpc_ace_common.h: warning: should include "simd.h"
diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt
index b4eb9e476f..71d72783da 100644
--- a/src/gromacs/CMakeLists.txt
+++ b/src/gromacs/CMakeLists.txt
@@ -97,6 +97,7 @@ add_subdirectory(gmxlib)
 add_subdirectory(mdlib)
 add_subdirectory(applied_forces)
 add_subdirectory(listed_forces)
+add_subdirectory(nbnxm)
 add_subdirectory(commandline)
 add_subdirectory(domdec)
 add_subdirectory(ewald)
@@ -412,25 +413,25 @@ if(GMX_USE_OPENCL)
         DESTINATION ${GMX_INSTALL_OCLDIR}/gromacs/pbcutil
         COMPONENT libraries)
 
-    # Install the NB source and headers
+    # Install the NBNXM source and headers
     file(GLOB OPENCL_INSTALLED_FILES
-        mdlib/nbnxn_consts.h
+        nbnxm/constants.h
         )
     install(FILES ${OPENCL_INSTALLED_FILES}
-        DESTINATION ${GMX_INSTALL_OCLDIR}/gromacs/mdlib
+        DESTINATION ${GMX_INSTALL_OCLDIR}/gromacs/nbnxm
         COMPONENT libraries)
     file(GLOB OPENCL_INSTALLED_FILES
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernels.cl
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernel.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernel_pruneonly.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernels.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen_add_twincut.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
-        mdlib/nbnxn_ocl/nbnxn_ocl_consts.h
+        nbnxm/opencl/nbnxm_ocl_kernels.cl
+        nbnxm/opencl/nbnxm_ocl_kernel.clh
+        nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh
+        nbnxm/opencl/nbnxm_ocl_kernels.clh
+        nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh
+        nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh
+        nbnxm/opencl/nbnxm_ocl_kernel_utils.clh
+        nbnxm/opencl/nbnxm_ocl_consts.h
         )
     install(FILES ${OPENCL_INSTALLED_FILES}
-        DESTINATION ${GMX_INSTALL_OCLDIR}/gromacs/mdlib/nbnxn_ocl
+        DESTINATION ${GMX_INSTALL_OCLDIR}/gromacs/nbnxm/opencl
         COMPONENT libraries)
 
     # Install the PME source and headers
diff --git a/src/gromacs/domdec/partition.cpp b/src/gromacs/domdec/partition.cpp
index 701556db2d..be726af141 100644
--- a/src/gromacs/domdec/partition.cpp
+++ b/src/gromacs/domdec/partition.cpp
@@ -70,8 +70,6 @@
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
 #include "gromacs/mdlib/mdatoms.h"
 #include "gromacs/mdlib/mdsetup.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_grid.h"
 #include "gromacs/mdlib/nsgrid.h"
 #include "gromacs/mdlib/vsite.h"
 #include "gromacs/mdtypes/commrec.h"
@@ -80,6 +78,7 @@
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/mdtypes/nblist.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pulling/pull.h"
 #include "gromacs/timing/wallcycle.h"
 #include "gromacs/topology/mtop_util.h"
diff --git a/src/gromacs/ewald/pme_load_balancing.cpp b/src/gromacs/ewald/pme_load_balancing.cpp
index 9c147967a9..579fc3c7f9 100644
--- a/src/gromacs/ewald/pme_load_balancing.cpp
+++ b/src/gromacs/ewald/pme_load_balancing.cpp
@@ -62,14 +62,13 @@
 #include "gromacs/math/functions.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/forcerec.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
 #include "gromacs/mdlib/sim_util.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/timing/wallcycle.h"
 #include "gromacs/utility/cstringutil.h"
diff --git a/src/gromacs/mdlib/CMakeLists.txt b/src/gromacs/mdlib/CMakeLists.txt
index 7bd5081d7e..baa5803657 100644
--- a/src/gromacs/mdlib/CMakeLists.txt
+++ b/src/gromacs/mdlib/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2010,2012,2013,2014,2015,2018, by the GROMACS development team, led by
+# Copyright (c) 2010,2012,2013,2014,2015,2018,2019, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -32,15 +32,7 @@
 # To help us fund GROMACS development, we humbly ask that you cite
 # the research papers on the package. Check out http://www.gromacs.org.
 
-file(GLOB MDLIB_SOURCES nbnxn_kernels/simd_4xn/*.cpp nbnxn_kernels/simd_2xnn/*.cpp nbnxn_kernels/*.cpp *.cpp)
-
-if(GMX_USE_CUDA)
-    add_subdirectory(nbnxn_cuda)
-endif()
-if(GMX_USE_OPENCL)
-    add_subdirectory(nbnxn_ocl)
-    set(MDLIB_OPENCL_KERNELS ${MDLIB_OPENCL_KERNELS} PARENT_SCOPE)
-endif()
+file(GLOB MDLIB_SOURCES *.cpp)
 
 set(MDLIB_SOURCES ${MDLIB_SOURCES} PARENT_SCOPE)
 if (BUILD_TESTING)
diff --git a/src/gromacs/mdlib/calc_verletbuf.cpp b/src/gromacs/mdlib/calc_verletbuf.cpp
index 3de11ebea9..7bee75dae4 100644
--- a/src/gromacs/mdlib/calc_verletbuf.cpp
+++ b/src/gromacs/mdlib/calc_verletbuf.cpp
@@ -45,11 +45,11 @@
 #include "gromacs/math/functions.h"
 #include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
-#include "gromacs/mdlib/nbnxn_util.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_geometry.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 #include "gromacs/topology/block.h"
 #include "gromacs/topology/ifunc.h"
 #include "gromacs/topology/topology.h"
diff --git a/src/gromacs/mdlib/forcerec.cpp b/src/gromacs/mdlib/forcerec.cpp
index 38e4928684..26a6a50a5c 100644
--- a/src/gromacs/mdlib/forcerec.cpp
+++ b/src/gromacs/mdlib/forcerec.cpp
@@ -69,15 +69,6 @@
 #include "gromacs/mdlib/forcerec_threading.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
 #include "gromacs/mdlib/md_support.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_atomdata.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_grid.h"
-#include "gromacs/mdlib/nbnxn_internal.h"
-#include "gromacs/mdlib/nbnxn_search.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
-#include "gromacs/mdlib/nbnxn_tuning.h"
-#include "gromacs/mdlib/nbnxn_util.h"
 #include "gromacs/mdlib/ns.h"
 #include "gromacs/mdlib/qmmm.h"
 #include "gromacs/mdlib/rf_util.h"
@@ -89,9 +80,10 @@
 #include "gromacs/mdtypes/iforceprovider.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/pbcutil/pbc.h"
-#include "gromacs/simd/simd.h"
 #include "gromacs/tables/forcetable.h"
 #include "gromacs/topology/mtop_util.h"
 #include "gromacs/trajectory/trajectoryframe.h"
@@ -105,8 +97,6 @@
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/utility/strconvert.h"
 
-#include "nbnxn_gpu_jit_support.h"
-
 t_forcerec *mk_forcerec()
 {
     t_forcerec *fr;
@@ -1516,214 +1506,6 @@ static real cutoff_inf(real cutoff)
     return cutoff;
 }
 
-gmx_bool nbnxn_simd_supported(const gmx::MDLogger &mdlog,
-                              const t_inputrec    *ir)
-{
-    if (ir->vdwtype == evdwPME && ir->ljpme_combination_rule == eljpmeLB)
-    {
-        /* LJ PME with LB combination rule does 7 mesh operations.
-         * This so slow that we don't compile SIMD non-bonded kernels
-         * for that. */
-        GMX_LOG(mdlog.warning).asParagraph().appendText("LJ-PME with Lorentz-Berthelot is not supported with SIMD kernels, falling back to plain C kernels");
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-
-static void pick_nbnxn_kernel_cpu(const t_inputrec gmx_unused    *ir,
-                                  int                            *kernel_type,
-                                  int                            *ewald_excl,
-                                  const gmx_hw_info_t gmx_unused &hardwareInfo)
-{
-    *kernel_type = nbnxnk4x4_PlainC;
-    *ewald_excl  = ewaldexclTable;
-
-#if GMX_SIMD
-    {
-#ifdef GMX_NBNXN_SIMD_4XN
-        *kernel_type = nbnxnk4xN_SIMD_4xN;
-#endif
-#ifdef GMX_NBNXN_SIMD_2XNN
-        *kernel_type = nbnxnk4xN_SIMD_2xNN;
-#endif
-
-#if defined GMX_NBNXN_SIMD_2XNN && defined GMX_NBNXN_SIMD_4XN
-        /* We need to choose if we want 2x(N+N) or 4xN kernels.
-         * This is based on the SIMD acceleration choice and CPU information
-         * detected at runtime.
-         *
-         * 4xN calculates more (zero) interactions, but has less pair-search
-         * work and much better kernel instruction scheduling.
-         *
-         * Up till now we have only seen that on Intel Sandy/Ivy Bridge,
-         * which doesn't have FMA, both the analytical and tabulated Ewald
-         * kernels have similar pair rates for 4x8 and 2x(4+4), so we choose
-         * 2x(4+4) because it results in significantly fewer pairs.
-         * For RF, the raw pair rate of the 4x8 kernel is higher than 2x(4+4),
-         * 10% with HT, 50% without HT. As we currently don't detect the actual
-         * use of HT, use 4x8 to avoid a potential performance hit.
-         * On Intel Haswell 4x8 is always faster.
-         */
-        *kernel_type = nbnxnk4xN_SIMD_4xN;
-
-#if !GMX_SIMD_HAVE_FMA
-        if (EEL_PME_EWALD(ir->coulombtype) ||
-            EVDW_PME(ir->vdwtype))
-        {
-            /* We have Ewald kernels without FMA (Intel Sandy/Ivy Bridge).
-             * There are enough instructions to make 2x(4+4) efficient.
-             */
-            *kernel_type = nbnxnk4xN_SIMD_2xNN;
-        }
-#endif
-        if (hardwareInfo.haveAmdZenCpu)
-        {
-            /* One 256-bit FMA per cycle makes 2xNN faster */
-            *kernel_type = nbnxnk4xN_SIMD_2xNN;
-        }
-#endif  /* GMX_NBNXN_SIMD_2XNN && GMX_NBNXN_SIMD_4XN */
-
-
-        if (getenv("GMX_NBNXN_SIMD_4XN") != nullptr)
-        {
-#ifdef GMX_NBNXN_SIMD_4XN
-            *kernel_type = nbnxnk4xN_SIMD_4xN;
-#else
-            gmx_fatal(FARGS, "SIMD 4xN kernels requested, but GROMACS has been compiled without support for these kernels");
-#endif
-        }
-        if (getenv("GMX_NBNXN_SIMD_2XNN") != nullptr)
-        {
-#ifdef GMX_NBNXN_SIMD_2XNN
-            *kernel_type = nbnxnk4xN_SIMD_2xNN;
-#else
-            gmx_fatal(FARGS, "SIMD 2x(N+N) kernels requested, but GROMACS has been compiled without support for these kernels");
-#endif
-        }
-
-        /* Analytical Ewald exclusion correction is only an option in
-         * the SIMD kernel.
-         * Since table lookup's don't parallelize with SIMD, analytical
-         * will probably always be faster for a SIMD width of 8 or more.
-         * With FMA analytical is sometimes faster for a width if 4 as well.
-         * In single precision, this is faster on Bulldozer.
-         */
-#if GMX_SIMD_REAL_WIDTH >= 8 || \
-        (GMX_SIMD_REAL_WIDTH >= 4 && GMX_SIMD_HAVE_FMA && !GMX_DOUBLE)
-        /* On AMD Zen, tabulated Ewald kernels are faster on all 4 combinations
-         * of single or double precision and 128 or 256-bit AVX2.
-         */
-        if (!hardwareInfo.haveAmdZenCpu)
-        {
-            *ewald_excl = ewaldexclAnalytical;
-        }
-#endif
-        if (getenv("GMX_NBNXN_EWALD_TABLE") != nullptr)
-        {
-            *ewald_excl = ewaldexclTable;
-        }
-        if (getenv("GMX_NBNXN_EWALD_ANALYTICAL") != nullptr)
-        {
-            *ewald_excl = ewaldexclAnalytical;
-        }
-
-    }
-#endif // GMX_SIMD
-}
-
-
-const char *lookup_nbnxn_kernel_name(int kernel_type)
-{
-    const char *returnvalue = nullptr;
-    switch (kernel_type)
-    {
-        case nbnxnkNotSet:
-            returnvalue = "not set";
-            break;
-        case nbnxnk4x4_PlainC:
-            returnvalue = "plain C";
-            break;
-        case nbnxnk4xN_SIMD_4xN:
-        case nbnxnk4xN_SIMD_2xNN:
-#if GMX_SIMD
-            returnvalue = "SIMD";
-#else  // GMX_SIMD
-            returnvalue = "not available";
-#endif // GMX_SIMD
-            break;
-        case nbnxnk8x8x8_GPU: returnvalue    = "GPU"; break;
-        case nbnxnk8x8x8_PlainC: returnvalue = "plain C"; break;
-
-        case nbnxnkNR:
-        default:
-            gmx_fatal(FARGS, "Illegal kernel type selected");
-    }
-    return returnvalue;
-};
-
-static void pick_nbnxn_kernel(const gmx::MDLogger &mdlog,
-                              gmx_bool             use_simd_kernels,
-                              const gmx_hw_info_t &hardwareInfo,
-                              gmx_bool             bUseGPU,
-                              EmulateGpuNonbonded  emulateGpu,
-                              const t_inputrec    *ir,
-                              int                 *kernel_type,
-                              int                 *ewald_excl,
-                              gmx_bool             bDoNonbonded)
-{
-    assert(kernel_type);
-
-    *kernel_type = nbnxnkNotSet;
-    *ewald_excl  = ewaldexclTable;
-
-    if (emulateGpu == EmulateGpuNonbonded::Yes)
-    {
-        *kernel_type = nbnxnk8x8x8_PlainC;
-
-        if (bDoNonbonded)
-        {
-            GMX_LOG(mdlog.warning).asParagraph().appendText("Emulating a GPU run on the CPU (slow)");
-        }
-    }
-    else if (bUseGPU)
-    {
-        *kernel_type = nbnxnk8x8x8_GPU;
-    }
-
-    if (*kernel_type == nbnxnkNotSet)
-    {
-        if (use_simd_kernels &&
-            nbnxn_simd_supported(mdlog, ir))
-        {
-            pick_nbnxn_kernel_cpu(ir, kernel_type, ewald_excl, hardwareInfo);
-        }
-        else
-        {
-            *kernel_type = nbnxnk4x4_PlainC;
-        }
-    }
-
-    if (bDoNonbonded)
-    {
-        GMX_LOG(mdlog.info).asParagraph().appendTextFormatted(
-                "Using %s %dx%d nonbonded short-range kernels",
-                lookup_nbnxn_kernel_name(*kernel_type),
-                nbnxn_kernel_to_cluster_i_size(*kernel_type),
-                nbnxn_kernel_to_cluster_j_size(*kernel_type));
-
-        if (nbnxnk4x4_PlainC == *kernel_type ||
-            nbnxnk8x8x8_PlainC == *kernel_type)
-        {
-            GMX_LOG(mdlog.warning).asParagraph().appendTextFormatted(
-                    "WARNING: Using the slow %s kernels. This should\n"
-                    "not happen during routine usage on supported platforms.",
-                    lookup_nbnxn_kernel_name(*kernel_type));
-        }
-    }
-}
-
 /*! \brief Print Coulomb Ewald citations and set ewald coefficients */
 static void initCoulombEwaldParameters(FILE *fp, const t_inputrec *ir,
                                        bool systemHasNetCharge,
@@ -2099,163 +1881,6 @@ done_interaction_const(interaction_const_t *interaction_const)
     sfree(interaction_const);
 }
 
-static void init_nb_verlet(const gmx::MDLogger     &mdlog,
-                           nonbonded_verlet_t     **nb_verlet,
-                           gmx_bool                 bFEP_NonBonded,
-                           const t_inputrec        *ir,
-                           const t_forcerec        *fr,
-                           const t_commrec         *cr,
-                           const gmx_hw_info_t     &hardwareInfo,
-                           const gmx_device_info_t *deviceInfo,
-                           const gmx_mtop_t        *mtop,
-                           matrix                   box)
-{
-    nonbonded_verlet_t *nbv;
-    char               *env;
-
-    nbv = new nonbonded_verlet_t();
-
-    nbv->emulateGpu = ((getenv("GMX_EMULATE_GPU") != nullptr) ? EmulateGpuNonbonded::Yes : EmulateGpuNonbonded::No);
-    nbv->bUseGPU    = deviceInfo != nullptr;
-
-    GMX_RELEASE_ASSERT(!(nbv->emulateGpu == EmulateGpuNonbonded::Yes && nbv->bUseGPU), "When GPU emulation is active, there cannot be a GPU assignment");
-
-    nbv->nbs             = nullptr;
-    nbv->min_ci_balanced = 0;
-
-    nbv->ngrp = (DOMAINDECOMP(cr) ? 2 : 1);
-    for (int i = 0; i < nbv->ngrp; i++)
-    {
-        nbv->grp[i].nbl_lists.nnbl = 0;
-        nbv->grp[i].kernel_type    = nbnxnkNotSet;
-
-        if (i == 0) /* local */
-        {
-            pick_nbnxn_kernel(mdlog, fr->use_simd_kernels, hardwareInfo,
-                              nbv->bUseGPU, nbv->emulateGpu, ir,
-                              &nbv->grp[i].kernel_type,
-                              &nbv->grp[i].ewald_excl,
-                              fr->bNonbonded);
-        }
-        else /* non-local */
-        {
-            /* Use the same kernel for local and non-local interactions */
-            nbv->grp[i].kernel_type = nbv->grp[0].kernel_type;
-            nbv->grp[i].ewald_excl  = nbv->grp[0].ewald_excl;
-        }
-    }
-
-    nbv->listParams = std::make_unique<NbnxnListParameters>(ir->rlist);
-    setupDynamicPairlistPruning(mdlog, ir, mtop, box, nbv->grp[0].kernel_type, fr->ic,
-                                nbv->listParams.get());
-
-    nbv->nbs = std::make_unique<nbnxn_search>(DOMAINDECOMP(cr) ? &cr->dd->nc : nullptr,
-                                              DOMAINDECOMP(cr) ? domdec_zones(cr->dd) : nullptr,
-                                              bFEP_NonBonded,
-                                              gmx_omp_nthreads_get(emntPairsearch));
-
-    for (int i = 0; i < nbv->ngrp; i++)
-    {
-        nbnxn_init_pairlist_set(&nbv->grp[i].nbl_lists,
-                                nbnxn_kernel_pairlist_simple(nbv->grp[i].kernel_type),
-                                /* 8x8x8 "non-simple" lists are ATM always combined */
-                                !nbnxn_kernel_pairlist_simple(nbv->grp[i].kernel_type));
-    }
-
-    int      enbnxninitcombrule;
-    if (fr->ic->vdwtype == evdwCUT &&
-        (fr->ic->vdw_modifier == eintmodNONE ||
-         fr->ic->vdw_modifier == eintmodPOTSHIFT) &&
-        getenv("GMX_NO_LJ_COMB_RULE") == nullptr)
-    {
-        /* Plain LJ cut-off: we can optimize with combination rules */
-        enbnxninitcombrule = enbnxninitcombruleDETECT;
-    }
-    else if (fr->ic->vdwtype == evdwPME)
-    {
-        /* LJ-PME: we need to use a combination rule for the grid */
-        if (fr->ljpme_combination_rule == eljpmeGEOM)
-        {
-            enbnxninitcombrule = enbnxninitcombruleGEOM;
-        }
-        else
-        {
-            enbnxninitcombrule = enbnxninitcombruleLB;
-        }
-    }
-    else
-    {
-        /* We use a full combination matrix: no rule required */
-        enbnxninitcombrule = enbnxninitcombruleNONE;
-    }
-
-    nbv->nbat = new nbnxn_atomdata_t(nbv->bUseGPU ? gmx::PinningPolicy::PinnedIfSupported : gmx::PinningPolicy::CannotBePinned);
-    int mimimumNumEnergyGroupNonbonded = ir->opts.ngener;
-    if (ir->opts.ngener - ir->nwall == 1)
-    {
-        /* We have only one non-wall energy group, we do not need energy group
-         * support in the non-bondeds kernels, since all non-bonded energy
-         * contributions go to the first element of the energy group matrix.
-         */
-        mimimumNumEnergyGroupNonbonded = 1;
-    }
-    bool bSimpleList = nbnxn_kernel_pairlist_simple(nbv->grp[0].kernel_type);
-    nbnxn_atomdata_init(mdlog,
-                        nbv->nbat,
-                        nbv->grp[0].kernel_type,
-                        enbnxninitcombrule,
-                        fr->ntype, fr->nbfp,
-                        mimimumNumEnergyGroupNonbonded,
-                        bSimpleList ? gmx_omp_nthreads_get(emntNonbonded) : 1);
-
-    if (nbv->bUseGPU)
-    {
-        /* init the NxN GPU data; the last argument tells whether we'll have
-         * both local and non-local NB calculation on GPU */
-        nbnxn_gpu_init(&nbv->gpu_nbv,
-                       deviceInfo,
-                       fr->ic,
-                       nbv->listParams.get(),
-                       nbv->nbat,
-                       cr->nodeid,
-                       (nbv->ngrp > 1));
-
-        if ((env = getenv("GMX_NB_MIN_CI")) != nullptr)
-        {
-            char *end;
-
-            nbv->min_ci_balanced = strtol(env, &end, 10);
-            if (!end || (*end != 0) || nbv->min_ci_balanced < 0)
-            {
-                gmx_fatal(FARGS, "Invalid value passed in GMX_NB_MIN_CI=%s, non-negative integer required", env);
-            }
-
-            if (debug)
-            {
-                fprintf(debug, "Neighbor-list balancing parameter: %d (passed as env. var.)\n",
-                        nbv->min_ci_balanced);
-            }
-        }
-        else
-        {
-            nbv->min_ci_balanced = nbnxn_gpu_min_ci_balanced(nbv->gpu_nbv);
-            if (debug)
-            {
-                fprintf(debug, "Neighbor-list balancing parameter: %d (auto-adjusted to the number of GPU multi-processors)\n",
-                        nbv->min_ci_balanced);
-            }
-        }
-
-    }
-
-    *nb_verlet = nbv;
-}
-
-gmx_bool usingGpu(nonbonded_verlet_t *nbv)
-{
-    return nbv != nullptr && nbv->bUseGPU;
-}
-
 void init_forcerec(FILE                             *fp,
                    const gmx::MDLogger              &mdlog,
                    t_forcerec                       *fr,
diff --git a/src/gromacs/mdlib/forcerec.h b/src/gromacs/mdlib/forcerec.h
index 1316e872ff..b5a60c933b 100644
--- a/src/gromacs/mdlib/forcerec.h
+++ b/src/gromacs/mdlib/forcerec.h
@@ -160,13 +160,6 @@ gmx_bool uses_simple_tables(int                 cutoff_scheme,
  * with the type of kernel indicated.
  */
 
-gmx_bool nbnxn_simd_supported(const gmx::MDLogger &mdlog,
-                              const t_inputrec    *ir);
-/* Return if CPU SIMD support exists for the given inputrec
- * If the return value is FALSE and fplog/cr != NULL, prints a fallback
- * message to fplog/stderr.
- */
-
 /* Compute the average C6 and C12 params for LJ corrections */
 void set_avcsixtwelve(FILE *fplog, t_forcerec *fr,
                       const gmx_mtop_t *mtop);
diff --git a/src/gromacs/mdlib/nbnxn_grid.h b/src/gromacs/mdlib/nbnxn_grid.h
deleted file mode 100644
index 1ff3f5c031..0000000000
--- a/src/gromacs/mdlib/nbnxn_grid.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * This file is part of the GROMACS molecular simulation package.
- *
- * Copyright (c) 2012,2013,2014,2015,2017,2018, by the GROMACS development team, led by
- * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
- * and including many others, as listed in the AUTHORS file in the
- * top-level source directory and at http://www.gromacs.org.
- *
- * GROMACS is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * GROMACS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GROMACS; if not, see
- * http://www.gnu.org/licenses, or write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- *
- * If you want to redistribute modifications to GROMACS, please
- * consider that scientific software is very special. Version
- * control is crucial - bugs must be traceable. We will be happy to
- * consider code for inclusion in the official distribution, but
- * derived work must not be called official GROMACS. Details are found
- * in the README & COPYING files - if they are missing, get the
- * official version at http://www.gromacs.org.
- *
- * To help us fund GROMACS development, we humbly ask that you cite
- * the research papers on the package. Check out http://www.gromacs.org.
- */
-
-#ifndef _nbnxn_grid_h
-#define _nbnxn_grid_h
-
-#include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_internal.h"
-#include "gromacs/utility/arrayref.h"
-#include "gromacs/utility/real.h"
-
-struct gmx_domdec_zones_t;
-namespace gmx
-{
-class UpdateGroupsCog;
-}
-
-/* Put the atoms on the pair search grid.
- * Only atoms atomStart to atomEnd in x are put on the grid.
- * The atom_density is used to determine the grid size.
- * When atomDensity<=0, the density is determined from atomEnd-atomStart and the corners.
- * With domain decomposition part of the n particles might have migrated,
- * but have not been removed yet. This count is given by nmoved.
- * When move[i] < 0 particle i has migrated and will not be put on the grid.
- * Without domain decomposition move will be NULL.
- */
-void nbnxn_put_on_grid(nbnxn_search_t                  nbs,
-                       int                             ePBC,
-                       const matrix                    box,
-                       int                             ddZone,
-                       const rvec                      lowerCorner,
-                       const rvec                      upperCorner,
-                       const gmx::UpdateGroupsCog     *updateGroupsCog,
-                       int                             atomStart,
-                       int                             atomEnd,
-                       real                            atomDensity,
-                       const int                      *atinfo,
-                       gmx::ArrayRef<const gmx::RVec>  x,
-                       int                             numAtomsMoved,
-                       const int                      *move,
-                       int                             nb_kernel_type,
-                       nbnxn_atomdata_t               *nbat);
-
-/* As nbnxn_put_on_grid, but for the non-local atoms
- * with domain decomposition. Should be called after calling
- * nbnxn_search_put_on_grid for the local atoms / home zone.
- */
-void nbnxn_put_on_grid_nonlocal(nbnxn_search_t                   nbs,
-                                const struct gmx_domdec_zones_t *zones,
-                                const int                       *atinfo,
-                                gmx::ArrayRef<const gmx::RVec>   x,
-                                int                              nb_kernel_type,
-                                nbnxn_atomdata_t                *nbat);
-
-/* Return the number of x and y cells in the local grid */
-void nbnxn_get_ncells(nbnxn_search_t nbs, int *ncx, int *ncy);
-
-/* Return the order indices of the atoms on the pairlist search grid */
-gmx::ArrayRef<const int> nbnxn_get_atomorder(const nbnxn_search* nbs);
-
-/* Renumber the atom indices on the grid to consecutive order */
-void nbnxn_set_atomorder(nbnxn_search_t nbs);
-
-/* Return the index position of the atoms on the pairlist search grid */
-gmx::ArrayRef<const int> nbnxn_get_gridindices(const nbnxn_search* nbs);
-
-#endif
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h
deleted file mode 100644
index 2d7c1be97b..0000000000
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * This file is part of the GROMACS molecular simulation package.
- *
- * Copyright (c) 2012,2013,2014,2015,2017,2018,2019, by the GROMACS development team, led by
- * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
- * and including many others, as listed in the AUTHORS file in the
- * top-level source directory and at http://www.gromacs.org.
- *
- * GROMACS is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * GROMACS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GROMACS; if not, see
- * http://www.gnu.org/licenses, or write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- *
- * If you want to redistribute modifications to GROMACS, please
- * consider that scientific software is very special. Version
- * control is crucial - bugs must be traceable. We will be happy to
- * consider code for inclusion in the official distribution, but
- * derived work must not be called official GROMACS. Details are found
- * in the README & COPYING files - if they are missing, get the
- * official version at http://www.gromacs.org.
- *
- * To help us fund GROMACS development, we humbly ask that you cite
- * the research papers on the package. Check out http://www.gromacs.org.
- */
-/*
- * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
- */
-
-
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h"
-
-/* Declare all the different kernel functions.
- */
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn;
-
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn;
-
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJ_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJ_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn;
-
-
-
-#ifdef INCLUDE_KERNELFUNCTION_TABLES
-
-/* Declare and define the kernel function pointer lookup tables.
- * The minor index of the array goes over both the LJ combination rules,
- * which is only supported by plain cut-off, and the LJ switch/PME functions.
- */
-static p_nbk_func_noener nbnxn_kernel_noener_simd_2xnn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJ_F_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJ_F_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn,
-    },
-};
-
-static p_nbk_func_ener nbnxn_kernel_ener_simd_2xnn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn,
-    },
-};
-
-static p_nbk_func_ener nbnxn_kernel_energrp_simd_2xnn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn,
-    },
-};
-
-
-#endif /* INCLUDE_KERNELFUNCTION_TABLES */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h
deleted file mode 100644
index 78c9eeacb2..0000000000
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * This file is part of the GROMACS molecular simulation package.
- *
- * Copyright (c) 2012,2013,2014,2015,2017,2018,2019, by the GROMACS development team, led by
- * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
- * and including many others, as listed in the AUTHORS file in the
- * top-level source directory and at http://www.gromacs.org.
- *
- * GROMACS is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * GROMACS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GROMACS; if not, see
- * http://www.gnu.org/licenses, or write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- *
- * If you want to redistribute modifications to GROMACS, please
- * consider that scientific software is very special. Version
- * control is crucial - bugs must be traceable. We will be happy to
- * consider code for inclusion in the official distribution, but
- * derived work must not be called official GROMACS. Details are found
- * in the README & COPYING files - if they are missing, get the
- * official version at http://www.gromacs.org.
- *
- * To help us fund GROMACS development, we humbly ask that you cite
- * the research papers on the package. Check out http://www.gromacs.org.
- */
-/*
- * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
- */
-
-
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h"
-
-/* Declare all the different kernel functions.
- */
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn;
-
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJ_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJ_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn;
-nbk_func_ener         nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn;
-
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJ_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJ_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn;
-nbk_func_noener       nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn;
-
-
-
-#ifdef INCLUDE_KERNELFUNCTION_TABLES
-
-/* Declare and define the kernel function pointer lookup tables.
- * The minor index of the array goes over both the LJ combination rules,
- * which is only supported by plain cut-off, and the LJ switch/PME functions.
- */
-static p_nbk_func_noener nbnxn_kernel_noener_simd_4xn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn,
-        nbnxn_kernel_ElecRF_VdwLJ_F_4xn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn,
-        nbnxn_kernel_ElecEw_VdwLJ_F_4xn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn,
-    },
-};
-
-static p_nbk_func_ener nbnxn_kernel_ener_simd_4xn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJ_VF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJ_VF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn,
-    },
-};
-
-static p_nbk_func_ener nbnxn_kernel_energrp_simd_4xn[coulktNR][vdwktNR] =
-{
-    {
-        nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn,
-        nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn,
-        nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn,
-        nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn,
-    },
-    {
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn,
-        nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn,
-    },
-};
-
-
-#endif /* INCLUDE_KERNELFUNCTION_TABLES */
diff --git a/src/gromacs/mdlib/perf_est.cpp b/src/gromacs/mdlib/perf_est.cpp
index 5596dbc9e5..961eb50b34 100644
--- a/src/gromacs/mdlib/perf_est.cpp
+++ b/src/gromacs/mdlib/perf_est.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2008, The GROMACS development team.
- * Copyright (c) 2012,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -43,11 +43,10 @@
 #include "gromacs/math/functions.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_search.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/topology/ifunc.h"
 #include "gromacs/topology/topology.h"
diff --git a/src/gromacs/mdlib/resethandler.cpp b/src/gromacs/mdlib/resethandler.cpp
index 0e1e06993f..5269dfde48 100644
--- a/src/gromacs/mdlib/resethandler.cpp
+++ b/src/gromacs/mdlib/resethandler.cpp
@@ -49,9 +49,9 @@
 #include "gromacs/ewald/pme_load_balancing.h"
 #include "gromacs/gmxlib/nrnb.h"
 #include "gromacs/gpu_utils/gpu_utils.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
 #include "gromacs/mdlib/sim_util.h"
 #include "gromacs/mdtypes/commrec.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
 #include "gromacs/timing/walltime_accounting.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"
diff --git a/src/gromacs/mdlib/sim_util.cpp b/src/gromacs/mdlib/sim_util.cpp
index 4b62448146..842b69cb9d 100644
--- a/src/gromacs/mdlib/sim_util.cpp
+++ b/src/gromacs/mdlib/sim_util.cpp
@@ -49,6 +49,7 @@
 
 #include "gromacs/awh/awh.h"
 #include "gromacs/domdec/dlbtiming.h"
+#include "gromacs/domdec/domdec.h"
 #include "gromacs/domdec/domdec_struct.h"
 #include "gromacs/domdec/partition.h"
 #include "gromacs/essentialdynamics/edsam.h"
@@ -78,15 +79,9 @@
 #include "gromacs/mdlib/forcerec.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
 #include "gromacs/mdlib/mdrun.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_atomdata.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_grid.h"
-#include "gromacs/mdlib/nbnxn_search.h"
 #include "gromacs/mdlib/ppforceworkload.h"
 #include "gromacs/mdlib/qmmm.h"
 #include "gromacs/mdlib/update.h"
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/enerdata.h"
 #include "gromacs/mdtypes/forceoutput.h"
@@ -94,6 +89,11 @@
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/atomdata.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/prunekerneldispatch.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_gpu_ref.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/pbcutil/mshift.h"
 #include "gromacs/pbcutil/pbc.h"
@@ -117,10 +117,6 @@
 #include "gromacs/utility/strconvert.h"
 #include "gromacs/utility/sysinfo.h"
 
-#include "nbnxn_gpu.h"
-#include "nbnxn_kernels/nbnxn_kernel_cpu.h"
-#include "nbnxn_kernels/nbnxn_kernel_prune.h"
-
 // TODO: this environment variable allows us to verify before release
 // that on less common architectures the total cost of polling is not larger than
 // a blocking wait (so polling does not introduce overhead when the static
diff --git a/src/gromacs/mdrun/md.cpp b/src/gromacs/mdrun/md.cpp
index cc93811fcd..3139bbdd11 100644
--- a/src/gromacs/mdrun/md.cpp
+++ b/src/gromacs/mdrun/md.cpp
@@ -86,8 +86,6 @@
 #include "gromacs/mdlib/mdrun.h"
 #include "gromacs/mdlib/mdsetup.h"
 #include "gromacs/mdlib/membed.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
 #include "gromacs/mdlib/ns.h"
 #include "gromacs/mdlib/resethandler.h"
 #include "gromacs/mdlib/shellfc.h"
@@ -115,6 +113,7 @@
 #include "gromacs/mdtypes/observableshistory.h"
 #include "gromacs/mdtypes/pullhistory.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/mshift.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pulling/output.h"
diff --git a/src/gromacs/mdrun/mimic.cpp b/src/gromacs/mdrun/mimic.cpp
index 56c3e261da..e221640482 100644
--- a/src/gromacs/mdrun/mimic.cpp
+++ b/src/gromacs/mdrun/mimic.cpp
@@ -85,8 +85,6 @@
 #include "gromacs/mdlib/mdrun.h"
 #include "gromacs/mdlib/mdsetup.h"
 #include "gromacs/mdlib/membed.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
 #include "gromacs/mdlib/ns.h"
 #include "gromacs/mdlib/resethandler.h"
 #include "gromacs/mdlib/shellfc.h"
diff --git a/src/gromacs/mdrun/rerun.cpp b/src/gromacs/mdrun/rerun.cpp
index e964fc080b..a6f30f0e74 100644
--- a/src/gromacs/mdrun/rerun.cpp
+++ b/src/gromacs/mdrun/rerun.cpp
@@ -86,8 +86,6 @@
 #include "gromacs/mdlib/mdrun.h"
 #include "gromacs/mdlib/mdsetup.h"
 #include "gromacs/mdlib/membed.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
 #include "gromacs/mdlib/ns.h"
 #include "gromacs/mdlib/resethandler.h"
 #include "gromacs/mdlib/shellfc.h"
diff --git a/src/gromacs/mdrun/runner.cpp b/src/gromacs/mdrun/runner.cpp
index 5f43ba8719..3ad53c99eb 100644
--- a/src/gromacs/mdrun/runner.cpp
+++ b/src/gromacs/mdrun/runner.cpp
@@ -89,10 +89,6 @@
 #include "gromacs/mdlib/mdatoms.h"
 #include "gromacs/mdlib/mdrun.h"
 #include "gromacs/mdlib/membed.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_search.h"
-#include "gromacs/mdlib/nbnxn_tuning.h"
 #include "gromacs/mdlib/ppforceworkload.h"
 #include "gromacs/mdlib/qmmm.h"
 #include "gromacs/mdlib/sighandler.h"
@@ -110,6 +106,8 @@
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/mdtypes/observableshistory.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/pairlist_tuning.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pulling/output.h"
 #include "gromacs/pulling/pull.h"
diff --git a/src/gromacs/nbnxm/CMakeLists.txt b/src/gromacs/nbnxm/CMakeLists.txt
new file mode 100644
index 0000000000..3c54e102f0
--- /dev/null
+++ b/src/gromacs/nbnxm/CMakeLists.txt
@@ -0,0 +1,46 @@
+#
+# This file is part of the GROMACS molecular simulation package.
+#
+# Copyright (c) 2019, by the GROMACS development team, led by
+# Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+# and including many others, as listed in the AUTHORS file in the
+# top-level source directory and at http://www.gromacs.org.
+#
+# GROMACS is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1
+# of the License, or (at your option) any later version.
+#
+# GROMACS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with GROMACS; if not, see
+# http://www.gnu.org/licenses, or write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+#
+# If you want to redistribute modifications to GROMACS, please
+# consider that scientific software is very special. Version
+# control is crucial - bugs must be traceable. We will be happy to
+# consider code for inclusion in the official distribution, but
+# derived work must not be called official GROMACS. Details are found
+# in the README & COPYING files - if they are missing, get the
+# official version at http://www.gromacs.org.
+#
+# To help us fund GROMACS development, we humbly ask that you cite
+# the research papers on the package. Check out http://www.gromacs.org.
+
+file(GLOB NBNXM_SOURCES kernels_reference/*.cpp kernels_simd_4xm/*.cpp kernels_simd_2xmm/*.cpp *.cpp)
+
+if(GMX_USE_CUDA)
+    add_subdirectory(cuda)
+endif()
+
+if(GMX_USE_OPENCL)
+    add_subdirectory(opencl)
+    set(NBNXM_OPENCL_KERNELS ${NBNXM_OPENCL_KERNELS} PARENT_SCOPE)
+endif()
+
+set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${NBNXM_SOURCES} PARENT_SCOPE)
diff --git a/src/gromacs/mdlib/nbnxn_atomdata.cpp b/src/gromacs/nbnxm/atomdata.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_atomdata.cpp
rename to src/gromacs/nbnxm/atomdata.cpp
index d5076d967e..32bc76379b 100644
--- a/src/gromacs/mdlib/nbnxn_atomdata.cpp
+++ b/src/gromacs/nbnxm/atomdata.cpp
@@ -35,7 +35,7 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_atomdata.h"
+#include "atomdata.h"
 
 #include <cassert>
 #include <cmath>
@@ -50,13 +50,10 @@
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_internal.h"
-#include "gromacs/mdlib/nbnxn_search.h"
-#include "gromacs/mdlib/nbnxn_util.h"
 #include "gromacs/mdtypes/forcerec.h" // only for GET_CGINFO_*
 #include "gromacs/mdtypes/mdatom.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_geometry.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/timing/wallcycle.h"
@@ -68,6 +65,8 @@
 #include "gromacs/utility/strconvert.h"
 #include "gromacs/utility/stringutil.h"
 
+#include "internal.h"
+
 using namespace gmx; // TODO: Remove when this file is moved into gmx namespace
 
 
diff --git a/src/gromacs/mdlib/nbnxn_atomdata.h b/src/gromacs/nbnxm/atomdata.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_atomdata.h
rename to src/gromacs/nbnxm/atomdata.h
index 09c1042efa..ebfeee5bfb 100644
--- a/src/gromacs/mdlib/nbnxn_atomdata.h
+++ b/src/gromacs/nbnxm/atomdata.h
@@ -33,13 +33,12 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _nbnxn_atomdata_h
-#define _nbnxn_atomdata_h
+#ifndef GMX_NBNXN_ATOMDATA_H
+#define GMX_NBNXN_ATOMDATA_H
 
 #include <cstdio>
 
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"
 
@@ -48,6 +47,8 @@ namespace gmx
 class MDLogger;
 }
 
+struct nbnxn_atomdata_t;
+struct nbnxn_search;
 struct t_mdatoms;
 struct gmx_wallcycle;
 
diff --git a/src/gromacs/mdlib/nbnxn_consts.h b/src/gromacs/nbnxm/constants.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_consts.h
rename to src/gromacs/nbnxm/constants.h
index c2475e826f..cb547c525a 100644
--- a/src/gromacs/mdlib/nbnxn_consts.h
+++ b/src/gromacs/nbnxm/constants.h
@@ -33,8 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _nbnxn_consts_h
-#define _nbnxn_consts_h
+#ifndef GMX_NBNXN_CONSTANTS_H
+#define GMX_NBNXN_CONSTANTS_H
 
 // Lower limit for square interaction distances in nonbonded kernels.
 // For smaller values we will overflow when calculating r^-1 or r^-12, but
diff --git a/src/gromacs/mdlib/nbnxn_cuda/CMakeLists.txt b/src/gromacs/nbnxm/cuda/CMakeLists.txt
similarity index 74%
rename from src/gromacs/mdlib/nbnxn_cuda/CMakeLists.txt
rename to src/gromacs/nbnxm/cuda/CMakeLists.txt
index 4d45ce553b..73d1d75590 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/CMakeLists.txt
+++ b/src/gromacs/nbnxm/cuda/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014,2015,2016,2017,2019, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -34,18 +34,18 @@
 
 if(GMX_USE_CUDA)
     if(NOT GMX_CUDA_NB_SINGLE_COMPILATION_UNIT)
-        set(NBNXN_CUDA_KERNEL_SOURCES
-                nbnxn_cuda_kernel_F_noprune.cu
-                nbnxn_cuda_kernel_F_prune.cu
-                nbnxn_cuda_kernel_VF_noprune.cu
-                nbnxn_cuda_kernel_VF_prune.cu
-                nbnxn_cuda_kernel_pruneonly.cu)
+        set(NBNXM_CUDA_KERNEL_SOURCES
+                nbnxm_cuda_kernel_F_noprune.cu
+                nbnxm_cuda_kernel_F_prune.cu
+                nbnxm_cuda_kernel_VF_noprune.cu
+                nbnxm_cuda_kernel_VF_prune.cu
+                nbnxm_cuda_kernel_pruneonly.cu)
     endif()
 
-    file(GLOB NBNXN_CUDA_SOURCES
-         nbnxn_cuda.cu
-         nbnxn_cuda_data_mgmt.cu
-         nbnxn_cuda_jit_support.cu
-         ${NBNXN_CUDA_KERNEL_SOURCES})
-    set(MDLIB_SOURCES ${MDLIB_SOURCES} ${NBNXN_CUDA_SOURCES} PARENT_SCOPE)
+    file(GLOB NBNXM_CUDA_SOURCES
+         nbnxm_cuda.cu
+         nbnxm_cuda_data_mgmt.cu
+         nbnxm_cuda_jit_support.cu
+         ${NBNXM_CUDA_KERNEL_SOURCES})
+    set(NBNXM_SOURCES ${NBNXM_SOURCES} ${NBNXM_CUDA_SOURCES} PARENT_SCOPE)
 endif()
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
index 7a78dda109..15eb634f28 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
@@ -44,28 +44,27 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "gromacs/mdlib/nbnxn_gpu.h"
+#include "gromacs/nbnxm/nbnxm_gpu.h"
 
 #if defined(_MSVC)
 #include <limits>
 #endif
 
 
-#include "nbnxn_cuda.h"
+#include "nbnxm_cuda.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_common.h"
-#include "gromacs/mdlib/nbnxn_gpu_common_utils.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/gpu_common.h"
+#include "gromacs/nbnxm/gpu_common_utils.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/gmxassert.h"
 
-#include "nbnxn_cuda_types.h"
-
+#include "nbnxm_cuda_types.h"
 
 /***** The kernel declarations/definitions come here *****/
 
@@ -78,33 +77,33 @@
  */
 #define FUNCTION_DECLARATION_ONLY
 /** Force only **/
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 /** Force & energy **/
 #define CALC_ENERGIES
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
 
 /*** Pair-list pruning kernels ***/
 /** Force only **/
 #define PRUNE_NBL
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 /** Force & energy **/
 #define CALC_ENERGIES
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
 #undef PRUNE_NBL
 
 /* Prune-only kernels */
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh"
 #undef FUNCTION_DECLARATION_ONLY
 
 /* Now generate the function definitions if we are using a single compilation unit. */
 #if GMX_CUDA_NB_SINGLE_COMPILATION_UNIT
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu"
 #endif /* GMX_CUDA_NB_SINGLE_COMPILATION_UNIT */
 
 
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h b/src/gromacs/nbnxm/cuda/nbnxm_cuda.h
similarity index 96%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda.h
index e2badb3283..f732da87d7 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_data_mgmt.cu
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_data_mgmt.cu
index d91efb1e77..537098d479 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_data_mgmt.cu
@@ -50,11 +50,10 @@
 #include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/basedefinitions.h"
@@ -63,8 +62,8 @@
 #include "gromacs/utility/real.h"
 #include "gromacs/utility/smalloc.h"
 
-#include "nbnxn_cuda.h"
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda.h"
+#include "nbnxm_cuda_types.h"
 
 /* This is a heuristically determined parameter for the Kepler
  * and Maxwell architectures for the minimum size of ci lists by multiplying
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh
index a1c85b7f53..b825e2221b 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -42,7 +42,7 @@
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
  *  \author Berk Hess <hess@kth.se>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
 #include "gromacs/gpu_utils/cuda_arch_utils.cuh"
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu
similarity index 85%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu
index 9a92dae268..1e17c44a05 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2015,2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,16 +35,15 @@
 #include "gmxpre.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
 /* Top-level kernel generation: will generate through multiple
  * inclusion the following flavors for all kernel:
  * force-only output without pair list pruning;
  */
 #define FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu
similarity index 85%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu
index d2cfd3a3e6..dde88087ff 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2015,2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,10 +35,9 @@
 #include "gmxpre.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
 /* Top-level kernel generation: will generate through multiple
  * inclusion the following flavors for all kernel:
@@ -46,7 +45,7 @@
  */
 #define PRUNE_NBL
 #define FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef PRUNE_NBL
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu
similarity index 85%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu
index ac0f9bef59..c6dd13c49a 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2015,2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,10 +35,9 @@
 #include "gmxpre.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
 /* Top-level kernel generation: will generate through multiple
  * inclusion the following flavors for all kernel:
@@ -46,7 +45,7 @@
  */
 #define CALC_ENERGIES
 #define FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu
similarity index 86%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu
index cccf3c1392..20e8fedfa0 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2015,2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,10 +35,9 @@
 #include "gmxpre.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
 /* Top-level kernel generation: will generate through multiple
  * inclusion the following flavors for all kernel:
@@ -47,8 +46,8 @@
 #define PRUNE_NBL
 #define CALC_ENERGIES
 #define FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef FUNCTION_DECLARATION_ONLY
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
 #undef PRUNE_NBL
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu
index 27520ff557..db718b2053 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -34,7 +34,7 @@
  */
 #include "gmxpre.h"
 
-#include "nbnxn_cuda_kernel_pruneonly.cuh"
+#include "nbnxm_cuda_kernel_pruneonly.cuh"
 
 #ifndef FUNCTION_DECLARATION_ONLY
 /* Instantiate external template functions */
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh
index d2d1ebb808..1993a4c181 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -42,16 +42,16 @@
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
  *  \author Berk Hess <hess@kth.se>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 #include "gmxpre.h"
 
 #include "gromacs/gpu_utils/cuda_arch_utils.cuh"
 #include "gromacs/math/utilities.h"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh"
 #include "gromacs/pbcutil/ishift.h"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
 /* Note that floating-point constants in CUDA code should be suffixed
  * with f (e.g. 0.5f), to stop the compiler producing intermediate
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh
index e9809c8c0d..34b932394b 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -40,7 +40,7 @@
  *  kernels are included (has to be preceded by nbnxn_cuda_types.h).
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 #include <assert.h>
 
@@ -53,10 +53,10 @@
 #include "gromacs/gpu_utils/cuda_kernel_utils.cuh"
 #include "gromacs/gpu_utils/vectype_ops.cuh"
 
-#include "nbnxn_cuda_types.h"
+#include "nbnxm_cuda_types.h"
 
-#ifndef NBNXN_CUDA_KERNEL_UTILS_CUH
-#define NBNXN_CUDA_KERNEL_UTILS_CUH
+#ifndef NBNXM_CUDA_KERNEL_UTILS_CUH
+#define NBNXM_CUDA_KERNEL_UTILS_CUH
 
 /*! \brief Log of the i and j cluster size.
  *  change this together with c_clSize !*/
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh
similarity index 80%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh
index 16977d73d2..323e6a671f 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -49,7 +49,7 @@
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
  *  \author Berk Hess <hess@kth.se>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
 /* Analytical plain cut-off electrostatics kernels
@@ -58,42 +58,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecCut_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -106,42 +106,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecRF_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -154,42 +154,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEw_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -203,42 +203,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -251,42 +251,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTab_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -299,42 +299,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJ ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJEwCombGeom ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJEwCombLB ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJFsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJPsw ## __VA_ARGS__
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_types.h b/src/gromacs/nbnxm/cuda/nbnxm_cuda_types.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_types.h
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda_types.h
index 24185982e1..3d490c395a 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_types.h
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda_types.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2012, The GROMACS development team.
- * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -40,23 +40,21 @@
  *  Data types used internally in the nbnxn_cuda module.
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
-#ifndef NBNXN_CUDA_TYPES_H
-#define NBNXN_CUDA_TYPES_H
+#ifndef NBNXM_CUDA_TYPES_H
+#define NBNXM_CUDA_TYPES_H
 
 #include "gromacs/gpu_utils/cuda_arch_utils.cuh"
 #include "gromacs/gpu_utils/cudautils.cuh"
 #include "gromacs/gpu_utils/devicebuffer.h"
 #include "gromacs/gpu_utils/gputraits.cuh"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_gpu_types_common.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/gpu_types_common.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/timing/gpu_timing.h"
 
-
 /*! \brief Macro definining default for the prune kernel's j4 processing concurrency.
  *
  *  The GMX_NBNXN_PRUNE_KERNEL_J4_CONCURRENCY macro allows compile-time override.
diff --git a/src/gromacs/mdlib/nbnxn_gpu_common.h b/src/gromacs/nbnxm/gpu_common.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_gpu_common.h
rename to src/gromacs/nbnxm/gpu_common.h
index c8726c9716..cd64c8ca1a 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_common.h
+++ b/src/gromacs/nbnxm/gpu_common.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -37,35 +37,35 @@
  *
  * \author Szilard Pall <pall.szilard@gmail.com>
  *
- * \ingroup module_mdlib
+ * \ingroup module_nbnxm
  */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_COMMON_H
-#define GMX_MDLIB_NBNXN_GPU_COMMON_H
+#ifndef GMX_NBNXM_GPU_COMMON_H
+#define GMX_NBNXM_GPU_COMMON_H
 
 #include "config.h"
 
 #include <string>
 
 #if GMX_GPU == GMX_GPU_CUDA
-#include "nbnxn_cuda/nbnxn_cuda_types.h"
+#include "cuda/nbnxm_cuda_types.h"
 #endif
 
 #if GMX_GPU == GMX_GPU_OPENCL
-#include "nbnxn_ocl/nbnxn_ocl_types.h"
+#include "opencl/nbnxm_ocl_types.h"
 #endif
 
 #include "gromacs/gpu_utils/gpu_utils.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/stringutil.h"
 
-#include "nbnxn_gpu_common_utils.h"
+#include "gpu_common_utils.h"
+#include "nbnxm_gpu.h"
 
 /*! \brief Check that atom locality values are valid for the GPU module.
  *
diff --git a/src/gromacs/mdlib/nbnxn_gpu_common_utils.h b/src/gromacs/nbnxm/gpu_common_utils.h
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_gpu_common_utils.h
rename to src/gromacs/nbnxm/gpu_common_utils.h
index f6cbe10c57..40bffbb7b3 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_common_utils.h
+++ b/src/gromacs/nbnxm/gpu_common_utils.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017, by the GROMACS development team, led by
+ * Copyright (c) 2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,20 +36,22 @@
  * \brief Implements common util routines for different NBNXN GPU implementations
  *
  * \author Aleksei Iupinov <a.yupinov@gmail.com>
- * \ingroup module_mdlib
+ * \ingroup module_nbnxm
  */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_COMMON_UTILS_H
-#define GMX_MDLIB_NBNXN_GPU_COMMON_UTILS_H
+#ifndef GMX_NBNXM_GPU_COMMON_UTILS_H
+#define GMX_NBNXM_GPU_COMMON_UTILS_H
 
 #include "config.h"
 
+#include "gromacs/nbnxm/nbnxm.h"
+
 #if GMX_GPU == GMX_GPU_CUDA
-#include "nbnxn_cuda/nbnxn_cuda_types.h"
+#include "cuda/nbnxm_cuda_types.h"
 #endif
 
 #if GMX_GPU == GMX_GPU_OPENCL
-#include "nbnxn_ocl/nbnxn_ocl_types.h"
+#include "opencl/nbnxm_ocl_types.h"
 #endif
 
 /*! \brief An early return condition for empty NB GPU workloads
diff --git a/src/gromacs/mdlib/nbnxn_gpu_data_mgmt.h b/src/gromacs/nbnxm/gpu_data_mgmt.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_gpu_data_mgmt.h
rename to src/gromacs/nbnxm/gpu_data_mgmt.h
index 5226038469..94d92a77e3 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_data_mgmt.h
+++ b/src/gromacs/nbnxm/gpu_data_mgmt.h
@@ -35,18 +35,20 @@
 /*! \libinternal \file
  *  \brief Declare interface for GPU data transfer for NBNXN module
  *
+ *  \author Szilard Pall <pall.szilard@gmail.com>
  *  \author Mark Abraham <mark.j.abraham@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  *  \inlibraryapi
  */
 
-#ifndef NBNXN_GPU_DATA_MGMT_H
-#define NBNXN_GPU_DATA_MGMT_H
+#ifndef GMX_NBNXN_GPU_DATA_MGMT_H
+#define GMX_NBNXN_GPU_DATA_MGMT_H
 
 #include "gromacs/gpu_utils/gpu_macros.h"
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
 #include "gromacs/mdtypes/interaction_const.h"
 
+#include "gpu_types.h"
+
 struct nonbonded_verlet_group_t;
 struct NbnxnPairlistGpu;
 struct nbnxn_atomdata_t;
diff --git a/src/gromacs/mdlib/nbnxn_gpu_jit_support.h b/src/gromacs/nbnxm/gpu_jit_support.h
similarity index 91%
rename from src/gromacs/mdlib/nbnxn_gpu_jit_support.h
rename to src/gromacs/nbnxm/gpu_jit_support.h
index 1771128980..64a0d08ab6 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_jit_support.h
+++ b/src/gromacs/nbnxm/gpu_jit_support.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,12 +39,13 @@
  *  \author Mark Abraham <mark.j.abraham@gmail.com>
  */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_JIT_SUPPORT_H
-#define GMX_MDLIB_NBNXN_GPU_JIT_SUPPORT_H
+#ifndef GMX_NBNXM_GPU_JIT_SUPPORT_H
+#define GMX_NBNXM_GPU_JIT_SUPPORT_H
 
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
 #include "gromacs/utility/basedefinitions.h"
 
+#include "gpu_types.h"
+
 /*! \brief Handles any JIT compilation of nbnxn kernels for the selected device */
 OPENCL_FUNC_QUALIFIER void
 nbnxn_gpu_compile_kernels(gmx_nbnxn_gpu_t gmx_unused *nb) OPENCL_FUNC_TERM
diff --git a/src/gromacs/mdlib/nbnxn_gpu_types.h b/src/gromacs/nbnxm/gpu_types.h
similarity index 86%
rename from src/gromacs/mdlib/nbnxn_gpu_types.h
rename to src/gromacs/nbnxm/gpu_types.h
index 7fd43ef70d..a18ca0b56f 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_types.h
+++ b/src/gromacs/nbnxm/gpu_types.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -32,12 +32,19 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+/*! \libinternal \file
+ * \brief Sets gmx_nbnxn_gpu_t to the correct type depending on the build
+ *
+ * \ingroup module_nbnxm
+ */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_TYPES_H
-#define GMX_MDLIB_NBNXN_GPU_TYPES_H
+#ifndef GMX_NBNXN_GPU_TYPES_H
+#define GMX_NBNXN_GPU_TYPES_H
 
 #include "config.h"
 
+#ifndef DOXYGEN
+
 #if GMX_GPU == GMX_GPU_OPENCL
 struct gmx_nbnxn_ocl_t;
 typedef struct gmx_nbnxn_ocl_t gmx_nbnxn_gpu_t;
@@ -52,4 +59,6 @@ typedef struct gmx_nbnxn_cuda_t gmx_nbnxn_gpu_t;
 typedef int gmx_nbnxn_gpu_t;
 #endif
 
+#endif // !DOXYGEN
+
 #endif
diff --git a/src/gromacs/mdlib/nbnxn_gpu_types_common.h b/src/gromacs/nbnxm/gpu_types_common.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_gpu_types_common.h
rename to src/gromacs/nbnxm/gpu_types_common.h
index ab836f8437..78893704bb 100644
--- a/src/gromacs/mdlib/nbnxn_gpu_types_common.h
+++ b/src/gromacs/nbnxm/gpu_types_common.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,7 +36,7 @@
  * \brief Implements common internal types for different NBNXN GPU implementations
  *
  * \author Szilárd Páll <pall.szilard@gmail.com>
- * \ingroup module_mdlib
+ * \ingroup module_nbnxm
  */
 
 #ifndef GMX_MDLIB_NBNXN_GPU_COMMON_TYPES_H
@@ -44,7 +44,7 @@
 
 #include "config.h"
 
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/pairlist.h"
 
 #if GMX_GPU == GMX_GPU_OPENCL
 #include "gromacs/gpu_utils/gpuregiontimer_ocl.h"
diff --git a/src/gromacs/mdlib/nbnxn_grid.cpp b/src/gromacs/nbnxm/grid.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_grid.cpp
rename to src/gromacs/nbnxm/grid.cpp
index a0b587523c..0bc41c0f24 100644
--- a/src/gromacs/mdlib/nbnxn_grid.cpp
+++ b/src/gromacs/nbnxm/grid.cpp
@@ -35,8 +35,6 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_grid.h"
-
 #include <cmath>
 #include <cstring>
 
@@ -46,19 +44,18 @@
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_atomdata.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_internal.h"
-#include "gromacs/mdlib/nbnxn_search.h"
-#include "gromacs/mdlib/nbnxn_util.h"
 #include "gromacs/mdlib/updategroupscog.h"
 #include "gromacs/mdtypes/forcerec.h" // only for GET_CGINFO_*
+#include "gromacs/nbnxm/atomdata.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_geometry.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/vector_operations.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "internal.h"
+
 struct gmx_domdec_zones_t;
 
 static real grid_atom_density(int        numAtoms,
diff --git a/src/gromacs/mdlib/nbnxn_internal.h b/src/gromacs/nbnxm/internal.h
similarity index 96%
rename from src/gromacs/mdlib/nbnxn_internal.h
rename to src/gromacs/nbnxm/internal.h
index 7ea0ef061d..e00e52eab8 100644
--- a/src/gromacs/mdlib/nbnxn_internal.h
+++ b/src/gromacs/nbnxm/internal.h
@@ -33,15 +33,24 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _nbnxn_internal_h
-#define _nbnxn_internal_h
+/*! \internal \file
+ *
+ * \brief Declares internal nbnxm module details
+ *
+ * \author Berk Hess <hess@kth.se>
+ *
+ * \ingroup module_nbnxm
+ */
+
+#ifndef GMX_NBNXM_INTERNAL_H
+#define GMX_NBNXM_INTERNAL_H
 
 #include <memory>
 #include <vector>
 
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/timing/cyclecounter.h"
 #include "gromacs/utility/alignedallocator.h"
@@ -51,6 +60,9 @@
 struct gmx_domdec_zones_t;
 
 
+// TODO Document after refactoring
+#ifndef DOXYGEN
+
 /* Strides for x/f with xyz and xyzq coordinate (and charge) storage */
 #define STRIDE_XYZ         3
 #define STRIDE_XYZQ        4
@@ -133,7 +145,10 @@ template<int packSize> static inline int atom_to_x_index(int a)
 
 #endif /* NBNXN_SEARCH_BB_SIMD4 */
 
+#endif // !DOXYGEN
 
+
+/*! \brief Convenience declaration for an std::vector with aligned memory */
 template <class T>
 using AlignedVector = std::vector < T, gmx::AlignedAllocator < T>>;
 
@@ -367,16 +382,17 @@ struct nbnxn_search
 };
 
 
+/*! \brief Start an nbnxn cycle counter */
 static inline void nbs_cycle_start(nbnxn_cycle_t *cc)
 {
     cc->start = gmx_cycles_read();
 }
 
+/*! \brief Stop an nbnxn cycle counter */
 static inline void nbs_cycle_stop(nbnxn_cycle_t *cc)
 {
     cc->c += gmx_cycles_read() - cc->start;
     cc->count++;
 }
 
-
 #endif
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.cpp b/src/gromacs/nbnxm/kernel_common.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.cpp
rename to src/gromacs/nbnxm/kernel_common.cpp
index b4a3f1327f..5f2442b774 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.cpp
+++ b/src/gromacs/nbnxm/kernel_common.cpp
@@ -34,7 +34,7 @@
  */
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_common.h"
+#include "kernel_common.h"
 
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/utility/gmxassert.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h b/src/gromacs/nbnxm/kernel_common.h
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h
rename to src/gromacs/nbnxm/kernel_common.h
index 430ff644d5..035457f250 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h
+++ b/src/gromacs/nbnxm/kernel_common.h
@@ -36,18 +36,18 @@
 /*! \internal \file
  *
  * \brief
- * Declares the nbnxn pair interaction kernel function types and kind counts, also declares utility functions used in nbnxn_kernel.cpp.
+ * Declares the nbnxm pair interaction kernel function types and kind counts, also declares utility functions used in nbnxm_kernel.cpp.
  *
  * \author Berk Hess <hess@kth.se>
  */
 
-#ifndef _nbnxn_kernel_common_h
-#define _nbnxn_kernel_common_h
+#ifndef GMX_NBXNM_KERNEL_COMMON_H
+#define GMX_NBXNM_KERNEL_COMMON_H
 
 #include "gromacs/math/vectypes.h"
 /* nbnxn_atomdata_t and nbnxn_pairlist_t could be forward declared, but that requires modifications in all SIMD kernel files */
-#include "gromacs/mdlib/nbnxn_atomdata.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/atomdata.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/real.h"
 
 struct interaction_const_t;
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.cpp.pre b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_2xmm_kernel.cpp.pre
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.cpp.pre
rename to src/gromacs/nbnxm/kernel_file_generator/kernel_simd_2xmm_kernel.cpp.pre
index 96c1e825e8..69078659f0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.cpp.pre
+++ b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_2xmm_kernel.cpp.pre
@@ -40,8 +40,8 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE {7}
 #include "{4}"
@@ -51,7 +51,7 @@
 {3}
 
 #ifdef {0}
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* {0} */
 
 #ifdef CALC_ENERGIES
@@ -74,7 +74,7 @@ void
 {6}real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef {0}
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* {0} */
 {{
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.cpp.pre b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_4xm_kernel.cpp.pre
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.cpp.pre
rename to src/gromacs/nbnxm/kernel_file_generator/kernel_simd_4xm_kernel.cpp.pre
index 2786209a14..d634ad4e58 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.cpp.pre
+++ b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_4xm_kernel.cpp.pre
@@ -40,8 +40,8 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE {7}
 #include "{4}"
@@ -51,7 +51,7 @@
 {3}
 
 #ifdef {0}
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* {0} */
 
 #ifdef CALC_ENERGIES
@@ -74,7 +74,7 @@ void
 {6}real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef {0}
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* {0} */
 {{
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_template.h.pre
similarity index 85%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre
rename to src/gromacs/nbnxm/kernel_file_generator/kernel_simd_template.h.pre
index eab6de081b..b758ccd0d3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre
+++ b/src/gromacs/nbnxm/kernel_file_generator/kernel_simd_template.h.pre
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -33,7 +33,7 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h"
+#include "gromacs/nbnxm/kernel_common.h"
 
 /* Declare all the different kernel functions.
  */
@@ -45,11 +45,11 @@
  * The minor index of the array goes over both the LJ combination rules,
  * which is only supported by plain cut-off, and the LJ switch/PME functions.
  */
-p_nbk_func_noener nbnxn_kernel_noener_simd_{1}[coulktNR][vdwktNR] =
+p_nbk_func_noener nbnxm_kernel_noener_simd_{1}[coulktNR][vdwktNR] =
 {2}
-p_nbk_func_ener nbnxn_kernel_ener_simd_{1}[coulktNR][vdwktNR] =
+p_nbk_func_ener nbnxm_kernel_ener_simd_{1}[coulktNR][vdwktNR] =
 {3}
-p_nbk_func_ener nbnxn_kernel_energrp_simd_{1}[coulktNR][vdwktNR] =
+p_nbk_func_ener nbnxm_kernel_energrp_simd_{1}[coulktNR][vdwktNR] =
 {4}
 
 #endif /* INCLUDE_KERNELFUNCTION_TABLES */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py b/src/gromacs/nbnxm/kernel_file_generator/make_verlet_simd_kernel_files.py
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py
rename to src/gromacs/nbnxm/kernel_file_generator/make_verlet_simd_kernel_files.py
index 411b5d3cac..d57aa11b75 100755
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py
+++ b/src/gromacs/nbnxm/kernel_file_generator/make_verlet_simd_kernel_files.py
@@ -36,7 +36,7 @@
 # This script is used by the GROMACS developers to build most of the
 # files from which the nbnxn kernels are compiled. It is not called at
 # CMake time, and users should never need to use it. It currently
-# works for nbnxn kernel structure types 2xnn and 4xn. The generated
+# works for nbnxn kernel structure types 2xMM and 4xM. The generated
 # files are versions of the *.pre files in this directory, customized
 # for the kernel structure type and/or the detailed kernel type. These
 # are:
@@ -50,9 +50,9 @@
 #   parallelism.
 #
 # This script should be run from the directory in which it is
-# located. The generated files are located in ../simd_<type>. There
-# are three other files in those locations that are not generated. These
-# contain:
+# located. The generated files are located in ../kernels_simd_<type>.
+# There are three other files in those locations that are not generated.
+# These contain:
 #
 #   setup logic peculiar to the kernel structure type but common to
 #   all the kernels within that type, and
@@ -73,7 +73,7 @@ import sys
 import os
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 import collections # Requires Python 2.7
-sys.path.append('../../../../../admin')
+sys.path.append('../../../../admin')
 from copyright import create_copyright_header
 
 FileHeader = create_copyright_header('2012,2013,2014,2015,2019')
@@ -94,7 +94,7 @@ def read_kernel_template(filename):
     return TemplateText
 
 # The dict order must match the order of an enumeration in
-# nbnxn_kernel_simd_template.c.pre
+# kernel_simd_template.c.pre
 ElectrostaticsDict = collections.OrderedDict()
 ElectrostaticsDict['ElecRF'] = { 'define' : '#define CALC_COUL_RF' }
 ElectrostaticsDict['ElecQSTab'] = { 'define' : '#define CALC_COUL_TAB' }
@@ -129,7 +129,7 @@ EnergiesComputationDict = {
 
 # This is OK as an unordered dict
 VerletKernelTypeDict = {
-    '2xnn' : {
+    '2xmm' : {
         'Define' : 'GMX_NBNXN_SIMD_2XNN',
         'WidthSetup' : '/* Include the full-width SIMD macros */\n',
         'WidthCheck' : ('#if !(GMX_SIMD_REAL_WIDTH == 8 || GMX_SIMD_REAL_WIDTH == 16)\n' \
@@ -137,7 +137,7 @@ VerletKernelTypeDict = {
                         '#endif\n'),
         'UnrollSize' : 2,
     },
-    '4xn' : {
+    '4xm' : {
         'Define' : 'GMX_NBNXN_SIMD_4XN',
         'WidthSetup' : (''),
         'WidthCheck' : ('#if !(GMX_SIMD_REAL_WIDTH == 2 || GMX_SIMD_REAL_WIDTH == 4 || GMX_SIMD_REAL_WIDTH == 8)\n' \
@@ -147,21 +147,23 @@ VerletKernelTypeDict = {
     },
 }
 
-KernelsHeaderTemplate = read_kernel_template("nbnxn_kernel_simd_template.h.pre")
+KernelsHeaderTemplate = read_kernel_template("kernel_simd_template.h.pre")
 
 # For each Verlet kernel type, write two kinds of files:
 #   a header file defining the functions for all the kernels and
 #     the kernel function lookup table
 #   for each kernel, a file defining the single C function for that kernel
 for type in VerletKernelTypeDict:
-    DirName = "../simd_{0}".format(type)
-    KernelNamePrefix = 'nbnxn_kernel'
+    DirName = "../kernels_simd_{0}".format(type)
+    KernelNamePrefix = 'nbnxm_kernel'
+    KernelFileNamePrefix = 'kernel'
     KernelsName = "{0}_simd_{1}".format(KernelNamePrefix,type)
-    KernelsHeaderFileName = "{0}.h".format(KernelsName,type)
-    KernelsHeaderPathName = "gromacs/mdlib/nbnxn_kernels/simd_{0}/{1}".format(type,KernelsHeaderFileName)
+    KernelsFileName = "{0}_simd_{1}".format(KernelFileNamePrefix,type)
+    KernelsHeaderFileName = "kernels.h"
+    KernelsHeaderPathName = "gromacs/nbnxm/kernels_simd_{0}/{1}".format(type,KernelsHeaderFileName)
     KernelFunctionLookupTable = {}
     KernelDeclarations = ''
-    KernelTemplate = read_kernel_template("{0}_kernel.cpp.pre".format(KernelsName))
+    KernelTemplate = read_kernel_template("{0}_kernel.cpp.pre".format(KernelsFileName))
 
     # Loop over all kernels
     for ener in EnergiesComputationDict:
@@ -171,6 +173,8 @@ for type in VerletKernelTypeDict:
             for ljtreat in VdwTreatmentDict:
                 KernelName = ('{0}_{1}_{2}_{3}_{4}'
                               .format(KernelNamePrefix,elec,ljtreat,ener,type))
+                KernelFileName = ('{0}_{1}_{2}_{3}'
+                                  .format(KernelFileNamePrefix,elec,ljtreat,ener,type))
 
                 # Declare the kernel function
                 KernelDeclarations += ('{1:21} {0};\n'
@@ -178,7 +182,7 @@ for type in VerletKernelTypeDict:
                                                EnergiesComputationDict[ener]['function type']))
 
                 # Write the file with the kernel definition
-                with open('{0}/{1}.cpp'.format(DirName,KernelName), 'w') as kernelfp:
+                with open('{0}/{1}.cpp'.format(DirName,KernelFileName), 'w') as kernelfp:
                     kernelfp.write(FileHeader.format(type))
                     kernelfp.write(KernelTemplate
                                    .format(VerletKernelTypeDict[type]['Define'],
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp b/src/gromacs/nbnxm/kerneldispatch.cpp
similarity index 95%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp
rename to src/gromacs/nbnxm/kerneldispatch.cpp
index 3f47f2d0b7..04a79159a8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp
+++ b/src/gromacs/nbnxm/kerneldispatch.cpp
@@ -35,28 +35,27 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_cpu.h"
+#include "kerneldispatch.h"
 
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/force_flags.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/real.h"
 
-#include "nbnxn_kernel_common.h"
+#include "kernel_common.h"
 #define INCLUDE_KERNELFUNCTION_TABLES
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref.h"
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 #endif
 #undef INCLUDE_FUNCTION_TABLES
 
@@ -254,7 +253,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
                     break;
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
-                    nbnxn_kernel_noener_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_noener_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                  ic,
                                                                  shiftVectors,
                                                                  out->f.data(),
@@ -263,7 +262,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
-                    nbnxn_kernel_noener_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_noener_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                                 ic,
                                                                 shiftVectors,
                                                                 out->f.data(),
@@ -293,7 +292,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
                     break;
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
-                    nbnxn_kernel_ener_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_ener_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                ic,
                                                                shiftVectors,
                                                                out->f.data(),
@@ -304,7 +303,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
-                    nbnxn_kernel_ener_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_ener_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                               ic,
                                                               shiftVectors,
                                                               out->f.data(),
@@ -339,7 +338,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
                     unrollj = GMX_SIMD_REAL_WIDTH/2;
-                    nbnxn_kernel_energrp_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_energrp_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                   ic,
                                                                   shiftVectors,
                                                                   out->f.data(),
@@ -351,7 +350,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
                     unrollj = GMX_SIMD_REAL_WIDTH;
-                    nbnxn_kernel_energrp_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_energrp_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                                  ic,
                                                                  shiftVectors,
                                                                  out->f.data(),
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.h b/src/gromacs/nbnxm/kerneldispatch.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.h
rename to src/gromacs/nbnxm/kerneldispatch.h
index 389f5e6daa..39d4bf15c4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.h
+++ b/src/gromacs/nbnxm/kerneldispatch.h
@@ -41,8 +41,8 @@
  * \author Berk Hess <hess@kth.se>
  */
 
-#ifndef _nbnxn_kernel_cpu_h
-#define _nbnxn_kernel_cpu_h
+#ifndef GMX_NBNXN_KERNEL_DISPATCH_H
+#define GMX_NBNXN_KERNEL_DISPATCH_H
 
 #include "gromacs/math/vectypes.h"
 #include "gromacs/utility/real.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.cpp b/src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.cpp
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.cpp
rename to src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.cpp
index 43313db602..c68b7b2fac 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.cpp
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.cpp
@@ -34,9 +34,7 @@
  */
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_gpu_ref.h"
-
-#include "config.h"
+#include "kernel_gpu_ref.h"
 
 #include <cmath>
 
@@ -46,14 +44,12 @@
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/kernel_common.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/utility/fatalerror.h"
 
-#include "nbnxn_kernel_common.h"
-
 static const int c_numClPerSupercl = c_nbnxnGpuNumClusterPerSupercluster;
 static const int c_clSize          = c_nbnxnGpuClusterSize;
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.h b/src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.h
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.h
index 7a5a1cff26..9e744cde07 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.h
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_gpu_ref.h
@@ -37,11 +37,13 @@
 #define _nbnxn_kernel_gpu_ref_h
 
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
 #include "gromacs/mdtypes/forcerec.h"
 #include "gromacs/utility/arrayref.h"
 #include "gromacs/utility/real.h"
 
+struct NbnxnPairlistGpu;
+struct nbnxn_atomdata_t;
+
 /* Reference (slow) kernel for nb n vs n GPU type pair lists */
 void
 nbnxn_kernel_gpu_ref(const NbnxnPairlistGpu     *nbl,
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.cpp b/src/gromacs/nbnxm/kernels_reference/kernel_ref.cpp
similarity index 71%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.cpp
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref.cpp
index f267e71bf6..e953f51e9e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.cpp
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_ref.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -34,9 +34,7 @@
  */
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_ref.h"
-
-#include "config.h"
+#include "kernel_ref.h"
 
 #include <cassert>
 #include <cmath>
@@ -46,33 +44,31 @@
 #include "gromacs/math/functions.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
-
 /* Analytical reaction-field kernels */
 #define CALC_COUL_RF
 #define LJ_CUT
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_CUT
 #define LJ_FORCE_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_FORCE_SWITCH
 #define LJ_POT_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_POT_SWITCH
 #define LJ_EWALD
 #define LJ_CUT
 #define LJ_EWALD_COMB_GEOM
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_GEOM
 #define LJ_EWALD_COMB_LB
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_LB
 #undef LJ_CUT
 #undef LJ_EWALD
@@ -82,42 +78,42 @@
 /* Tabulated exclusion interaction electrostatics kernels */
 #define CALC_COUL_TAB
 #define LJ_CUT
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_CUT
 #define LJ_FORCE_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_FORCE_SWITCH
 #define LJ_POT_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_POT_SWITCH
 #define LJ_EWALD
 #define LJ_CUT
 #define LJ_EWALD_COMB_GEOM
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_GEOM
 #define LJ_EWALD_COMB_LB
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_LB
 #undef LJ_CUT
 #undef LJ_EWALD
 /* Twin-range cut-off kernels */
 #define VDW_CUTOFF_CHECK
 #define LJ_CUT
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_CUT
 #define LJ_FORCE_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_FORCE_SWITCH
 #define LJ_POT_SWITCH
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_POT_SWITCH
 #define LJ_EWALD
 #define LJ_CUT
 #define LJ_EWALD_COMB_GEOM
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_GEOM
 #define LJ_EWALD_COMB_LB
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_includes.h"
 #undef LJ_EWALD_COMB_LB
 #undef LJ_CUT
 #undef LJ_EWALD
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.h b/src/gromacs/nbnxm/kernels_reference/kernel_ref.h
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref.h
index 77befc50a2..1fa3848da1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.h
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_ref.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -33,7 +33,7 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#include "nbnxn_kernel_common.h"
+#include "gromacs/nbnxm/kernel_common.h"
 
 /* Declare all the different kernel functions.
  */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h b/src/gromacs/nbnxm/kernels_reference/kernel_ref_includes.h
similarity index 88%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref_includes.h
index 099a9079a4..e85d399a6c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_includes.h
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_ref_includes.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,16 +39,16 @@
  */
 
 /* Include the force only kernels */
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_outer.h"
 
 /* Include the force+energy kernels */
 #define CALC_ENERGIES
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_outer.h"
 #undef CALC_ENERGIES
 
 /* Include the force+energygroups kernels */
 #define CALC_ENERGIES
 #define ENERGY_GROUPS
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_outer.h"
 #undef ENERGY_GROUPS
 #undef CALC_ENERGIES
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h b/src/gromacs/nbnxm/kernels_reference/kernel_ref_inner.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref_inner.h
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h b/src/gromacs/nbnxm/kernels_reference/kernel_ref_outer.h
similarity index 96%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref_outer.h
index b50a45d9c0..a929f96bf0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_ref_outer.h
@@ -323,19 +323,19 @@ NBK_FUNC_NAME(_VgrpF) // NOLINT(misc-definitions-in-headers)
             {
 #define CALC_COULOMB
 #define HALF_LJ
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
 #undef HALF_LJ
 #undef CALC_COULOMB
             }
             else if (do_coul)
             {
 #define CALC_COULOMB
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
 #undef CALC_COULOMB
             }
             else
             {
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
             }
 #undef CHECK_EXCLS
             cjind++;
@@ -347,19 +347,19 @@ NBK_FUNC_NAME(_VgrpF) // NOLINT(misc-definitions-in-headers)
             {
 #define CALC_COULOMB
 #define HALF_LJ
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
 #undef HALF_LJ
 #undef CALC_COULOMB
             }
             else if (do_coul)
             {
 #define CALC_COULOMB
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
 #undef CALC_COULOMB
             }
             else
             {
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_inner.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref_inner.h"
             }
         }
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.cpp b/src/gromacs/nbnxm/kernels_reference/kernel_ref_prune.cpp
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.cpp
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref_prune.cpp
index 45b5eda20a..65a8a2d87b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.cpp
+++ b/src/gromacs/nbnxm/kernels_reference/kernel_ref_prune.cpp
@@ -35,13 +35,11 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_ref_prune.h"
+#include "kernel_ref_prune.h"
 
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/gmxassert.h"
 
-
 /* Prune a single NbnxnPairlistCpu entry with distance rlistInner */
 void
 nbnxn_kernel_prune_ref(NbnxnPairlistCpu *         nbl,
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.h b/src/gromacs/nbnxm/kernels_reference/kernel_ref_prune.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_prune.h
rename to src/gromacs/nbnxm/kernels_reference/kernel_ref_prune.h
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
index dd1a187bce..fd9e9972cf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
index 58e2c4f9be..29ea5963c2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
index 29ada8ac23..628eaeec75 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
index 4ce8011cac..e53f368082 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
index 5d65390003..73ad3d5d67 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
index 57644576a7..baa944f67a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
index cc9cf92a0e..3b6b1beb17 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
index aa5d8d393f..9a05961ff1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
index c2bd06803c..0e1f187f92 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -60,12 +60,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -75,7 +75,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -83,7 +83,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
index 9ed5b8d26a..ac5d9c8a9f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
index 320a6aaafb..9f2e0cb546 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
index 0a47eeff3e..491b7bb6a1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
index 6051b50011..9709f8ec3e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
index 2ba8f90aaa..da33c79e75 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
index a98934c58a..b9156db0b7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
index 61c5c51efb..269ee05b94 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
index af5d6f3367..4a09e730c6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
index a851ab569c..15ac5808ff 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_F.cpp
index 2af7841e44..d6dff6ef16 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
index 2bab57560b..8af4c0652b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
index 7e3dd8ca6a..2d0acc2fac 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_F.cpp
index fe92831245..8f7b9992be 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VF.cpp
index 7b52a2c50f..18b8ee2b20 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
index cfbbd559f4..42feb672c8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
index ec72823afa..8ab8b19f73 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
index ab83c57972..22e386d313 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
index 02f465e4e8..567bd1b18d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_F.cpp
index 43cadb5261..ef0fbff8a5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VF.cpp
index ef960e4082..0d9098c518 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
index 2b23e5d080..ae44b66b4d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_F.cpp
index e08309d2a3..752ac99853 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VF.cpp
index cb9b45ee34..09a83547d6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
index 204ca9f08e..e53ec4cda1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_F.cpp
index b441cc86b0..33ada3d4b2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VF.cpp
index 2ff900f9ee..7001837bb6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                   const interaction_const_t gmx_unused *ic,
                                   rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                   const interaction_const_t gmx_unused *ic,
                                   rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VgrpF.cpp
index 6c1485720c..8432d3287b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecEw_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
index 1d4a1fc7a5..aa03364cdb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
index 4a37fe8eca..726797ae80 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
index 5cffddb30d..cb096a16da 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                                        const interaction_const_t gmx_unused *ic,
                                                        rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                                        const interaction_const_t gmx_unused *ic,
                                                        rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
index 6135b976aa..5224475af7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
index aa092a4311..6790788ec9 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
index 5aee623b9d..683bf26460 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
index fc4c259df1..b465a24b8e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
index 11a05d6c25..10ec39804b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
index 00b979864a..3be8e6910f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -60,12 +60,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                                          const interaction_const_t gmx_unused *ic,
                                                          rvec                      gmx_unused *shift_vec,
@@ -75,7 +75,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                                          const interaction_const_t gmx_unused *ic,
                                                          rvec                      gmx_unused *shift_vec,
@@ -83,7 +83,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu
                                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
index d3006d04dd..ceb6f328ca 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
index 642c3e4b50..ffcb429399 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
index ff6e160e13..34bc49bebf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
index c21dd62f3e..e423443dcb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
index 2f8ec63e09..25efe431af 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
index aa68ca5725..0704bd86bf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
index 08255fa866..90ae868f6f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
index f2d42ac0c0..e87dcc72f9 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
index 1545776ec5..091c6dd390 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
index 86a69f388a..c8a2d77518 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
index 9377660eb1..1db769d82e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
index 39d54a048d..ff397a69e7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
index c840a375ba..df2ec98005 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
index a5fc775781..70f88f37c1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
index 2905e5770a..69a713b70b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
index c3b1db3766..88f3805644 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
index c3940fca0d..57dbe74a65 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
index 67723dce7f..67e3f9c863 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_F.cpp
index 4ab0ab04db..42d1f72dfa 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
index e912b42741..a49ab1f8ff 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
index b51ec9dea5..102d2a02ce 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_F.cpp
index 67c43d6f44..34d993d9bf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
index 438aedd180..df5fc2c716 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
index 4cc4005f40..9bd018f003 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_F.cpp
index 14bb6b9541..2ac3d4be86 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VF.cpp
index 3dce0d795e..bc005dfb0b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
index 1353281499..5ee8e13c9c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_F.cpp
index 6a87128b01..d28a4ca74d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
index 25e0e44dbb..b2a22d63b4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
index dbe6ff9725..9b972dfd6e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_F.cpp
index e604a8f4f9..24f66d03d5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VF.cpp
index fade8d3733..be185ef970 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
index 28e86be3cc..07a93ee931 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
index c17df753a4..3e53bb4f54 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
index 4b1eaae56a..eb0d13defa 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
index f18044a470..bd46f3a1ee 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_F.cpp
index 44b6d3a0b5..b8faaf6451 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VF.cpp
index c752860f0d..18effbff65 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
index 7f42ab4af8..6e7999e60c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_F.cpp
index d525b31355..b110e7cb75 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VF.cpp
index 48e93a0226..d920f53002 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
index 2e8e26fdd6..961b26c811 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_F.cpp
index da98a6b66a..bdd05edac6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_F_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VF.cpp
index 9ed097cecf..d54132dfa6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                   const interaction_const_t gmx_unused *ic,
                                   rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                   const interaction_const_t gmx_unused *ic,
                                   rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VgrpF.cpp
index ebb84540dd..a3eefa1ef6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_ElecRF_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 2xnn.
+ * kernel type 2xmm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_2XNN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VgrpF_2xmm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                      const interaction_const_t gmx_unused *ic,
                                      rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_2XNN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h
index da326f8a55..d503825654 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h
@@ -32,7 +32,6 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/simd_math.h"
@@ -41,6 +40,8 @@
 #include "gromacs/math/utilities.h"
 #endif
 
+#include "config.h"
+
 #include <cstdint>
 
 #if !GMX_SIMD_HAVE_HSIMD_UTIL_REAL
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h
index 3a289895fb..748e4a980e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_outer.h
@@ -558,13 +558,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
             }
 #undef HALF_LJ
 #undef CALC_COULOMB
@@ -576,13 +576,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
             }
 #undef CALC_COULOMB
         }
@@ -592,13 +592,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_inner.h"
             }
         }
 #undef CALC_LJ
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.cpp b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_prune.cpp
similarity index 96%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.cpp
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_prune.cpp
index daca1cd809..f8816a4fa4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_prune.cpp
@@ -35,15 +35,15 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_simd_2xnn_prune.h"
+#include "kernel_prune.h"
 
-#include "gromacs/mdlib/nbnxn_pairlist.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/gmxassert.h"
 
 #ifdef GMX_NBNXN_SIMD_2XNN
 #define GMX_SIMD_J_UNROLL_SIZE 2
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernel_common.h"
 #endif
 
 /* Prune a single nbnxn_pairtlist_t entry with distance rlistInner */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.h b/src/gromacs/nbnxm/kernels_simd_2xmm/kernel_prune.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_prune.h
rename to src/gromacs/nbnxm/kernels_simd_2xmm/kernel_prune.h
diff --git a/src/gromacs/nbnxm/kernels_simd_2xmm/kernels.h b/src/gromacs/nbnxm/kernels_simd_2xmm/kernels.h
new file mode 100644
index 0000000000..81aa381bf7
--- /dev/null
+++ b/src/gromacs/nbnxm/kernels_simd_2xmm/kernels.h
@@ -0,0 +1,279 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2012,2013,2014,2015,2019, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+/*
+ * Note: this file was generated by the Verlet kernel generator for
+ * kernel type 2xmm.
+ */
+
+
+#include "gromacs/nbnxm/kernel_common.h"
+
+/* Declare all the different kernel functions.
+ */
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJ_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJ_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xmm;
+
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombLB_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJ_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJFSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJPSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJ_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombLB_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJ_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJFSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJPSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xmm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xmm;
+
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJCombLB_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJ_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJFSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJPSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJ_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJFSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJPSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJCombLB_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJ_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJFSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJPSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_2xmm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xmm;
+
+
+
+#ifdef INCLUDE_KERNELFUNCTION_TABLES
+
+/* Declare and define the kernel function pointer lookup tables.
+ * The minor index of the array goes over both the LJ combination rules,
+ * which is only supported by plain cut-off, and the LJ switch/PME functions.
+ */
+p_nbk_func_noener nbnxm_kernel_noener_simd_2xmm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_F_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_F_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJ_F_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_F_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_F_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_F_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_F_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_F_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_F_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_F_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJ_F_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_F_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_F_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xmm,
+    },
+};
+
+p_nbk_func_ener nbnxm_kernel_ener_simd_2xmm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_VF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJ_VF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_VF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_VF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_VF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_VF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJ_VF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_VF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_VF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xmm,
+    },
+};
+
+p_nbk_func_ener nbnxm_kernel_energrp_simd_2xmm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJ_VgrpF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJ_VgrpF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xmm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xmm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xmm,
+    },
+};
+
+
+#endif /* INCLUDE_KERNELFUNCTION_TABLES */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
index 718a0829f6..58ca76f9ce 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
index 620e69f3ed..dfde8917c5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
index b070056b05..4e185486c9 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
index 7a16c3e79c..8eeb566893 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
index bf97fc097a..25e5c3fd7a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
index 002d4762c7..fe0da1bbbd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
index 33a5516d5d..fe0673698c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
index c2383a87f7..06d09d4b65 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
index 814d16da6d..6b3d4a0f47 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -60,12 +60,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -75,7 +75,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -83,7 +83,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
index 46af165ac4..52edb50536 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
index d5305178c2..519838d812 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
index 7addd906d3..ab769cd6f1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
index 8960cda71a..f34817f08a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
index 2f177971a1..334e6729be 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
index f01727568f..c2263a4754 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
index 465705e5fc..973dba7d6f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
index f55b5a40e4..3dd405eaf4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
index 4a287b1f80..c134e4ee61 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEwTwinCut_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_F.cpp
index 877b933fc7..8aca8dc820 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
index 4140318237..5972cb9afb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
index b40088c839..3667542de2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_F.cpp
index 9c28c15654..0d3aaac597 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VF.cpp
index 6278a0a3bf..279e0b6c22 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
index 27af95bdca..8e446d8cfc 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
index 9197c1d098..2f4b65e84e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
index e4525f5bbb..8e94694801 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
index ef47bb4346..16943d6f45 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_F.cpp
index a9acd2fd7b..2c68e5ff76 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VF.cpp
index 0fd036fc64..88816fb5f2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
index bb92905052..f31877fdff 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_F.cpp
index 97028336aa..ac41fe331f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
index 415d25b77a..a348ca16e6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
index c67510c72a..a01023007a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_F.cpp
index 1b7c627852..73c15f425f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                 const interaction_const_t gmx_unused *ic,
                                 rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                 const interaction_const_t gmx_unused *ic,
                                 rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VF.cpp
index dad375568e..f543530e6e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VgrpF.cpp
index 461a447335..8236f9ea56 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
index 07a2313928..0d45eb2350 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                   const nbnxn_atomdata_t    gmx_unused *nbat,
                                                   const interaction_const_t gmx_unused *ic,
                                                   rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_
                                                   real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
index 48b92d90e4..34a0cac93b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                                    const interaction_const_t gmx_unused *ic,
                                                    rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx
                                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
index 42dae0d51c..ddf7ba935c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                                       const interaction_const_t gmx_unused *ic,
                                                       rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu
                                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
index 2c45550355..df2fdbcfd2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                                 const interaction_const_t gmx_unused *ic,
                                                 rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_un
                                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
index 3a8a150023..aa807ce6b0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
index da15b89842..59dc5ee7e2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
index 86857b80e4..e19272236e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                                     const interaction_const_t gmx_unused *ic,
                                                     rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gm
                                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
index 3b31211d9e..39987ed868 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                      const nbnxn_atomdata_t    gmx_unused *nbat,
                                                      const interaction_const_t gmx_unused *ic,
                                                      rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    g
                                                      real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
index 6d710edb72..a56e05ed4a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -60,12 +60,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                                         const interaction_const_t gmx_unused *ic,
                                                         rvec                      gmx_unused *shift_vec,
@@ -75,7 +75,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu
                                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                                         const interaction_const_t gmx_unused *ic,
                                                         rvec                      gmx_unused *shift_vec,
@@ -83,7 +83,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu
                                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
index d42fa34bac..08cae714eb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
index 8f606fe6b0..796fde1da2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
index 632097c18a..295cdf98fd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
index e989026a65..b7172cd6ba 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
index 18e5b35dc0..494eb89e4d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
index 1b3cb3e8d2..f8a430d9cd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
index 14eaa2e6cb..d248826784 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
index 9ce158cbb3..1ce93b791c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
index 9bc0a1dbed..75f2015367 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTabTwinCut_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
index 0283154b0f..87f00f41a2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
index 2d286c25a9..b8b92fa9f5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
index 51f3e562e6..a9016a9f58 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                const nbnxn_atomdata_t    gmx_unused *nbat,
                                                const interaction_const_t gmx_unused *ic,
                                                rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unu
                                                real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
index 65eef8b305..4acdd35203 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
index 69263a1fd1..95139a6e9d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
index e20cf637f4..bc92923a0d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
index 4cf542b008..fdb66599f5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unuse
                                              real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
index 6b6b8c9c60..60e3a91de8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
index 3ba45418c0..aa389c67d4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                                  const interaction_const_t gmx_unused *ic,
                                                  rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_u
                                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_F.cpp
index 0ae4fcd110..27e399578a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
index 3555140a2d..4319c679ae 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
index 45e424a79c..6bd0ce2a61 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_F.cpp
index 711c21fa8c..823b951246 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
index 8a4b70c90f..25e6ee2498 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
index ad717f96e7..05867be649 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_F.cpp
index 8bd49504f6..fecb007ed8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VF.cpp
index 784b9019f5..6062fa0e2b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
index 86ec48cb4c..0f9dd6d18c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecQSTab_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_TAB
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_F.cpp
index 0b8f0726d1..4214a5206a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                         const nbnxn_atomdata_t    gmx_unused *nbat,
                                         const interaction_const_t gmx_unused *ic,
                                         rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nb
                                         real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
index faee8996d3..b9982a051f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                          const nbnxn_atomdata_t    gmx_unused *nbat,
                                          const interaction_const_t gmx_unused *ic,
                                          rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *n
                                          real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
index 9eb0ec5963..2b81b52f49 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                             const nbnxn_atomdata_t    gmx_unused *nbat,
                                             const interaction_const_t gmx_unused *ic,
                                             rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused
                                             real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_F.cpp
index b948ade5a6..e53afc610d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       const nbnxn_atomdata_t    gmx_unused *nbat,
                                       const interaction_const_t gmx_unused *ic,
                                       rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                       real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VF.cpp
index 5f21405d1a..3ab3289899 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
index a5f7287d61..887dc6c20b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJCombLB_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
index a6c3ffbe22..c7f0a45e09 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                           const nbnxn_atomdata_t    gmx_unused *nbat,
                                           const interaction_const_t gmx_unused *ic,
                                           rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn(const NbnxnPairlistCpu    gmx_unused *
                                           real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
index 24e53a873e..1773741e5e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                            const nbnxn_atomdata_t    gmx_unused *nbat,
                                            const interaction_const_t gmx_unused *ic,
                                            rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn(const NbnxnPairlistCpu    gmx_unused
                                            real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
index a9797ce944..77f95a9671 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJEwCombGeom_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -59,12 +59,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -74,7 +74,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                               const nbnxn_atomdata_t    gmx_unused *nbat,
                                               const interaction_const_t gmx_unused *ic,
                                               rvec                      gmx_unused *shift_vec,
@@ -82,7 +82,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unus
                                               real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_F.cpp
index b06ee570a8..b1af85e25f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VF.cpp
index adf65c6768..3d32f12e1b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
index 2c1ac39325..80f1bcc5d8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJFSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_FORCE_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_F.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_F.cpp
index 125afe8031..c703faf8a1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    const nbnxn_atomdata_t    gmx_unused *nbat,
                                    const interaction_const_t gmx_unused *ic,
                                    rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                    real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VF.cpp
index 681a8ad15e..6f3ae63586 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
index bb37ca1eec..489f4ed122 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJPSw_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_POT_SWITCH
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                        const nbnxn_atomdata_t    gmx_unused *nbat,
                                        const interaction_const_t gmx_unused *ic,
                                        rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl
                                        real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_F.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_F.cpp
index 79aeab798d..7e03434267 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_F.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 /* Will not calculate energies */
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                 const interaction_const_t gmx_unused *ic,
                                 rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_F_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 const nbnxn_atomdata_t    gmx_unused *nbat,
                                 const interaction_const_t gmx_unused *ic,
                                 rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                 real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VF.cpp
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VF.cpp
index e23a63f5af..b55a7fb167 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  const nbnxn_atomdata_t    gmx_unused *nbat,
                                  const interaction_const_t gmx_unused *ic,
                                  rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                  real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VgrpF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VgrpF.cpp
index 52cbb43fa0..a6890df3ac 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecRF_VdwLJ_VgrpF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_RF
 #define LJ_CUT
@@ -58,12 +58,12 @@
 #define ENERGY_GROUPS
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -73,7 +73,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecRF_VdwLJ_VgrpF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -81,7 +81,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_common.h
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_common.h
index 7ac6e4f62a..364260a6f8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_common.h
@@ -32,7 +32,6 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/simd/simd_math.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h
index df29ca0b56..e52ad7ceed 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h
@@ -600,13 +600,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
             }
 #undef HALF_LJ
 #undef CALC_COULOMB
@@ -618,13 +618,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
             }
 #undef CALC_COULOMB
         }
@@ -634,13 +634,13 @@
 #define CHECK_EXCLS
             while (cjind < cjind1 && nbl->cj[cjind].excl != NBNXN_INTERACTION_MASK_ALL)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
                 cjind++;
             }
 #undef CHECK_EXCLS
             for (; (cjind < cjind1); cjind++)
             {
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_inner.h"
             }
         }
 #undef CALC_LJ
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_prune.cpp
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_prune.cpp
index e7f829c47b..f563056597 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_prune.cpp
@@ -35,15 +35,15 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_simd_4xn_prune.h"
+#include "kernel_prune.h"
 
-#include "gromacs/mdlib/nbnxn_pairlist.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/gmxassert.h"
 
 #ifdef GMX_NBNXN_SIMD_4XN
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif
 
 /* Prune a single nbnxn_pairtlist_t entry with distance rlistInner */
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.h b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_prune.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_prune.h
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_prune.h
diff --git a/src/gromacs/nbnxm/kernels_simd_4xm/kernels.h b/src/gromacs/nbnxm/kernels_simd_4xm/kernels.h
new file mode 100644
index 0000000000..6a22a40cb7
--- /dev/null
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernels.h
@@ -0,0 +1,279 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2012,2013,2014,2015,2019, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+/*
+ * Note: this file was generated by the Verlet kernel generator for
+ * kernel type 4xm.
+ */
+
+
+#include "gromacs/nbnxm/kernel_common.h"
+
+/* Declare all the different kernel functions.
+ */
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJ_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJ_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xm;
+
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJCombLB_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJ_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJFSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJPSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJ_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJCombLB_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJ_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJFSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xm;
+nbk_func_ener         nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xm;
+
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJCombLB_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJ_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJFSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJPSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJ_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJFSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJPSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJCombLB_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJ_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJFSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJPSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_4xm;
+nbk_func_noener       nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xm;
+
+
+
+#ifdef INCLUDE_KERNELFUNCTION_TABLES
+
+/* Declare and define the kernel function pointer lookup tables.
+ * The minor index of the array goes over both the LJ combination rules,
+ * which is only supported by plain cut-off, and the LJ switch/PME functions.
+ */
+p_nbk_func_noener nbnxm_kernel_noener_simd_4xm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_F_4xm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_F_4xm,
+        nbnxm_kernel_ElecRF_VdwLJ_F_4xm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_F_4xm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_F_4xm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_F_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_F_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_F_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_F_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_F_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_F_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_F_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_F_4xm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_F_4xm,
+        nbnxm_kernel_ElecEw_VdwLJ_F_4xm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_F_4xm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_F_4xm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_F_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_F_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_F_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_F_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xm,
+    },
+};
+
+p_nbk_func_ener nbnxm_kernel_ener_simd_4xm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_VF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_VF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJ_VF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_VF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_VF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_VF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_VF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_VF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_VF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_VF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_VF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJ_VF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_VF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_VF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xm,
+    },
+};
+
+p_nbk_func_ener nbnxm_kernel_energrp_simd_4xm[coulktNR][vdwktNR] =
+{
+    {
+        nbnxm_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJCombLB_VgrpF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJ_VgrpF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJFSw_VgrpF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJPSw_VgrpF_4xm,
+        nbnxm_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJ_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xm,
+        nbnxm_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJCombLB_VgrpF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJ_VgrpF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJFSw_VgrpF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJPSw_VgrpF_4xm,
+        nbnxm_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xm,
+    },
+    {
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xm,
+        nbnxm_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xm,
+    },
+};
+
+
+#endif /* INCLUDE_KERNELFUNCTION_TABLES */
diff --git a/src/gromacs/mdlib/nb_verlet.h b/src/gromacs/nbnxm/nbnxm.h
similarity index 64%
rename from src/gromacs/mdlib/nb_verlet.h
rename to src/gromacs/nbnxm/nbnxm.h
index 5b7b4d4cfe..6f7ccd727e 100644
--- a/src/gromacs/mdlib/nb_verlet.h
+++ b/src/gromacs/nbnxm/nbnxm.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,7 +36,7 @@
 // FIXME: remove the "__" prefix in front of the group def when we move the
 //        nonbonded code into separate dir.
 
-/*! \libinternal \defgroup __module_nb_verlet Short-range non-bonded interaction module
+/*! \libinternal \defgroup __module_nbnxm Short-range non-bonded interaction module
  * \ingroup group_mdrun
  *
  * \brief Computes forces and energies for short-range pair-interactions
@@ -51,7 +51,7 @@
  * for GPU pair-list setup interaction kernel.
  *
  * The implementation of the kernels is based on the cluster non-bonded algorithm
- * which in the code is referred to as the NxN algorithms ("nbnxn_" prefix);
+ * which in the code is referred to as the NxM algorithms ("nbnxm_" prefix);
  * for details of the algorithm see DOI:10.1016/j.cpc.2013.06.003.
  *
  * Algorithmically, the non-bonded computation has two different modes:
@@ -82,26 +82,47 @@
 
 /*! \libinternal \file
  *
- * \brief This file contains the public interface of the non-bonded Verlet module
- * that implements the NxN cluster non-bonded algorithm to efficiently compute
- * pair forces.
+ * \brief This file contains the public interface of the nbnxm module
+ * that implements the NxM atom cluster non-bonded algorithm to efficiently
+ * compute pair forces.
  *
  *
  * \author Berk Hess <hess@kth.se>
  * \author Szilárd Páll <pall.szilard@gmail.com>
  *
  * \inlibraryapi
- * \ingroup __module_nb_verlet
+ * \ingroup __module_nbnxm
  */
 
 
-#ifndef NB_VERLET_H
-#define NB_VERLET_H
+#ifndef GMX_NBNXM_NBNXM_H
+#define GMX_NBNXM_NBNXM_H
 
 #include <memory>
 
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/math/vectypes.h"
+#include "gromacs/nbnxm/pairlist.h"
+#include "gromacs/nbnxm/pairlistset.h"
+#include "gromacs/utility/arrayref.h"
+#include "gromacs/utility/real.h"
+
+// TODO: Remove these includes
+#include "kerneldispatch.h"
+#include "nbnxm_gpu.h"
+
+struct gmx_device_info_t;
+struct gmx_domdec_zones_t;
+struct gmx_hw_info_t;
+struct gmx_mtop_t;
+struct t_commrec;
+struct t_forcerec;
+struct t_inputrec;
+
+namespace gmx
+{
+class MDLogger;
+class UpdateGroupsCog;
+}
 
 //! Help pass GPU-emulation parameters with type safety.
 enum class EmulateGpuNonbonded : bool
@@ -198,8 +219,67 @@ typedef struct nonbonded_verlet_t {
                                                                used for the 8x8x8 GPU kernels    */
 } nonbonded_verlet_t;
 
-/*! \brief Getter for bUseGPU */
-gmx_bool
-usingGpu(nonbonded_verlet_t *nbv);
+/*! \brief Initializes the nbnxn module */
+void init_nb_verlet(const gmx::MDLogger     &mdlog,
+                    nonbonded_verlet_t     **nb_verlet,
+                    gmx_bool                 bFEP_NonBonded,
+                    const t_inputrec        *ir,
+                    const t_forcerec        *fr,
+                    const t_commrec         *cr,
+                    const gmx_hw_info_t     &hardwareInfo,
+                    const gmx_device_info_t *deviceInfo,
+                    const gmx_mtop_t        *mtop,
+                    matrix                   box);
+
+/*! \brief Put the atoms on the pair search grid.
+ *
+ * Only atoms atomStart to atomEnd in x are put on the grid.
+ * The atom_density is used to determine the grid size.
+ * When atomDensity<=0, the density is determined from atomEnd-atomStart and the corners.
+ * With domain decomposition part of the n particles might have migrated,
+ * but have not been removed yet. This count is given by nmoved.
+ * When move[i] < 0 particle i has migrated and will not be put on the grid.
+ * Without domain decomposition move will be NULL.
+ */
+void nbnxn_put_on_grid(nbnxn_search_t                  nbs,
+                       int                             ePBC,
+                       const matrix                    box,
+                       int                             ddZone,
+                       const rvec                      lowerCorner,
+                       const rvec                      upperCorner,
+                       const gmx::UpdateGroupsCog     *updateGroupsCog,
+                       int                             atomStart,
+                       int                             atomEnd,
+                       real                            atomDensity,
+                       const int                      *atinfo,
+                       gmx::ArrayRef<const gmx::RVec>  x,
+                       int                             numAtomsMoved,
+                       const int                      *move,
+                       int                             nb_kernel_type,
+                       nbnxn_atomdata_t               *nbat);
+
+/*! \brief As nbnxn_put_on_grid, but for the non-local atoms
+ *
+ * with domain decomposition. Should be called after calling
+ * nbnxn_search_put_on_grid for the local atoms / home zone.
+ */
+void nbnxn_put_on_grid_nonlocal(nbnxn_search_t                   nbs,
+                                const struct gmx_domdec_zones_t *zones,
+                                const int                       *atinfo,
+                                gmx::ArrayRef<const gmx::RVec>   x,
+                                int                              nb_kernel_type,
+                                nbnxn_atomdata_t                *nbat);
+
+/*! \brief Returns the number of x and y cells in the local grid */
+void nbnxn_get_ncells(nbnxn_search_t nbs, int *ncx, int *ncy);
+
+/*! \brief Returns the order indices of the atoms on the pairlist search grid */
+gmx::ArrayRef<const int> nbnxn_get_atomorder(const nbnxn_search* nbs);
+
+/*! \brief Renumbers the atom indices on the grid to consecutive order */
+void nbnxn_set_atomorder(nbnxn_search_t nbs);
+
+/*! \brief Returns the index position of the atoms on the pairlist search grid */
+gmx::ArrayRef<const int> nbnxn_get_gridindices(const nbnxn_search* nbs);
 
-#endif /* NB_VERLET_H */
+#endif // GMX_NBNXN_NBNXN_H
diff --git a/src/gromacs/mdlib/nbnxn_util.h b/src/gromacs/nbnxm/nbnxm_geometry.cpp
similarity index 78%
rename from src/gromacs/mdlib/nbnxn_util.h
rename to src/gromacs/nbnxm/nbnxm_geometry.cpp
index 1ab116afde..42f22b6f20 100644
--- a/src/gromacs/mdlib/nbnxn_util.h
+++ b/src/gromacs/nbnxm/nbnxm_geometry.cpp
@@ -33,40 +33,16 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef GMX_MDLIB_NBNXN_UTIL_H
-#define GMX_MDLIB_NBNXN_UTIL_H
+#include "gmxpre.h"
 
-#include <cmath>
+#include "nbnxm_geometry.h"
 
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/utility/fatalerror.h"
 
-
-/* Returns the base-2 log of n.
- * Generates a fatal error when n is not an integer power of 2.
- */
-static inline int get_2log(int n)
-{
-    int log2;
-
-    log2 = 0;
-    while ((1 << log2) < n)
-    {
-        log2++;
-    }
-    if ((1 << log2) != n)
-    {
-        gmx_fatal(FARGS, "nbnxn na_c (%d) is not a power of 2", n);
-    }
-
-    return log2;
-}
-
-/* Returns the nbnxn i-cluster size in atoms for the nbnxn kernel type */
-static inline int nbnxn_kernel_to_cluster_i_size(int nb_kernel_type)
+int nbnxn_kernel_to_cluster_i_size(int nb_kernel_type)
 {
     switch (nb_kernel_type)
     {
@@ -88,8 +64,7 @@ static inline int nbnxn_kernel_to_cluster_i_size(int nb_kernel_type)
     return 0;
 }
 
-/* Returns the nbnxn i-cluster size in atoms for the nbnxn kernel type */
-static inline int nbnxn_kernel_to_cluster_j_size(int nb_kernel_type)
+int nbnxn_kernel_to_cluster_j_size(int nb_kernel_type)
 {
     int nbnxn_simd_width = 0;
     int cj_size          = 0;
@@ -119,6 +94,3 @@ static inline int nbnxn_kernel_to_cluster_j_size(int nb_kernel_type)
 
     return cj_size;
 }
-
-
-#endif
diff --git a/src/gromacs/nbnxm/nbnxm_geometry.h b/src/gromacs/nbnxm/nbnxm_geometry.h
new file mode 100644
index 0000000000..250a9e1b3a
--- /dev/null
+++ b/src/gromacs/nbnxm/nbnxm_geometry.h
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+
+#ifndef GMX_NBNXM_NBNXM_GEOMETRY_H
+#define GMX_NBNXM_NBNXM_GEOMETRY_H
+
+#include "gromacs/utility/fatalerror.h"
+
+/* Returns the base-2 log of n.
+ * Generates a fatal error when n is not an integer power of 2.
+ */
+static inline int get_2log(int n)
+{
+    int log2;
+
+    log2 = 0;
+    while ((1 << log2) < n)
+    {
+        log2++;
+    }
+    if ((1 << log2) != n)
+    {
+        gmx_fatal(FARGS, "nbnxn na_c (%d) is not a power of 2", n);
+    }
+
+    return log2;
+}
+
+/* Returns the nbnxn i-cluster size in atoms for the nbnxn kernel type */
+int nbnxn_kernel_to_cluster_i_size(int nb_kernel_type);
+
+/* Returns the nbnxn i-cluster size in atoms for the nbnxn kernel type */
+int nbnxn_kernel_to_cluster_j_size(int nb_kernel_type);
+
+#endif
diff --git a/src/gromacs/mdlib/nbnxn_gpu.h b/src/gromacs/nbnxm/nbnxm_gpu.h
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_gpu.h
rename to src/gromacs/nbnxm/nbnxm_gpu.h
index b23347b6c5..6aa7c21752 100644
--- a/src/gromacs/mdlib/nbnxn_gpu.h
+++ b/src/gromacs/nbnxm/nbnxm_gpu.h
@@ -32,23 +32,24 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-/*! \internal \file
+/*! \libinternal \file
  *  \brief Declare interface for GPU execution for NBNXN module
  *
  *  \author Szilard Pall <pall.szilard@gmail.com>
  *  \author Mark Abraham <mark.j.abraham@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_H
-#define GMX_MDLIB_NBNXN_GPU_H
+#ifndef GMX_NBNXM_NBNXM_GPU_H
+#define GMX_NBNXM_NBNXM_GPU_H
 
 #include "gromacs/gpu_utils/gpu_macros.h"
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"
 
+#include "gpu_types.h"
+
 struct nbnxn_atomdata_t;
 enum class GpuTaskCompletion;
 
diff --git a/src/gromacs/nbnxm/nbnxm_setup.cpp b/src/gromacs/nbnxm/nbnxm_setup.cpp
new file mode 100644
index 0000000000..e00d1a09d1
--- /dev/null
+++ b/src/gromacs/nbnxm/nbnxm_setup.cpp
@@ -0,0 +1,427 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2019, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+/*! \internal \file
+ * \brief Common functions for the different NBNXN GPU implementations.
+ *
+ * \author Berk Hess <hess@kth.se>
+ *
+ * \ingroup module_nbnxm
+ */
+
+#include "gmxpre.h"
+
+#include "gromacs/domdec/domdec.h"
+#include "gromacs/domdec/domdec_struct.h"
+#include "gromacs/hardware/hw_info.h"
+#include "gromacs/mdlib/gmx_omp_nthreads.h"
+#include "gromacs/mdtypes/commrec.h"
+#include "gromacs/mdtypes/forcerec.h"
+#include "gromacs/mdtypes/inputrec.h"
+#include "gromacs/nbnxm/atomdata.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_geometry.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
+#include "gromacs/nbnxm/pairlist_tuning.h"
+#include "gromacs/simd/simd.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/logger.h"
+
+#include "internal.h"
+
+/*! \brief Returns whether CPU SIMD support exists for the given inputrec
+ *
+ * If the return value is FALSE and fplog/cr != NULL, prints a fallback
+ * message to fplog/stderr.
+ */
+static gmx_bool nbnxn_simd_supported(const gmx::MDLogger &mdlog,
+                                     const t_inputrec    *ir)
+{
+    if (ir->vdwtype == evdwPME && ir->ljpme_combination_rule == eljpmeLB)
+    {
+        /* LJ PME with LB combination rule does 7 mesh operations.
+         * This so slow that we don't compile SIMD non-bonded kernels
+         * for that. */
+        GMX_LOG(mdlog.warning).asParagraph().appendText("LJ-PME with Lorentz-Berthelot is not supported with SIMD kernels, falling back to plain C kernels");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*! \brief Returns the most suitable CPU kernel type and Ewald handling */
+static void pick_nbnxn_kernel_cpu(const t_inputrec gmx_unused    *ir,
+                                  int                            *kernel_type,
+                                  int                            *ewald_excl,
+                                  const gmx_hw_info_t gmx_unused &hardwareInfo)
+{
+    *kernel_type = nbnxnk4x4_PlainC;
+    *ewald_excl  = ewaldexclTable;
+
+#if GMX_SIMD
+    {
+#ifdef GMX_NBNXN_SIMD_4XN
+        *kernel_type = nbnxnk4xN_SIMD_4xN;
+#endif
+#ifdef GMX_NBNXN_SIMD_2XNN
+        *kernel_type = nbnxnk4xN_SIMD_2xNN;
+#endif
+
+#if defined GMX_NBNXN_SIMD_2XNN && defined GMX_NBNXN_SIMD_4XN
+        /* We need to choose if we want 2x(N+N) or 4xN kernels.
+         * This is based on the SIMD acceleration choice and CPU information
+         * detected at runtime.
+         *
+         * 4xN calculates more (zero) interactions, but has less pair-search
+         * work and much better kernel instruction scheduling.
+         *
+         * Up till now we have only seen that on Intel Sandy/Ivy Bridge,
+         * which doesn't have FMA, both the analytical and tabulated Ewald
+         * kernels have similar pair rates for 4x8 and 2x(4+4), so we choose
+         * 2x(4+4) because it results in significantly fewer pairs.
+         * For RF, the raw pair rate of the 4x8 kernel is higher than 2x(4+4),
+         * 10% with HT, 50% without HT. As we currently don't detect the actual
+         * use of HT, use 4x8 to avoid a potential performance hit.
+         * On Intel Haswell 4x8 is always faster.
+         */
+        *kernel_type = nbnxnk4xN_SIMD_4xN;
+
+#if !GMX_SIMD_HAVE_FMA
+        if (EEL_PME_EWALD(ir->coulombtype) ||
+            EVDW_PME(ir->vdwtype))
+        {
+            /* We have Ewald kernels without FMA (Intel Sandy/Ivy Bridge).
+             * There are enough instructions to make 2x(4+4) efficient.
+             */
+            *kernel_type = nbnxnk4xN_SIMD_2xNN;
+        }
+#endif
+        if (hardwareInfo.haveAmdZenCpu)
+        {
+            /* One 256-bit FMA per cycle makes 2xNN faster */
+            *kernel_type = nbnxnk4xN_SIMD_2xNN;
+        }
+#endif  /* GMX_NBNXN_SIMD_2XNN && GMX_NBNXN_SIMD_4XN */
+
+
+        if (getenv("GMX_NBNXN_SIMD_4XN") != nullptr)
+        {
+#ifdef GMX_NBNXN_SIMD_4XN
+            *kernel_type = nbnxnk4xN_SIMD_4xN;
+#else
+            gmx_fatal(FARGS, "SIMD 4xN kernels requested, but GROMACS has been compiled without support for these kernels");
+#endif
+        }
+        if (getenv("GMX_NBNXN_SIMD_2XNN") != nullptr)
+        {
+#ifdef GMX_NBNXN_SIMD_2XNN
+            *kernel_type = nbnxnk4xN_SIMD_2xNN;
+#else
+            gmx_fatal(FARGS, "SIMD 2x(N+N) kernels requested, but GROMACS has been compiled without support for these kernels");
+#endif
+        }
+
+        /* Analytical Ewald exclusion correction is only an option in
+         * the SIMD kernel.
+         * Since table lookup's don't parallelize with SIMD, analytical
+         * will probably always be faster for a SIMD width of 8 or more.
+         * With FMA analytical is sometimes faster for a width if 4 as well.
+         * In single precision, this is faster on Bulldozer.
+         */
+#if GMX_SIMD_REAL_WIDTH >= 8 || \
+        (GMX_SIMD_REAL_WIDTH >= 4 && GMX_SIMD_HAVE_FMA && !GMX_DOUBLE)
+        /* On AMD Zen, tabulated Ewald kernels are faster on all 4 combinations
+         * of single or double precision and 128 or 256-bit AVX2.
+         */
+        if (!hardwareInfo.haveAmdZenCpu)
+        {
+            *ewald_excl = ewaldexclAnalytical;
+        }
+#endif
+        if (getenv("GMX_NBNXN_EWALD_TABLE") != nullptr)
+        {
+            *ewald_excl = ewaldexclTable;
+        }
+        if (getenv("GMX_NBNXN_EWALD_ANALYTICAL") != nullptr)
+        {
+            *ewald_excl = ewaldexclAnalytical;
+        }
+
+    }
+#endif // GMX_SIMD
+}
+
+const char *lookup_nbnxn_kernel_name(int kernel_type)
+{
+    const char *returnvalue = nullptr;
+    switch (kernel_type)
+    {
+        case nbnxnkNotSet:
+            returnvalue = "not set";
+            break;
+        case nbnxnk4x4_PlainC:
+            returnvalue = "plain C";
+            break;
+        case nbnxnk4xN_SIMD_4xN:
+        case nbnxnk4xN_SIMD_2xNN:
+#if GMX_SIMD
+            returnvalue = "SIMD";
+#else  // GMX_SIMD
+            returnvalue = "not available";
+#endif // GMX_SIMD
+            break;
+        case nbnxnk8x8x8_GPU: returnvalue    = "GPU"; break;
+        case nbnxnk8x8x8_PlainC: returnvalue = "plain C"; break;
+
+        case nbnxnkNR:
+        default:
+            gmx_fatal(FARGS, "Illegal kernel type selected");
+    }
+    return returnvalue;
+};
+
+/*! \brief Returns the most suitable kernel type and Ewald handling */
+static void pick_nbnxn_kernel(const gmx::MDLogger &mdlog,
+                              gmx_bool             use_simd_kernels,
+                              const gmx_hw_info_t &hardwareInfo,
+                              gmx_bool             bUseGPU,
+                              EmulateGpuNonbonded  emulateGpu,
+                              const t_inputrec    *ir,
+                              int                 *kernel_type,
+                              int                 *ewald_excl,
+                              gmx_bool             bDoNonbonded)
+{
+    GMX_RELEASE_ASSERT(kernel_type, "Need a valid kernel_type pointer");
+
+    *kernel_type = nbnxnkNotSet;
+    *ewald_excl  = ewaldexclTable;
+
+    if (emulateGpu == EmulateGpuNonbonded::Yes)
+    {
+        *kernel_type = nbnxnk8x8x8_PlainC;
+
+        if (bDoNonbonded)
+        {
+            GMX_LOG(mdlog.warning).asParagraph().appendText("Emulating a GPU run on the CPU (slow)");
+        }
+    }
+    else if (bUseGPU)
+    {
+        *kernel_type = nbnxnk8x8x8_GPU;
+    }
+
+    if (*kernel_type == nbnxnkNotSet)
+    {
+        if (use_simd_kernels &&
+            nbnxn_simd_supported(mdlog, ir))
+        {
+            pick_nbnxn_kernel_cpu(ir, kernel_type, ewald_excl, hardwareInfo);
+        }
+        else
+        {
+            *kernel_type = nbnxnk4x4_PlainC;
+        }
+    }
+
+    if (bDoNonbonded)
+    {
+        GMX_LOG(mdlog.info).asParagraph().appendTextFormatted(
+                "Using %s %dx%d nonbonded short-range kernels",
+                lookup_nbnxn_kernel_name(*kernel_type),
+                nbnxn_kernel_to_cluster_i_size(*kernel_type),
+                nbnxn_kernel_to_cluster_j_size(*kernel_type));
+
+        if (nbnxnk4x4_PlainC == *kernel_type ||
+            nbnxnk8x8x8_PlainC == *kernel_type)
+        {
+            GMX_LOG(mdlog.warning).asParagraph().appendTextFormatted(
+                    "WARNING: Using the slow %s kernels. This should\n"
+                    "not happen during routine usage on supported platforms.",
+                    lookup_nbnxn_kernel_name(*kernel_type));
+        }
+    }
+}
+
+void init_nb_verlet(const gmx::MDLogger     &mdlog,
+                    nonbonded_verlet_t     **nb_verlet,
+                    gmx_bool                 bFEP_NonBonded,
+                    const t_inputrec        *ir,
+                    const t_forcerec        *fr,
+                    const t_commrec         *cr,
+                    const gmx_hw_info_t     &hardwareInfo,
+                    const gmx_device_info_t *deviceInfo,
+                    const gmx_mtop_t        *mtop,
+                    matrix                   box)
+{
+    nonbonded_verlet_t *nbv;
+    char               *env;
+
+    nbv = new nonbonded_verlet_t();
+
+    nbv->emulateGpu = ((getenv("GMX_EMULATE_GPU") != nullptr) ? EmulateGpuNonbonded::Yes : EmulateGpuNonbonded::No);
+    nbv->bUseGPU    = deviceInfo != nullptr;
+
+    GMX_RELEASE_ASSERT(!(nbv->emulateGpu == EmulateGpuNonbonded::Yes && nbv->bUseGPU), "When GPU emulation is active, there cannot be a GPU assignment");
+
+    nbv->nbs             = nullptr;
+    nbv->min_ci_balanced = 0;
+
+    nbv->ngrp = (DOMAINDECOMP(cr) ? 2 : 1);
+    for (int i = 0; i < nbv->ngrp; i++)
+    {
+        nbv->grp[i].nbl_lists.nnbl = 0;
+        nbv->grp[i].kernel_type    = nbnxnkNotSet;
+
+        if (i == 0) /* local */
+        {
+            pick_nbnxn_kernel(mdlog, fr->use_simd_kernels, hardwareInfo,
+                              nbv->bUseGPU, nbv->emulateGpu, ir,
+                              &nbv->grp[i].kernel_type,
+                              &nbv->grp[i].ewald_excl,
+                              fr->bNonbonded);
+        }
+        else /* non-local */
+        {
+            /* Use the same kernel for local and non-local interactions */
+            nbv->grp[i].kernel_type = nbv->grp[0].kernel_type;
+            nbv->grp[i].ewald_excl  = nbv->grp[0].ewald_excl;
+        }
+    }
+
+    nbv->listParams = std::make_unique<NbnxnListParameters>(ir->rlist);
+    setupDynamicPairlistPruning(mdlog, ir, mtop, box, nbv->grp[0].kernel_type, fr->ic,
+                                nbv->listParams.get());
+
+    nbv->nbs = std::make_unique<nbnxn_search>(DOMAINDECOMP(cr) ? &cr->dd->nc : nullptr,
+                                              DOMAINDECOMP(cr) ? domdec_zones(cr->dd) : nullptr,
+                                              bFEP_NonBonded,
+                                              gmx_omp_nthreads_get(emntPairsearch));
+
+    for (int i = 0; i < nbv->ngrp; i++)
+    {
+        nbnxn_init_pairlist_set(&nbv->grp[i].nbl_lists,
+                                nbnxn_kernel_pairlist_simple(nbv->grp[i].kernel_type),
+                                /* 8x8x8 "non-simple" lists are ATM always combined */
+                                !nbnxn_kernel_pairlist_simple(nbv->grp[i].kernel_type));
+    }
+
+    int      enbnxninitcombrule;
+    if (fr->ic->vdwtype == evdwCUT &&
+        (fr->ic->vdw_modifier == eintmodNONE ||
+         fr->ic->vdw_modifier == eintmodPOTSHIFT) &&
+        getenv("GMX_NO_LJ_COMB_RULE") == nullptr)
+    {
+        /* Plain LJ cut-off: we can optimize with combination rules */
+        enbnxninitcombrule = enbnxninitcombruleDETECT;
+    }
+    else if (fr->ic->vdwtype == evdwPME)
+    {
+        /* LJ-PME: we need to use a combination rule for the grid */
+        if (fr->ljpme_combination_rule == eljpmeGEOM)
+        {
+            enbnxninitcombrule = enbnxninitcombruleGEOM;
+        }
+        else
+        {
+            enbnxninitcombrule = enbnxninitcombruleLB;
+        }
+    }
+    else
+    {
+        /* We use a full combination matrix: no rule required */
+        enbnxninitcombrule = enbnxninitcombruleNONE;
+    }
+
+    nbv->nbat = new nbnxn_atomdata_t(nbv->bUseGPU ? gmx::PinningPolicy::PinnedIfSupported : gmx::PinningPolicy::CannotBePinned);
+    int mimimumNumEnergyGroupNonbonded = ir->opts.ngener;
+    if (ir->opts.ngener - ir->nwall == 1)
+    {
+        /* We have only one non-wall energy group, we do not need energy group
+         * support in the non-bondeds kernels, since all non-bonded energy
+         * contributions go to the first element of the energy group matrix.
+         */
+        mimimumNumEnergyGroupNonbonded = 1;
+    }
+    bool bSimpleList = nbnxn_kernel_pairlist_simple(nbv->grp[0].kernel_type);
+    nbnxn_atomdata_init(mdlog,
+                        nbv->nbat,
+                        nbv->grp[0].kernel_type,
+                        enbnxninitcombrule,
+                        fr->ntype, fr->nbfp,
+                        mimimumNumEnergyGroupNonbonded,
+                        bSimpleList ? gmx_omp_nthreads_get(emntNonbonded) : 1);
+
+    if (nbv->bUseGPU)
+    {
+        /* init the NxN GPU data; the last argument tells whether we'll have
+         * both local and non-local NB calculation on GPU */
+        nbnxn_gpu_init(&nbv->gpu_nbv,
+                       deviceInfo,
+                       fr->ic,
+                       nbv->listParams.get(),
+                       nbv->nbat,
+                       cr->nodeid,
+                       (nbv->ngrp > 1));
+
+        if ((env = getenv("GMX_NB_MIN_CI")) != nullptr)
+        {
+            char *end;
+
+            nbv->min_ci_balanced = strtol(env, &end, 10);
+            if (!end || (*end != 0) || nbv->min_ci_balanced < 0)
+            {
+                gmx_fatal(FARGS, "Invalid value passed in GMX_NB_MIN_CI=%s, non-negative integer required", env);
+            }
+
+            if (debug)
+            {
+                fprintf(debug, "Neighbor-list balancing parameter: %d (passed as env. var.)\n",
+                        nbv->min_ci_balanced);
+            }
+        }
+        else
+        {
+            nbv->min_ci_balanced = nbnxn_gpu_min_ci_balanced(nbv->gpu_nbv);
+            if (debug)
+            {
+                fprintf(debug, "Neighbor-list balancing parameter: %d (auto-adjusted to the number of GPU multi-processors)\n",
+                        nbv->min_ci_balanced);
+            }
+        }
+
+    }
+
+    *nb_verlet = nbv;
+}
diff --git a/src/gromacs/mdlib/nbnxn_simd.h b/src/gromacs/nbnxm/nbnxm_simd.h
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_simd.h
rename to src/gromacs/nbnxm/nbnxm_simd.h
index f845ffc596..640cc4554f 100644
--- a/src/gromacs/mdlib/nbnxn_simd.h
+++ b/src/gromacs/nbnxm/nbnxm_simd.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -33,8 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _nbnxn_simd_h
-#define _nbnxn_simd_h
+#ifndef GMX_NBNXM_NBNXM_SIMD_H
+#define GMX_NBNXM_NBNXM_SIMD_H
 
 #include "gromacs/math/vectypes.h"
 #include "gromacs/simd/simd.h"
diff --git a/src/gromacs/mdlib/nbnxn_ocl/CMakeLists.txt b/src/gromacs/nbnxm/opencl/CMakeLists.txt
similarity index 88%
rename from src/gromacs/mdlib/nbnxn_ocl/CMakeLists.txt
rename to src/gromacs/nbnxm/opencl/CMakeLists.txt
index 0e837390c0..087161278f 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/CMakeLists.txt
+++ b/src/gromacs/nbnxm/opencl/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013,2014,2015,2018, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014,2015,2018,2019, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -34,7 +34,7 @@
 
 if(GMX_USE_OPENCL)
     file(GLOB OPENCL_NB_SOURCES *.cpp)
-    set(MDLIB_SOURCES ${MDLIB_SOURCES} ${OPENCL_NB_SOURCES} PARENT_SCOPE)
+    set(NBNXM_SOURCES ${NBNXM_SOURCES} ${OPENCL_NB_SOURCES} PARENT_SCOPE)
 endif()
 
 set(ELEC_DEFS
@@ -68,19 +68,19 @@ foreach(ELEC_DEF IN LISTS ELEC_DEFS)
             endif()
             string(REGEX REPLACE ".*=" "" ELEC_NAME "${ELEC_DEF}")
             string(REGEX REPLACE ".*=" "" VDW_NAME "${VDW_DEF}")
-            set(OBJ_FILE nbnxn_ocl_kernel${ELEC_NAME}${VDW_NAME}_${VENDOR}.o)
+            set(OBJ_FILE nbnxm_ocl_kernel${ELEC_NAME}${VDW_NAME}_${VENDOR}.o)
             add_custom_command(OUTPUT ${OBJ_FILE} COMMAND ${OCL_COMPILER}
-                ${CMAKE_CURRENT_SOURCE_DIR}/nbnxn_ocl_kernels.cl ${CLANG_TIDY_ARGS}
+                ${CMAKE_CURRENT_SOURCE_DIR}/nbnxm_ocl_kernels.cl ${CLANG_TIDY_ARGS}
                 -Xclang -finclude-default-header  -D_${VENDOR}_SOURCE_
                 -DGMX_OCL_FASTGEN ${ELEC_DEF} ${VDW_DEF}
-                -DNBNXN_GPU_CLUSTER_SIZE=${CLUSTER_SIZE} -DIATYPE_SHMEM
+                -DNBNXM_GPU_CLUSTER_SIZE=${CLUSTER_SIZE} -DIATYPE_SHMEM
                 -c -I ${CMAKE_SOURCE_DIR}/src -std=cl1.2
                 -Weverything  -Wno-conversion -Wno-missing-variable-declarations -Wno-used-but-marked-unused
                 -Wno-cast-align -Wno-incompatible-pointer-types
                 -o${OBJ_FILE}
                 )
-            list(APPEND NBNXN_OCL_KERNELS ${OBJ_FILE})
+            list(APPEND NBNXM_OCL_KERNELS ${OBJ_FILE})
         endforeach()
     endforeach()
 endforeach()
-add_custom_target(ocl_kernel DEPENDS ${NBNXN_OCL_KERNELS})
+add_custom_target(ocl_kernel DEPENDS ${NBNXM_OCL_KERNELS})
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp b/src/gromacs/nbnxm/opencl/nbnxm_ocl.cpp
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl.cpp
index 8908f3fb2e..8aac82d3d3 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl.cpp
@@ -33,13 +33,13 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /*! \internal \file
- *  \brief Define OpenCL implementation of nbnxn_gpu.h
+ *  \brief Define OpenCL implementation of nbnxm_gpu.h
  *
  *  \author Anca Hamuraru <anca@streamcomputing.eu>
  *  \author Teemu Virolainen <teemu@streamcomputing.eu>
  *  \author Dimitrios Karkoulis <dimitris.karkoulis@gmail.com>
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  *
  *  TODO (psz):
  *  - Add a static const cl_uint c_pruneKernelWorkDim / c_nbnxnKernelWorkDim = 3;
@@ -73,22 +73,20 @@
 #include "gromacs/gpu_utils/oclutils.h"
 #include "gromacs/hardware/hw_info.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_gpu.h"
-#include "gromacs/mdlib/nbnxn_gpu_common.h"
-#include "gromacs/mdlib/nbnxn_gpu_common_utils.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/gpu_common.h"
+#include "gromacs/nbnxm/gpu_common_utils.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_gpu.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/gmxassert.h"
 
-#include "nbnxn_ocl_internal.h"
-#include "nbnxn_ocl_types.h"
-
+#include "nbnxm_ocl_internal.h"
+#include "nbnxm_ocl_types.h"
 
 /*! \brief Convenience constants */
 //@{
@@ -151,7 +149,7 @@ static inline void validate_global_work_size(const KernelLaunchConfig &config, i
  *
  *  Note that the row- and column-order of function pointers has to match the
  *  order of corresponding enumerated electrostatics and vdw types, resp.,
- *  defined in nbnxn_cuda_types.h.
+ *  defined in nbnxm_ocl_types.h.
  */
 
 /*! \brief Force-only kernel function names. */
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_consts.h b/src/gromacs/nbnxm/opencl/nbnxm_ocl_consts.h
similarity index 91%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_consts.h
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_consts.h
index 4a542686ed..c2380121d4 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_consts.h
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_consts.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2018, by the GROMACS development team, led by
+ * Copyright (c) 2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,7 +35,8 @@
 #ifndef NBNXN_OPENCL_CONSTS_H
 #define NBNXN_OPENCL_CONSTS_H
 
-/*! \brief Macros defining platform-dependent defaults for the prune kernel's j4 processing concurrency.
+/*! \internal \file
+ * \brief Macros defining platform-dependent defaults for the prune kernel's j4 processing concurrency.
  *
  *  The GMX_NBNXN_PRUNE_KERNEL_J4_CONCURRENCY macro allows compile-time override.
  */
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp b/src/gromacs/nbnxm/opencl/nbnxm_ocl_data_mgmt.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_data_mgmt.cpp
index d164d26831..27a2cd806e 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_data_mgmt.cpp
@@ -33,7 +33,7 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /*! \internal \file
- *  \brief Define OpenCL implementation of nbnxn_gpu_data_mgmt.h
+ *  \brief Define OpenCL implementation of nbnxm_gpu_data_mgmt.h
  *
  *  \author Anca Hamuraru <anca@streamcomputing.eu>
  *  \author Dimitrios Karkoulis <dimitris.karkoulis@gmail.com>
@@ -55,13 +55,12 @@
 #include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_gpu.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_gpu_jit_support.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/gpu_jit_support.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_gpu.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/cstringutil.h"
@@ -70,8 +69,8 @@
 #include "gromacs/utility/real.h"
 #include "gromacs/utility/smalloc.h"
 
-#include "nbnxn_ocl_internal.h"
-#include "nbnxn_ocl_types.h"
+#include "nbnxm_ocl_internal.h"
+#include "nbnxm_ocl_types.h"
 
 /*! \brief This parameter should be determined heuristically from the
  * kernel execution times
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_internal.h b/src/gromacs/nbnxm/opencl/nbnxm_ocl_internal.h
similarity index 93%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_internal.h
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_internal.h
index ff473b519e..318e72623d 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_internal.h
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_internal.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,12 +36,12 @@
  *  \brief Internal API of the OpenCL non-bonded module.
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
 #include "gmxpre.h"
 
-#include "nbnxn_ocl_types.h"
+#include "nbnxm_ocl_types.h"
 
 #ifndef NBNXN_OCL_INTERNAL_H
 #define NBNXN_OCL_INTERNAL_H
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp b/src/gromacs/nbnxm/opencl/nbnxm_ocl_jit_support.cpp
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_jit_support.cpp
index 14328f0b74..7354275d20 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_jit_support.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -37,7 +37,7 @@
  *
  *  \author Dimitrios Karkoulis <dimitris.karkoulis@gmail.com>
  *  \author Mark Abraham <mark.j.abraham@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 #include "gmxpre.h"
 
@@ -49,18 +49,17 @@
 
 #include "gromacs/gpu_utils/gpu_utils.h"
 #include "gromacs/gpu_utils/ocl_compiler.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_gpu.h"
-#include "gromacs/mdlib/nbnxn_gpu_jit_support.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/gpu_jit_support.h"
+#include "gromacs/nbnxm/nbnxm_gpu.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/stringutil.h"
 
-#include "nbnxn_ocl_types.h"
+#include "nbnxm_ocl_types.h"
 
 /*! \brief Stringifies the input argument
  */
@@ -193,10 +192,10 @@ nbnxn_gpu_compile_kernels(gmx_nbnxn_ocl_t *nb)
                                                              nb->nbparam->vdwtype);
 
         /* Here we pass macros and static const int variables defined
-         * in include files outside the nbnxn_ocl as macros, to avoid
+         * in include files outside the opencl as macros, to avoid
          * including those files in the JIT compilation that happens
          * at runtime. This is particularly a problem for headers that
-         * depend on config.h, such as nbnxn_pairlist.h. */
+         * depend on config.h, such as pairlist.h. */
         extraDefines += gmx::formatString(
                     " -DNBNXN_GPU_CLUSTER_SIZE=%d "
                     "%s",
@@ -208,8 +207,8 @@ nbnxn_gpu_compile_kernels(gmx_nbnxn_ocl_t *nb)
             /* TODO when we have a proper MPI-aware logging module,
                the log output here should be written there */
             program = gmx::ocl::compileProgram(stderr,
-                                               "gromacs/mdlib/nbnxn_ocl",
-                                               "nbnxn_ocl_kernels.cl",
+                                               "gromacs/nbnxm/opencl",
+                                               "nbnxm_ocl_kernels.cl",
                                                extraDefines,
                                                nb->dev_rundata->context,
                                                nb->dev_info->ocl_gpu_id.ocl_device_id,
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel.clh
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel.clh
index 238711401a..c42b0c30e5 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -40,13 +40,13 @@
  *
  *  \author Anca Hamuraru <anca@streamcomputing.eu>
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
 /* Currently we enable CJ prefetch for AMD/NVIDIA and disable it for the "nowarp" kernel
  * Note that this should precede the kernel_utils include.
  */
-#include "nbnxn_ocl_kernel_utils.clh"
+#include "nbnxm_ocl_kernel_utils.clh"
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_pruneonly.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_pruneonly.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh
index 14d993c66b..6b1debe105 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_pruneonly.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,10 +39,10 @@
  *  OpenCL 1.2 support is expected; tested on AMD GCN and NVIDIA CC >3.0.
  *
  *  \author Szilárd Páll <pall.szilard@gmail.com>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
-#include "nbnxn_ocl_kernel_utils.clh"
+#include "nbnxm_ocl_kernel_utils.clh"
 
 /* Note: the AMD compiler testing was done with (fglrx 15.12) performs best with wg
  * size 256 (this is an artificial compiler limitation). The compiler is also
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_utils.clh
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_utils.clh
index 54377cb66e..74fcc398ac 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_utils.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -37,10 +37,10 @@
 
 #include "gromacs/gpu_utils/device_utils.clh"
 #include "gromacs/gpu_utils/vectype_ops.clh"
-#include "gromacs/mdlib/nbnxn_consts.h"
+#include "gromacs/nbnxm/constants.h"
 #include "gromacs/pbcutil/ishift.h"
 
-#include "nbnxn_ocl_consts.h"
+#include "nbnxm_ocl_consts.h"
 
 #define CL_SIZE                 (NBNXN_GPU_CLUSTER_SIZE)
 #define NCL_PER_SUPERCL         c_nbnxnGpuNumClusterPerSupercluster
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.cl b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.cl
similarity index 89%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.cl
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.cl
index b5868ec870..528754b17b 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.cl
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.cl
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -52,16 +52,16 @@ zero_e_fshift(__global float *fshift, __global float *e_lj, __global float *e_el
 
 /* Generate pruning kernels. */
 #define HAVE_FRESH_LIST 1
-#include "nbnxn_ocl_kernel_pruneonly.clh"
+#include "nbnxm_ocl_kernel_pruneonly.clh"
 #undef HAVE_FRESH_LIST
-#include "nbnxn_ocl_kernel_pruneonly.clh"
+#include "nbnxm_ocl_kernel_pruneonly.clh"
 
 #if defined GMX_OCL_FASTGEN
-    #define FLAVOR_LEVEL_GENERATOR "nbnxn_ocl_kernels_fastgen.clh"
+    #define FLAVOR_LEVEL_GENERATOR "nbnxm_ocl_kernels_fastgen.clh"
 #elif defined GMX_OCL_FASTGEN_ADD_TWINCUT
-    #define FLAVOR_LEVEL_GENERATOR "nbnxn_ocl_kernels_fastgen_add_twincut.clh"
+    #define FLAVOR_LEVEL_GENERATOR "nbnxm_ocl_kernels_fastgen_add_twincut.clh"
 #else
-    #define FLAVOR_LEVEL_GENERATOR "nbnxn_ocl_kernels.clh"
+    #define FLAVOR_LEVEL_GENERATOR "nbnxm_ocl_kernels.clh"
 #endif
 
 /* Top-level kernel generation: will generate through multiple inclusion the
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.clh
similarity index 87%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.clh
index e5a0792343..5730d24374 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2016,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2016,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -46,7 +46,7 @@
  *  NOTE: No include fence as it is meant to be included multiple times.
  */
 
-#include "nbnxn_ocl_kernel_utils.clh"
+#include "nbnxm_ocl_kernel_utils.clh"
 
 /* Analytical plain cut-off electrostatics kernels
  */
@@ -54,42 +54,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecCut_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -102,42 +102,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecRF_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -150,42 +150,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEw_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -199,42 +199,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwTwinCut_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -247,42 +247,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTab_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
@@ -295,42 +295,42 @@
 
 /* cut-off + V shift LJ */
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwinCut_VdwLJ ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w geometric combination rules */
 #define LJ_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwin_VdwLJCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* cut-off + V shift LJ w LB combination rules */
 #define LJ_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwin_VdwLJCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w geometric combination rules */
 #define LJ_EWALD_COMB_GEOM
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwinCut_VdwLJEwCombGeom ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_GEOM
 #undef NB_KERNEL_FUNC_NAME
 /* LJ-Ewald w LB combination rules */
 #define LJ_EWALD_COMB_LB
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwinCut_VdwLJEwCombLB ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_EWALD_COMB_LB
 #undef NB_KERNEL_FUNC_NAME
 /* F switch LJ */
 #define LJ_FORCE_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwinCut_VdwLJFsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_FORCE_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 /* V switch LJ */
 #define LJ_POT_SWITCH
 #define NB_KERNEL_FUNC_NAME(x, y) x ## _ElecEwQSTabTwinCut_VdwLJPsw ## y
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 #undef LJ_POT_SWITCH
 #undef NB_KERNEL_FUNC_NAME
 
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh
index 2930ccd15b..a5b30ec045 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -46,12 +46,12 @@
  *  NOTE: No include fence as it is meant to be included multiple times.
  */
 
-#include "nbnxn_ocl_kernel_utils.clh"
+#include "nbnxm_ocl_kernel_utils.clh"
 
 #define NB_INDIRECT_1(x, eel, vdw, y) x ## eel ## vdw ## y
 #define NB_INDIRECT_2(x, eel, vdw, y) NB_INDIRECT_1(x, eel, vdw, y)
 #define NB_KERNEL_FUNC_NAME(x, y)  NB_INDIRECT_2(x, EELNAME, VDWNAME, y)
 
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 
 #undef NB_KERNEL_FUNC_NAME
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen_add_twincut.clh b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh
similarity index 93%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen_add_twincut.clh
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh
index d5f82880ec..ac072959b6 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernels_fastgen_add_twincut.clh
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -46,7 +46,7 @@
  *  NOTE: No include fence as it is meant to be included multiple times.
  */
 
-#include "nbnxn_ocl_kernel_utils.clh"
+#include "nbnxm_ocl_kernel_utils.clh"
 
 /* Define the single-cutoff version of the kernel */
 
@@ -54,7 +54,7 @@
 #define NB_INDIRECT_2(x, eel, vdw, y) NB_INDIRECT_1(x, eel, vdw, y)
 #define NB_KERNEL_FUNC_NAME(x, y)  NB_INDIRECT_2(x, EELNAME, VDWNAME, y)
 
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 
 #undef NB_KERNEL_FUNC_NAME
 
@@ -66,7 +66,7 @@
 
 #define VDW_CUTOFF_CHECK
 
-#include "nbnxn_ocl_kernel.clh"
+#include "nbnxm_ocl_kernel.clh"
 
 #undef NB_KERNEL_FUNC_NAME
 #undef VDW_CUTOFF_CHECK
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_types.h b/src/gromacs/nbnxm/opencl/nbnxm_ocl_types.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_types.h
rename to src/gromacs/nbnxm/opencl/nbnxm_ocl_types.h
index b56afd6455..75279fb3cd 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_types.h
+++ b/src/gromacs/nbnxm/opencl/nbnxm_ocl_types.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,27 +35,28 @@
 
 /*! \internal \file
  *  \brief
- *  Data types used internally in the nbnxn_ocl module.
+ *  Data types used internally in the nbnxm_ocl module.
  *
  *  \author Anca Hamuraru <anca@streamcomputing.eu>
  *  \author Szilárd Páll <pszilard@kth.se>
- *  \ingroup module_mdlib
+ *  \ingroup module_nbnxm
  */
 
-#ifndef NBNXN_OPENCL_TYPES_H
-#define NBNXN_OPENCL_TYPES_H
+#ifndef GMX_NBNXM_NBNXM_OPENCL_TYPES_H
+#define GMX_NBNXM_NBNXM_OPENCL_TYPES_H
 
 #include "gromacs/gpu_utils/devicebuffer.h"
 #include "gromacs/gpu_utils/gmxopencl.h"
 #include "gromacs/gpu_utils/gputraits_ocl.h"
 #include "gromacs/gpu_utils/oclutils.h"
-#include "gromacs/mdlib/nbnxn_gpu_types_common.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
-#include "gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_consts.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/gpu_types_common.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/real.h"
 
+#include "nbnxm_ocl_consts.h"
+
 /* kernel does #include "gromacs/math/utilities.h" */
 /* Move the actual useful stuff here: */
 
diff --git a/src/gromacs/mdlib/nbnxn_search.cpp b/src/gromacs/nbnxm/pairlist.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_search.cpp
rename to src/gromacs/nbnxm/pairlist.cpp
index 10359ab5ab..1877af16a8 100644
--- a/src/gromacs/mdlib/nbnxn_search.cpp
+++ b/src/gromacs/nbnxm/pairlist.cpp
@@ -35,7 +35,7 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_search.h"
+#include "pairlist.h"
 
 #include "config.h"
 
@@ -51,16 +51,14 @@
 #include "gromacs/math/utilities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_atomdata.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_grid.h"
-#include "gromacs/mdlib/nbnxn_internal.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
-#include "gromacs/mdlib/nbnxn_util.h"
 #include "gromacs/mdlib/ns.h"
 #include "gromacs/mdtypes/group.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/atomdata.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_geometry.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
+#include "gromacs/nbnxm/pairlistset.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/simd/simd.h"
@@ -71,6 +69,8 @@
 #include "gromacs/utility/gmxomp.h"
 #include "gromacs/utility/smalloc.h"
 
+#include "internal.h"
+
 using namespace gmx; // TODO: Remove when this file is moved into gmx namespace
 
 
@@ -1220,10 +1220,10 @@ makeClusterListSimple(const nbnxn_grid_t       &jGrid,
 }
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_search_simd_4xn.h"
+#include "gromacs/nbnxm/pairlist_simd_4xm.h"
 #endif
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_search_simd_2xnn.h"
+#include "gromacs/nbnxm/pairlist_simd_2xmm.h"
 #endif
 
 /* Plain C or SIMD4 code for making a pair list of super-cell sci vs scj.
diff --git a/src/gromacs/mdlib/nbnxn_pairlist.h b/src/gromacs/nbnxm/pairlist.h
similarity index 98%
rename from src/gromacs/mdlib/nbnxn_pairlist.h
rename to src/gromacs/nbnxm/pairlist.h
index d4dc485152..74bf78fc8f 100644
--- a/src/gromacs/mdlib/nbnxn_pairlist.h
+++ b/src/gromacs/nbnxm/pairlist.h
@@ -33,8 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef _nbnxn_pairlist_h
-#define _nbnxn_pairlist_h
+#ifndef GMX_NBNXM_PAIRLIST_H
+#define GMX_NBNXM_PAIRLIST_H
 
 #include "config.h"
 
@@ -42,13 +42,16 @@
 
 #include "gromacs/gpu_utils/hostallocator.h"
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/mdtypes/nblist.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/bitmask.h"
 #include "gromacs/utility/defaultinitializationallocator.h"
 #include "gromacs/utility/real.h"
 
+// This file with constants is separate from this file to be able
+// to include it during OpenCL jitting without including config.h
+#include "gromacs/nbnxm/constants.h"
+
 struct NbnxnPairlistCpuWork;
 struct NbnxnPairlistGpuWork;
 struct tMPI_Atomic;
@@ -105,6 +108,7 @@ static constexpr int c_gpuNumClusterPerCellY = 2;
 static constexpr int c_gpuNumClusterPerCellX = 2;
 static constexpr int c_gpuNumClusterPerCell  = c_gpuNumClusterPerCellZ*c_gpuNumClusterPerCellY*c_gpuNumClusterPerCellX;
 
+
 /* In CUDA the number of threads in a warp is 32 and we have cluster pairs
  * of 8*8=64 atoms, so it's convenient to store data for cluster pair halves.
  */
@@ -286,7 +290,8 @@ struct NbnxnPairlistGpu
     gmx_cache_protect_t            cp1;
 };
 
-typedef struct {
+struct nbnxn_pairlist_set_t
+{
     int                nnbl;                  /* number of lists */
     NbnxnPairlistCpu **nbl;                   /* lists for CPU */
     NbnxnPairlistCpu **nbl_work;              /* work space for rebalancing lists */
@@ -299,7 +304,7 @@ typedef struct {
     int                natpair_q;             /* Total number of atom pairs for Q kernel    */
     t_nblist         **nbl_fep;               /* List of free-energy atom pair interactions */
     int64_t            outerListCreationStep; /* Step at which the outer list was created */
-} nbnxn_pairlist_set_t;
+};
 
 enum {
     nbatXYZ, nbatXYZQ, nbatX4, nbatX8
diff --git a/src/gromacs/mdlib/nbnxn_search_simd_2xnn.h b/src/gromacs/nbnxm/pairlist_simd_2xmm.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_search_simd_2xnn.h
rename to src/gromacs/nbnxm/pairlist_simd_2xmm.h
diff --git a/src/gromacs/mdlib/nbnxn_search_simd_4xn.h b/src/gromacs/nbnxm/pairlist_simd_4xm.h
similarity index 100%
rename from src/gromacs/mdlib/nbnxn_search_simd_4xn.h
rename to src/gromacs/nbnxm/pairlist_simd_4xm.h
diff --git a/src/gromacs/mdlib/nbnxn_tuning.cpp b/src/gromacs/nbnxm/pairlist_tuning.cpp
similarity index 99%
rename from src/gromacs/mdlib/nbnxn_tuning.cpp
rename to src/gromacs/nbnxm/pairlist_tuning.cpp
index 258a2bf386..ae3a38d3ba 100644
--- a/src/gromacs/mdlib/nbnxn_tuning.cpp
+++ b/src/gromacs/nbnxm/pairlist_tuning.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -43,7 +43,7 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_tuning.h"
+#include "pairlist_tuning.h"
 
 #include <cassert>
 #include <cmath>
@@ -56,12 +56,11 @@
 #include "gromacs/hardware/cpuinfo.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/calc_verletbuf.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_search.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/state.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/topology/topology.h"
 #include "gromacs/utility/cstringutil.h"
diff --git a/src/gromacs/mdlib/nbnxn_tuning.h b/src/gromacs/nbnxm/pairlist_tuning.h
similarity index 95%
rename from src/gromacs/mdlib/nbnxn_tuning.h
rename to src/gromacs/nbnxm/pairlist_tuning.h
index 47f3f6bf65..a6f82fcddf 100644
--- a/src/gromacs/mdlib/nbnxn_tuning.h
+++ b/src/gromacs/nbnxm/pairlist_tuning.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017, by the GROMACS development team, led by
+ * Copyright (c) 2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -43,8 +43,8 @@
  * \ingroup __module_nb_verlet
  */
 
-#ifndef NBNXN_TUNING_H
-#define NBNXN_TUNING_H
+#ifndef NBNXM_PAIRLIST_TUNING_H
+#define NBNXM_PAIRLIST_TUNING_H
 
 #include <stdio.h>
 
@@ -98,4 +98,4 @@ void setupDynamicPairlistPruning(const gmx::MDLogger       &mdlog,
                                  const interaction_const_t *ic,
                                  NbnxnListParameters       *listParams);
 
-#endif /* NBNXN_TUNING_H */
+#endif /* NBNXM_PAIRLIST_TUNING_H */
diff --git a/src/gromacs/mdlib/nbnxn_search.h b/src/gromacs/nbnxm/pairlistset.h
similarity index 79%
rename from src/gromacs/mdlib/nbnxn_search.h
rename to src/gromacs/nbnxm/pairlistset.h
index a1fa75409f..0e92eb3cde 100644
--- a/src/gromacs/mdlib/nbnxn_search.h
+++ b/src/gromacs/nbnxm/pairlistset.h
@@ -33,16 +33,32 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifndef GMX_MDLIB_NBNXN_SEARCH_H
-#define GMX_MDLIB_NBNXN_SEARCH_H
+#ifndef GMX_NBNXM_PAIRLISTSET_H
+#define GMX_NBNXM_PAIRLISTSET_H
 
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/math/vectypes.h"
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/real.h"
 
 struct gmx_domdec_zones_t;
 struct gmx_groups_t;
+struct nbnxn_atomdata_t;
+struct nbnxn_pairlist_set_t;
+struct nbnxn_search;
 struct t_blocka;
 struct t_nrnb;
 
+/* Function that should return a pointer *ptr to memory
+ * of size nbytes.
+ * Error handling should be done within this function.
+ */
+typedef void nbnxn_alloc_t (void **ptr, size_t nbytes);
+
+/* Function that should free the memory pointed to by *ptr.
+ * NULL should not be passed to this function.
+ */
+typedef void nbnxn_free_t (void *ptr);
+
 /* Tells if the pair-list corresponding to nb_kernel_type is simple.
  * Returns FALSE for super-sub type pair-list.
  */
@@ -54,10 +70,10 @@ gmx_bool nbnxn_kernel_pairlist_simple(int nb_kernel_type);
 real nbnxn_get_rlist_effective_inc(int cluster_size, real atom_density);
 
 /* Allocates and initializes a pair search data structure */
-nbnxn_search_t nbnxn_init_search(const ivec                *n_dd_cells,
-                                 const gmx_domdec_zones_t  *zones,
-                                 gmx_bool                   bFEP,
-                                 int                        nthread_max);
+nbnxn_search *nbnxn_init_search(const ivec                *n_dd_cells,
+                                const gmx_domdec_zones_t  *zones,
+                                gmx_bool                   bFEP,
+                                int                        nthread_max);
 
 /* Initializes a set of pair lists stored in nbnxn_pairlist_set_t */
 void nbnxn_init_pairlist_set(nbnxn_pairlist_set_t *nbl_list,
@@ -70,7 +86,7 @@ void nbnxn_init_pairlist_set(nbnxn_pairlist_set_t *nbl_list,
  * for the number of equally sized lists is below min_ci_balanced.
  * With perturbed particles, also a group scheme style nbl_fep list is made.
  */
-void nbnxn_make_pairlist(nbnxn_search_t        nbs,
+void nbnxn_make_pairlist(nbnxn_search         *nbs,
                          nbnxn_atomdata_t     *nbat,
                          const t_blocka       *excl,
                          real                  rlist,
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.cpp b/src/gromacs/nbnxm/prunekerneldispatch.cpp
similarity index 92%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.cpp
rename to src/gromacs/nbnxm/prunekerneldispatch.cpp
index 0c177dbf8e..8fb02f0b91 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.cpp
+++ b/src/gromacs/nbnxm/prunekerneldispatch.cpp
@@ -35,17 +35,16 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_prune.h"
+#include "prunekerneldispatch.h"
 
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/utility/gmxassert.h"
 
-#include "nbnxn_kernel_ref_prune.h"
-#include "simd_2xnn/nbnxn_kernel_simd_2xnn_prune.h"
-#include "simd_4xn/nbnxn_kernel_simd_4xn_prune.h"
-
+#include "kernels_reference/kernel_ref_prune.h"
+#include "kernels_simd_2xmm/kernel_prune.h"
+#include "kernels_simd_4xm/kernel_prune.h"
 
 void nbnxn_kernel_cpu_prune(nonbonded_verlet_group_t *nbvg,
                             const nbnxn_atomdata_t   *nbat,
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.h b/src/gromacs/nbnxm/prunekerneldispatch.h
similarity index 96%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.h
rename to src/gromacs/nbnxm/prunekerneldispatch.h
index dfa436a34a..09eaae8b2e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_prune.h
+++ b/src/gromacs/nbnxm/prunekerneldispatch.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2016,2017,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -41,6 +41,8 @@
  * The wrapper function internally performs the OpenMP parallelization
  * and calls the selected kernel flavor (different SIMD types / C reference).
  *
+ * \inlibraryapi
+ *
  * \author Berk Hess <hess@kth.se>
  */
 
diff --git a/src/gromacs/taskassignment/decidegpuusage.cpp b/src/gromacs/taskassignment/decidegpuusage.cpp
index b10f236a1e..5e18aa7948 100644
--- a/src/gromacs/taskassignment/decidegpuusage.cpp
+++ b/src/gromacs/taskassignment/decidegpuusage.cpp
@@ -56,10 +56,10 @@
 #include "gromacs/hardware/hardwaretopology.h"
 #include "gromacs/hardware/hw_info.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/taskassignment/taskassignment.h"
 #include "gromacs/topology/topology.h"
 #include "gromacs/utility/baseversion.h"
-- 
2.22.0