diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/Makefile b/docs/recipes/install/centos7/aarch64/warewulf/slurm/Makefile
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/Makefile
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/Makefile
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/common b/docs/recipes/install/centos7/aarch64/warewulf/slurm/common
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/common
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/common
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/admin.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/admin.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/admin.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/admin.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/compiler-families.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/compiler-families.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/compiler-families.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/compiler-families.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/dev-tools.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/dev-tools.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/dev-tools.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/dev-tools.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/distro-packages.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/distro-packages.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/distro-packages.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/distro-packages.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/io-libs.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/io-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/io-libs.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/io-libs.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/lustre.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/lustre.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/lustre.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/lustre.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/mpi-families.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/mpi-families.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/mpi-families.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/mpi-families.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/parallel-libs.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/parallel-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/parallel-libs.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/parallel-libs.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/patterns.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/patterns.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/patterns.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/patterns.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/perf-tools.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/perf-tools.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/perf-tools.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/perf-tools.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.all b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.lustre b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.lustre
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.lustre
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.lustre
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/provisioning.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/provisioning.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/provisioning.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/provisioning.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/rms.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/rms.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/rms.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/rms.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/runtimes.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/runtimes.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/runtimes.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/runtimes.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/serial-libs.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/serial-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/manifest/serial-libs.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/manifest/serial-libs.tex
diff --git a/docs/recipes/install/centos7.2/aarch64/warewulf/slurm/steps.tex b/docs/recipes/install/centos7/aarch64/warewulf/slurm/steps.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/aarch64/warewulf/slurm/steps.tex
rename to docs/recipes/install/centos7/aarch64/warewulf/slurm/steps.tex
diff --git a/docs/recipes/install/centos7.2/input.local.template b/docs/recipes/install/centos7/input.local.template
similarity index 100%
rename from docs/recipes/install/centos7.2/input.local.template
rename to docs/recipes/install/centos7/input.local.template
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/.gitignore b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/.gitignore
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/.gitignore
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/.gitignore
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/Makefile b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/Makefile
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/Makefile
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/Makefile
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/common b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/common
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/common
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/common
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/manifest b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/manifest
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/manifest
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/manifest
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/manifest.tex b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/manifest.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/manifest.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/manifest.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/steps.tex b/docs/recipes/install/centos7/x86_64/warewulf/pbspro/steps.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/pbspro/steps.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/pbspro/steps.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/.gitignore b/docs/recipes/install/centos7/x86_64/warewulf/slurm/.gitignore
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/.gitignore
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/.gitignore
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/Makefile b/docs/recipes/install/centos7/x86_64/warewulf/slurm/Makefile
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/Makefile
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/Makefile
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/common b/docs/recipes/install/centos7/x86_64/warewulf/slurm/common
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/common
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/common
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/ChangeLog b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/ChangeLog
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/ChangeLog
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/ChangeLog
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/admin.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/admin.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/admin.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/admin.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/common b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/common
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/common
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/common
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/compiler-families.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/compiler-families.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/compiler-families.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/compiler-families.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/dev-tools.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/dev-tools.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/dev-tools.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/dev-tools.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/distro-packages.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/distro-packages.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/distro-packages.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/distro-packages.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/gen_tables.sh b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/gen_tables.sh
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/gen_tables.sh
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/gen_tables.sh
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/io-libs.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/io-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/io-libs.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/io-libs.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/lustre.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/lustre.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/lustre.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/lustre.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/mpi-families.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/mpi-families.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/mpi-families.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/mpi-families.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/parallel-libs.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/parallel-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/parallel-libs.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/parallel-libs.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pattern-ohpc.all b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/patterns.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/patterns.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/patterns.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/patterns.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/perf-tools.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/perf-tools.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/perf-tools.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/perf-tools.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.all b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/provisioning.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/provisioning.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/provisioning.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/provisioning.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/rms.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/rms.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/rms.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/rms.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/runtimes.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/runtimes.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/runtimes.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/runtimes.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/serial-libs.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/serial-libs.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/serial-libs.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/serial-libs.tex
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/update_manifest.sh b/docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/update_manifest.sh
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/manifest/update_manifest.sh
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/manifest/update_manifest.sh
diff --git a/docs/recipes/install/centos7.2/x86_64/warewulf/slurm/steps.tex b/docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex
similarity index 100%
rename from docs/recipes/install/centos7.2/x86_64/warewulf/slurm/steps.tex
rename to docs/recipes/install/centos7/x86_64/warewulf/slurm/steps.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/.gitignore b/docs/recipes/install/sles12/aarch64/warewulf/slurm/.gitignore
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/.gitignore
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/.gitignore
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/Makefile b/docs/recipes/install/sles12/aarch64/warewulf/slurm/Makefile
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/Makefile
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/Makefile
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/common b/docs/recipes/install/sles12/aarch64/warewulf/slurm/common
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/common
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/common
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/admin.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/admin.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/admin.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/admin.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/compiler-families.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/compiler-families.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/compiler-families.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/compiler-families.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/dev-tools.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/dev-tools.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/dev-tools.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/dev-tools.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/distro-packages.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/distro-packages.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/distro-packages.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/distro-packages.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/io-libs.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/io-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/io-libs.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/io-libs.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/lustre.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/lustre.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/lustre.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/lustre.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/mpi-families.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/mpi-families.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/mpi-families.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/mpi-families.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/parallel-libs.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/parallel-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/parallel-libs.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/parallel-libs.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pattern-ohpc.all b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pattern-ohpc.all
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pattern-ohpc.all
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pattern-ohpc.all
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/patterns.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/patterns.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/patterns.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/patterns.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/perf-tools.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/perf-tools.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/perf-tools.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/perf-tools.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.admin
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.all b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.all
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.io-libs
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.provisioning
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.rms
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.runtimes
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/provisioning.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/provisioning.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/provisioning.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/provisioning.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/rms.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/rms.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/rms.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/rms.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/runtimes.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/runtimes.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/runtimes.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/runtimes.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/serial-libs.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/serial-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/manifest/serial-libs.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/manifest/serial-libs.tex
diff --git a/docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/steps.tex b/docs/recipes/install/sles12/aarch64/warewulf/slurm/steps.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/aarch64/warewulf/slurm/steps.tex
rename to docs/recipes/install/sles12/aarch64/warewulf/slurm/steps.tex
diff --git a/docs/recipes/install/sles12sp1/input.local.template b/docs/recipes/install/sles12/input.local.template
similarity index 100%
rename from docs/recipes/install/sles12sp1/input.local.template
rename to docs/recipes/install/sles12/input.local.template
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/.gitignore b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/.gitignore
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/.gitignore
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/.gitignore
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/Makefile b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/Makefile
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/Makefile
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/Makefile
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/common b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/common
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/common
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/common
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/manifest b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/manifest
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/manifest
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/manifest
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/manifest.tex b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/manifest.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/manifest.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/manifest.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/steps.tex b/docs/recipes/install/sles12/x86_64/warewulf/pbspro/steps.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/pbspro/steps.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/pbspro/steps.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/.gitignore b/docs/recipes/install/sles12/x86_64/warewulf/slurm/.gitignore
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/.gitignore
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/.gitignore
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/Makefile b/docs/recipes/install/sles12/x86_64/warewulf/slurm/Makefile
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/Makefile
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/Makefile
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/common b/docs/recipes/install/sles12/x86_64/warewulf/slurm/common
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/common
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/common
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/.gitignore b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/.gitignore
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/.gitignore
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/.gitignore
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/ChangeLog b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/ChangeLog
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/ChangeLog
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/ChangeLog
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/admin.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/admin.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/admin.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/admin.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/common b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/common
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/common
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/common
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/compiler-families.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/compiler-families.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/compiler-families.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/compiler-families.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/dev-tools.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/dev-tools.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/dev-tools.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/dev-tools.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/distro-packages.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/distro-packages.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/distro-packages.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/distro-packages.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/io-libs.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/io-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/io-libs.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/io-libs.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/lustre.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/lustre.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/lustre.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/lustre.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/mpi-families.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/mpi-families.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/mpi-families.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/mpi-families.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/parallel-libs.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/parallel-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/parallel-libs.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/parallel-libs.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pattern-ohpc.all b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pattern-ohpc.all
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/patterns.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/patterns.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/patterns.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/patterns.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/perf-tools.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/perf-tools.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/perf-tools.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/perf-tools.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.admin
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.all b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.all
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.compiler-families
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.dev-tools
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.distro-packages
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.io-libs
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.lustre
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.mpi-families
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.parallel-libs
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.perf-tools
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.provisioning
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.rms
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.runtimes
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/pkg-ohpc.serial-libs
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/provisioning.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/provisioning.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/provisioning.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/provisioning.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/rms.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/rms.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/rms.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/rms.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/runtimes.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/runtimes.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/runtimes.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/runtimes.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/serial-libs.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/serial-libs.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/serial-libs.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/serial-libs.tex
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/update_manifest.sh b/docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/update_manifest.sh
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/manifest/update_manifest.sh
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/manifest/update_manifest.sh
diff --git a/docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/steps.tex b/docs/recipes/install/sles12/x86_64/warewulf/slurm/steps.tex
similarity index 100%
rename from docs/recipes/install/sles12sp1/x86_64/warewulf/slurm/steps.tex
rename to docs/recipes/install/sles12/x86_64/warewulf/slurm/steps.tex