diff --git a/.github/workflows/cutadapt.yml b/.github/workflows/cutadapt.yml
index ba92681d..dfb15238 100644
--- a/.github/workflows/cutadapt.yml
+++ b/.github/workflows/cutadapt.yml
@@ -2,7 +2,7 @@ name: cutadapt
 on:
   push: {}
   pull_request:
-    paths: tools/cutadapt/*
+    paths: software/cutadapt/*
 
 jobs:
   run_ci_test:
@@ -25,10 +25,10 @@ jobs:
 
       - name: Test module with paired-end data
         run: |
-          cd tools/cutadapt/test_paired/
+          cd software/cutadapt/test_paired/
           nextflow run . -ansi-log false
 
       - name: Test module with single-end data
         run: |
-          cd tools/cutadapt/test_single/
+          cd software/cutadapt/test_single/
           nextflow run . -ansi-log false
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c4a39fe1..d63a83a3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,8 +5,8 @@ on:
     branches: master
     # Only if a conda environment file or a docker build file has been updated
     paths:
-      - tools/*/environment.yml
-      - tools/*/Dockerfile
+      - software/*/environment.yml
+      - software/*/Dockerfile
 
 jobs:
   build_docker:
@@ -36,7 +36,7 @@ jobs:
             echo $TOOL
           done;
           echo '-----'
-          for d in tools/*; do
+          for d in software/*; do
             for TOOL in $TOOLS; do
               echo "$d -- $TOOL"
               if echo $d/ | grep -q "$TOOL"; then
diff --git a/.github/workflows/fastqc.yml b/.github/workflows/fastqc.yml
index 9cfcfa55..4ddcbefe 100644
--- a/.github/workflows/fastqc.yml
+++ b/.github/workflows/fastqc.yml
@@ -2,7 +2,7 @@ name: FastQC
 on:
   push: {}
   pull_request:
-    paths: tools/fastqc/*
+    paths: software/fastqc/*
 
 jobs:
   run_ci_test:
@@ -20,4 +20,4 @@ jobs:
         sudo mv nextflow /usr/local/bin/
 
     # Test the module
-    - run: nextflow run ./tools/fastqc/test/ -ansi-log false
+    - run: nextflow run ./software/fastqc/test/ -ansi-log false
diff --git a/.github/workflows/samtools_index.yml b/.github/workflows/samtools_index.yml
index 302e0b6d..260c868d 100644
--- a/.github/workflows/samtools_index.yml
+++ b/.github/workflows/samtools_index.yml
@@ -2,7 +2,7 @@ name: samtools index
 on:
   push: {}
   pull_request:
-    paths: tools/samtools/index*
+    paths: software/samtools/index*
 
 jobs:
   run_ci_test:
@@ -20,4 +20,4 @@ jobs:
         sudo mv nextflow /usr/local/bin/
 
     # Test the module
-    - run: nextflow run ./tools/samtools/index/test/ -ansi-log false
+    - run: nextflow run ./software/samtools/index/test/ -ansi-log false
diff --git a/.github/workflows/samtools_sort.yml b/.github/workflows/samtools_sort.yml
index cc9ce4f8..b020dfbd 100644
--- a/.github/workflows/samtools_sort.yml
+++ b/.github/workflows/samtools_sort.yml
@@ -2,7 +2,7 @@ name: samtools sort
 on:
   push: {}
   pull_request:
-    paths: tools/samtools/sort*
+    paths: software/samtools/sort*
 
 jobs:
   run_ci_test:
@@ -20,4 +20,4 @@ jobs:
         sudo mv nextflow /usr/local/bin/
 
     # Test the module
-    - run: nextflow run ./tools/samtools/sort/test/ -ansi-log false
+    - run: nextflow run ./software/samtools/sort/test/ -ansi-log false
diff --git a/.github/workflows/tcoffee.yml b/.github/workflows/tcoffee.yml
index ab235e1b..7ec3431e 100644
--- a/.github/workflows/tcoffee.yml
+++ b/.github/workflows/tcoffee.yml
@@ -2,7 +2,7 @@ name: tcoffee
 on:
   push: {}
   pull_request:
-    paths: tools/tcoffee/*
+    paths: software/tcoffee/*
 
 jobs:
   run_ci_test:
@@ -26,5 +26,5 @@ jobs:
 
     # Test the module
     - run: |
-        cd tools/tcoffee/test/
+        cd software/tcoffee/test/
         nextflow run . -ansi-log false
diff --git a/.github/workflows/trim_galore.yml b/.github/workflows/trim_galore.yml
index d914313e..ae823971 100644
--- a/.github/workflows/trim_galore.yml
+++ b/.github/workflows/trim_galore.yml
@@ -2,7 +2,7 @@ name: Trim Galore!
 on:
   push: {}
   pull_request:
-    paths: tools/trim_galore/*
+    paths: software/trim_galore/*
 
 jobs:
   run_ci_test:
@@ -20,4 +20,4 @@ jobs:
         sudo mv nextflow /usr/local/bin/
 
     # Test the module
-    - run: nextflow run ./tools/trim_galore/test/ -ansi-log false
+    - run: nextflow run ./software/trim_galore/test/ -ansi-log false
diff --git a/assets/nf-core-modules_social_preview.png b/docs/images/nf-core-modules_social_preview.png
similarity index 100%
rename from assets/nf-core-modules_social_preview.png
rename to docs/images/nf-core-modules_social_preview.png
diff --git a/assets/nf-core-modules_social_preview.svg b/docs/images/nf-core-modules_social_preview.svg
similarity index 100%
rename from assets/nf-core-modules_social_preview.svg
rename to docs/images/nf-core-modules_social_preview.svg
diff --git a/tools/bowtie2/main.nf b/software/bowtie2/main.nf
similarity index 100%
rename from tools/bowtie2/main.nf
rename to software/bowtie2/main.nf
diff --git a/tools/bowtie2/meta.yml b/software/bowtie2/meta.yml
similarity index 100%
rename from tools/bowtie2/meta.yml
rename to software/bowtie2/meta.yml
diff --git a/tools/bowtie2/test/main.nf b/software/bowtie2/test/main.nf
similarity index 100%
rename from tools/bowtie2/test/main.nf
rename to software/bowtie2/test/main.nf
diff --git a/tools/bowtie2/test/nextflow.config b/software/bowtie2/test/nextflow.config
similarity index 100%
rename from tools/bowtie2/test/nextflow.config
rename to software/bowtie2/test/nextflow.config
diff --git a/tools/bwa/index/main.nf b/software/bwa/index/main.nf
similarity index 100%
rename from tools/bwa/index/main.nf
rename to software/bwa/index/main.nf
diff --git a/tools/bwa/index/meta.yml b/software/bwa/index/meta.yml
similarity index 100%
rename from tools/bwa/index/meta.yml
rename to software/bwa/index/meta.yml
diff --git a/tools/bwa/index/test/main.nf b/software/bwa/index/test/main.nf
similarity index 78%
rename from tools/bwa/index/test/main.nf
rename to software/bwa/index/test/main.nf
index 6acb4d61..8e36c9ac 100644
--- a/tools/bwa/index/test/main.nf
+++ b/software/bwa/index/test/main.nf
@@ -1,6 +1,6 @@
 #!/usr/bin/env nextflow
 nextflow.preview.dsl = 2
-include '../../../nf-core/module_testing/check_process_outputs.nf' params(params)
+include '../../../tests/functions/check_process_outputs.nf' params(params)
 include '../main.nf' params(params)
 
 // Define input channels
diff --git a/tools/bwa/index/test/nextflow.config b/software/bwa/index/test/nextflow.config
similarity index 100%
rename from tools/bwa/index/test/nextflow.config
rename to software/bwa/index/test/nextflow.config
diff --git a/tools/bwa/mem/Dockerfile b/software/bwa/mem/Dockerfile
similarity index 100%
rename from tools/bwa/mem/Dockerfile
rename to software/bwa/mem/Dockerfile
diff --git a/tools/bwa/mem/environment.yml b/software/bwa/mem/environment.yml
similarity index 100%
rename from tools/bwa/mem/environment.yml
rename to software/bwa/mem/environment.yml
diff --git a/tools/bwa/mem/main.nf b/software/bwa/mem/main.nf
similarity index 100%
rename from tools/bwa/mem/main.nf
rename to software/bwa/mem/main.nf
diff --git a/tools/bwa/mem/meta.yml b/software/bwa/mem/meta.yml
similarity index 100%
rename from tools/bwa/mem/meta.yml
rename to software/bwa/mem/meta.yml
diff --git a/tools/bwa/mem/test/main.nf b/software/bwa/mem/test/main.nf
similarity index 80%
rename from tools/bwa/mem/test/main.nf
rename to software/bwa/mem/test/main.nf
index 49ec1efc..3a609477 100644
--- a/tools/bwa/mem/test/main.nf
+++ b/software/bwa/mem/test/main.nf
@@ -1,6 +1,6 @@
 #!/usr/bin/env nextflow
 nextflow.preview.dsl = 2
-include '../../../../nf-core/module_testing/check_process_outputs.nf' params(params)
+include '../../../../tests/functions/check_process_outputs.nf' params(params)
 include '../main.nf' params(params)
 
 reads = '../../../../test-datasets/tools/bwa/mem/reads/*_R{1,2}_001.fastq.gz'
diff --git a/tools/bwa/mem/test/nextflow.config b/software/bwa/mem/test/nextflow.config
similarity index 100%
rename from tools/bwa/mem/test/nextflow.config
rename to software/bwa/mem/test/nextflow.config
diff --git a/tools/cutadapt/main.nf b/software/cutadapt/main.nf
similarity index 100%
rename from tools/cutadapt/main.nf
rename to software/cutadapt/main.nf
diff --git a/tools/cutadapt/meta.yml b/software/cutadapt/meta.yml
similarity index 100%
rename from tools/cutadapt/meta.yml
rename to software/cutadapt/meta.yml
diff --git a/tools/cutadapt/test_paired/main.nf b/software/cutadapt/test_paired/main.nf
similarity index 100%
rename from tools/cutadapt/test_paired/main.nf
rename to software/cutadapt/test_paired/main.nf
diff --git a/tools/cutadapt/test_paired/nextflow.config b/software/cutadapt/test_paired/nextflow.config
similarity index 100%
rename from tools/cutadapt/test_paired/nextflow.config
rename to software/cutadapt/test_paired/nextflow.config
diff --git a/tools/cutadapt/test_single/main.nf b/software/cutadapt/test_single/main.nf
similarity index 100%
rename from tools/cutadapt/test_single/main.nf
rename to software/cutadapt/test_single/main.nf
diff --git a/tools/cutadapt/test_single/nextflow.config b/software/cutadapt/test_single/nextflow.config
similarity index 100%
rename from tools/cutadapt/test_single/nextflow.config
rename to software/cutadapt/test_single/nextflow.config
diff --git a/tools/fastq_screen/main.nf b/software/fastq_screen/main.nf
similarity index 100%
rename from tools/fastq_screen/main.nf
rename to software/fastq_screen/main.nf
diff --git a/tools/fastq_screen/meta.yml b/software/fastq_screen/meta.yml
similarity index 100%
rename from tools/fastq_screen/meta.yml
rename to software/fastq_screen/meta.yml
diff --git a/tools/fastq_screen/test/main.nf b/software/fastq_screen/test/main.nf
similarity index 90%
rename from tools/fastq_screen/test/main.nf
rename to software/fastq_screen/test/main.nf
index be2b486e..4365bf55 100755
--- a/tools/fastq_screen/test/main.nf
+++ b/software/fastq_screen/test/main.nf
@@ -12,7 +12,7 @@ if (params.verbose){
     println ("[WORKFLOW] FASTQ SCREEN ARGS ARE: " + params.fastq_screen_args)
 }
 
-// TODO: include '../../../nf-core/module_testing/check_process_outputs.nf'
+// TODO: include '../../../tests/functions/check_process_outputs.nf'
 include '../main.nf'
 
 // Define input channels
diff --git a/tools/fastq_screen/test/nextflow.config b/software/fastq_screen/test/nextflow.config
similarity index 100%
rename from tools/fastq_screen/test/nextflow.config
rename to software/fastq_screen/test/nextflow.config
diff --git a/tools/fastqc/Dockerfile b/software/fastqc/Dockerfile
similarity index 100%
rename from tools/fastqc/Dockerfile
rename to software/fastqc/Dockerfile
diff --git a/tools/fastqc/environment.yml b/software/fastqc/environment.yml
similarity index 100%
rename from tools/fastqc/environment.yml
rename to software/fastqc/environment.yml
diff --git a/tools/fastqc/main.nf b/software/fastqc/main.nf
similarity index 100%
rename from tools/fastqc/main.nf
rename to software/fastqc/main.nf
diff --git a/tools/fastqc/meta.yml b/software/fastqc/meta.yml
similarity index 100%
rename from tools/fastqc/meta.yml
rename to software/fastqc/meta.yml
diff --git a/tools/fastqc/test/main.nf b/software/fastqc/test/main.nf
similarity index 89%
rename from tools/fastqc/test/main.nf
rename to software/fastqc/test/main.nf
index 9ec2d338..a740dbe5 100755
--- a/tools/fastqc/test/main.nf
+++ b/software/fastqc/test/main.nf
@@ -6,7 +6,7 @@ params.fastqc_args = ''
 params.verbose = false
 
 // TODO: check the output files in some way
-// include '../../../nf-core/module_testing/check_process_outputs.nf'
+// include '../../../tests/functions/check_process_outputs.nf'
 include '../main.nf'
 
 // Define input channels
diff --git a/tools/fastqc/test/nextflow.config b/software/fastqc/test/nextflow.config
similarity index 100%
rename from tools/fastqc/test/nextflow.config
rename to software/fastqc/test/nextflow.config
diff --git a/tools/gatk/dict/main.nf b/software/gatk/dict/main.nf
similarity index 100%
rename from tools/gatk/dict/main.nf
rename to software/gatk/dict/main.nf
diff --git a/tools/gatk/dict/meta.yml b/software/gatk/dict/meta.yml
similarity index 100%
rename from tools/gatk/dict/meta.yml
rename to software/gatk/dict/meta.yml
diff --git a/tools/gatk/dict/test/main.nf b/software/gatk/dict/test/main.nf
similarity index 76%
rename from tools/gatk/dict/test/main.nf
rename to software/gatk/dict/test/main.nf
index 41c1862c..c1005d37 100644
--- a/tools/gatk/dict/test/main.nf
+++ b/software/gatk/dict/test/main.nf
@@ -1,6 +1,6 @@
 #!/usr/bin/env nextflow
 nextflow.preview.dsl = 2
-include '../../../nf-core/module_testing/check_process_outputs.nf' params(params)
+include '../../../tests/functions/check_process_outputs.nf' params(params)
 include '../main.nf' params(params)
 
 // Define input channels
diff --git a/tools/gatk/dict/test/nextflow.config b/software/gatk/dict/test/nextflow.config
similarity index 100%
rename from tools/gatk/dict/test/nextflow.config
rename to software/gatk/dict/test/nextflow.config
diff --git a/tools/hisat2/main.nf b/software/hisat2/main.nf
similarity index 100%
rename from tools/hisat2/main.nf
rename to software/hisat2/main.nf
diff --git a/tools/hisat2/meta.yml b/software/hisat2/meta.yml
similarity index 100%
rename from tools/hisat2/meta.yml
rename to software/hisat2/meta.yml
diff --git a/tools/hisat2/test/main.nf b/software/hisat2/test/main.nf
similarity index 100%
rename from tools/hisat2/test/main.nf
rename to software/hisat2/test/main.nf
diff --git a/tools/hisat2/test/nextflow.config b/software/hisat2/test/nextflow.config
similarity index 100%
rename from tools/hisat2/test/nextflow.config
rename to software/hisat2/test/nextflow.config
diff --git a/tools/htslib/tabix/main.nf b/software/htslib/tabix/main.nf
similarity index 100%
rename from tools/htslib/tabix/main.nf
rename to software/htslib/tabix/main.nf
diff --git a/tools/htslib/tabix/meta.yml b/software/htslib/tabix/meta.yml
similarity index 100%
rename from tools/htslib/tabix/meta.yml
rename to software/htslib/tabix/meta.yml
diff --git a/tools/htslib/tabix/test/main.nf b/software/htslib/tabix/test/main.nf
similarity index 75%
rename from tools/htslib/tabix/test/main.nf
rename to software/htslib/tabix/test/main.nf
index 6fd80089..478d38f5 100644
--- a/tools/htslib/tabix/test/main.nf
+++ b/software/htslib/tabix/test/main.nf
@@ -1,6 +1,6 @@
 #!/usr/bin/env nextflow
 nextflow.preview.dsl = 2
-include '../../../nf-core/module_testing/check_process_outputs.nf' params(params)
+include '../../../tests/functions/check_process_outputs.nf' params(params)
 include '../main.nf' params(params)
 
 // Define input channels
diff --git a/tools/htslib/tabix/test/nextflow.config b/software/htslib/tabix/test/nextflow.config
similarity index 100%
rename from tools/htslib/tabix/test/nextflow.config
rename to software/htslib/tabix/test/nextflow.config
diff --git a/tools/multiqc/main.nf b/software/multiqc/main.nf
similarity index 100%
rename from tools/multiqc/main.nf
rename to software/multiqc/main.nf
diff --git a/tools/multiqc/meta.yml b/software/multiqc/meta.yml
similarity index 100%
rename from tools/multiqc/meta.yml
rename to software/multiqc/meta.yml
diff --git a/tools/multiqc/test/main.nf b/software/multiqc/test/main.nf
similarity index 95%
rename from tools/multiqc/test/main.nf
rename to software/multiqc/test/main.nf
index 6e630211..dbfc3c98 100755
--- a/tools/multiqc/test/main.nf
+++ b/software/multiqc/test/main.nf
@@ -5,7 +5,7 @@ params.outdir = "."
 params.verbose = false
 params.multiqc_args = ''
 
-// include '../../../nf-core/module_testing/check_process_outputs.nf'
+// include '../../../tests/functions/check_process_outputs.nf'
 include '../main.nf'
 
 if (params.verbose){
diff --git a/tools/multiqc/test/nextflow.config b/software/multiqc/test/nextflow.config
similarity index 100%
rename from tools/multiqc/test/nextflow.config
rename to software/multiqc/test/nextflow.config
diff --git a/tools/samtools/Dockerfile b/software/samtools/Dockerfile
similarity index 100%
rename from tools/samtools/Dockerfile
rename to software/samtools/Dockerfile
diff --git a/tools/samtools/environment.yml b/software/samtools/environment.yml
similarity index 100%
rename from tools/samtools/environment.yml
rename to software/samtools/environment.yml
diff --git a/tools/samtools/faidx/main.nf b/software/samtools/faidx/main.nf
similarity index 100%
rename from tools/samtools/faidx/main.nf
rename to software/samtools/faidx/main.nf
diff --git a/tools/samtools/faidx/meta.yml b/software/samtools/faidx/meta.yml
similarity index 100%
rename from tools/samtools/faidx/meta.yml
rename to software/samtools/faidx/meta.yml
diff --git a/tools/samtools/faidx/test/main.nf b/software/samtools/faidx/test/main.nf
similarity index 76%
rename from tools/samtools/faidx/test/main.nf
rename to software/samtools/faidx/test/main.nf
index f01ab6c9..39ad118c 100644
--- a/tools/samtools/faidx/test/main.nf
+++ b/software/samtools/faidx/test/main.nf
@@ -1,6 +1,6 @@
 #!/usr/bin/env nextflow
 nextflow.preview.dsl = 2
-include '../../../nf-core/module_testing/check_process_outputs.nf' params(params)
+include '../../../tests/functions/check_process_outputs.nf' params(params)
 include '../main.nf' params(params)
 
 // Define input channels
diff --git a/tools/samtools/faidx/test/nextflow.config b/software/samtools/faidx/test/nextflow.config
similarity index 100%
rename from tools/samtools/faidx/test/nextflow.config
rename to software/samtools/faidx/test/nextflow.config
diff --git a/tools/samtools/index/main.nf b/software/samtools/index/main.nf
similarity index 100%
rename from tools/samtools/index/main.nf
rename to software/samtools/index/main.nf
diff --git a/tools/samtools/index/meta.yml b/software/samtools/index/meta.yml
similarity index 100%
rename from tools/samtools/index/meta.yml
rename to software/samtools/index/meta.yml
diff --git a/tools/samtools/index/test/main.nf b/software/samtools/index/test/main.nf
similarity index 100%
rename from tools/samtools/index/test/main.nf
rename to software/samtools/index/test/main.nf
diff --git a/tools/samtools/index/test/nextflow.config b/software/samtools/index/test/nextflow.config
similarity index 100%
rename from tools/samtools/index/test/nextflow.config
rename to software/samtools/index/test/nextflow.config
diff --git a/tools/samtools/sort/main.nf b/software/samtools/sort/main.nf
similarity index 100%
rename from tools/samtools/sort/main.nf
rename to software/samtools/sort/main.nf
diff --git a/tools/samtools/sort/meta.yml b/software/samtools/sort/meta.yml
similarity index 100%
rename from tools/samtools/sort/meta.yml
rename to software/samtools/sort/meta.yml
diff --git a/tools/samtools/sort/test/main.nf b/software/samtools/sort/test/main.nf
similarity index 100%
rename from tools/samtools/sort/test/main.nf
rename to software/samtools/sort/test/main.nf
diff --git a/tools/samtools/sort/test/nextflow.config b/software/samtools/sort/test/nextflow.config
similarity index 100%
rename from tools/samtools/sort/test/nextflow.config
rename to software/samtools/sort/test/nextflow.config
diff --git a/tools/shovill/main.nf b/software/shovill/main.nf
similarity index 100%
rename from tools/shovill/main.nf
rename to software/shovill/main.nf
diff --git a/tools/shovill/meta.yml b/software/shovill/meta.yml
similarity index 100%
rename from tools/shovill/meta.yml
rename to software/shovill/meta.yml
diff --git a/tools/shovill/test/main.nf b/software/shovill/test/main.nf
similarity index 100%
rename from tools/shovill/test/main.nf
rename to software/shovill/test/main.nf
diff --git a/tools/shovill/test/nextflow.config b/software/shovill/test/nextflow.config
similarity index 100%
rename from tools/shovill/test/nextflow.config
rename to software/shovill/test/nextflow.config
diff --git a/tools/tcoffee/main.nf b/software/tcoffee/main.nf
similarity index 100%
rename from tools/tcoffee/main.nf
rename to software/tcoffee/main.nf
diff --git a/tools/tcoffee/meta.yml b/software/tcoffee/meta.yml
similarity index 100%
rename from tools/tcoffee/meta.yml
rename to software/tcoffee/meta.yml
diff --git a/tools/tcoffee/test/main.nf b/software/tcoffee/test/main.nf
similarity index 74%
rename from tools/tcoffee/test/main.nf
rename to software/tcoffee/test/main.nf
index 92df03d2..26fd68f2 100644
--- a/tools/tcoffee/test/main.nf
+++ b/software/tcoffee/test/main.nf
@@ -2,7 +2,7 @@
 
 nextflow.preview.dsl = 2
 
-include check_output from  '../../../nf-core/module_testing/check_process_outputs.nf'
+include check_output from  '../../../tests/functions/check_process_outputs.nf'
 include tcoffee from '../main.nf'
 
 // Define input channels
@@ -13,8 +13,3 @@ workflow {
     tcoffee(fasta)
     // .check_output()
 }
-
-
-
-
-
diff --git a/tools/tcoffee/test/nextflow.config b/software/tcoffee/test/nextflow.config
similarity index 100%
rename from tools/tcoffee/test/nextflow.config
rename to software/tcoffee/test/nextflow.config
diff --git a/tools/trim_galore/Dockerfile b/software/trim_galore/Dockerfile
similarity index 100%
rename from tools/trim_galore/Dockerfile
rename to software/trim_galore/Dockerfile
diff --git a/tools/trim_galore/environment.yml b/software/trim_galore/environment.yml
similarity index 100%
rename from tools/trim_galore/environment.yml
rename to software/trim_galore/environment.yml
diff --git a/tools/trim_galore/main.nf b/software/trim_galore/main.nf
similarity index 100%
rename from tools/trim_galore/main.nf
rename to software/trim_galore/main.nf
diff --git a/tools/trim_galore/meta.yml b/software/trim_galore/meta.yml
similarity index 100%
rename from tools/trim_galore/meta.yml
rename to software/trim_galore/meta.yml
diff --git a/tools/trim_galore/test/main.nf b/software/trim_galore/test/main.nf
similarity index 92%
rename from tools/trim_galore/test/main.nf
rename to software/trim_galore/test/main.nf
index 7f49567f..5d1183a3 100755
--- a/tools/trim_galore/test/main.nf
+++ b/software/trim_galore/test/main.nf
@@ -12,7 +12,7 @@ if (params.verbose){
 }
 
 // TODO: check the output files in some way
-// include '../../../nf-core/module_testing/check_process_outputs.nf'
+// include '../../../tests/functions/check_process_outputs.nf'
 include '../main.nf'  // params (clip_r1: 6, clip_r2: 10) // how to pass additional parameters
 
 ch_read_files = Channel
diff --git a/tools/trim_galore/test/nextflow.config b/software/trim_galore/test/nextflow.config
similarity index 100%
rename from tools/trim_galore/test/nextflow.config
rename to software/trim_galore/test/nextflow.config
diff --git a/tools/umi_tools/Dockerfile b/software/umi_tools/Dockerfile
similarity index 100%
rename from tools/umi_tools/Dockerfile
rename to software/umi_tools/Dockerfile
diff --git a/tools/umi_tools/environment.yml b/software/umi_tools/environment.yml
similarity index 100%
rename from tools/umi_tools/environment.yml
rename to software/umi_tools/environment.yml
diff --git a/tools/umi_tools/main.nf b/software/umi_tools/main.nf
similarity index 100%
rename from tools/umi_tools/main.nf
rename to software/umi_tools/main.nf
diff --git a/tools/umi_tools/test/input/sample1.bai b/software/umi_tools/test/input/sample1.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample1.bai
rename to software/umi_tools/test/input/sample1.bai
diff --git a/tools/umi_tools/test/input/sample1.bam b/software/umi_tools/test/input/sample1.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample1.bam
rename to software/umi_tools/test/input/sample1.bam
diff --git a/tools/umi_tools/test/input/sample2.bai b/software/umi_tools/test/input/sample2.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample2.bai
rename to software/umi_tools/test/input/sample2.bai
diff --git a/tools/umi_tools/test/input/sample2.bam b/software/umi_tools/test/input/sample2.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample2.bam
rename to software/umi_tools/test/input/sample2.bam
diff --git a/tools/umi_tools/test/input/sample3.bai b/software/umi_tools/test/input/sample3.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample3.bai
rename to software/umi_tools/test/input/sample3.bai
diff --git a/tools/umi_tools/test/input/sample3.bam b/software/umi_tools/test/input/sample3.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample3.bam
rename to software/umi_tools/test/input/sample3.bam
diff --git a/tools/umi_tools/test/input/sample4.bai b/software/umi_tools/test/input/sample4.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample4.bai
rename to software/umi_tools/test/input/sample4.bai
diff --git a/tools/umi_tools/test/input/sample4.bam b/software/umi_tools/test/input/sample4.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample4.bam
rename to software/umi_tools/test/input/sample4.bam
diff --git a/tools/umi_tools/test/input/sample5.bai b/software/umi_tools/test/input/sample5.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample5.bai
rename to software/umi_tools/test/input/sample5.bai
diff --git a/tools/umi_tools/test/input/sample5.bam b/software/umi_tools/test/input/sample5.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample5.bam
rename to software/umi_tools/test/input/sample5.bam
diff --git a/tools/umi_tools/test/input/sample6.bai b/software/umi_tools/test/input/sample6.bai
similarity index 100%
rename from tools/umi_tools/test/input/sample6.bai
rename to software/umi_tools/test/input/sample6.bai
diff --git a/tools/umi_tools/test/input/sample6.bam b/software/umi_tools/test/input/sample6.bam
similarity index 100%
rename from tools/umi_tools/test/input/sample6.bam
rename to software/umi_tools/test/input/sample6.bam
diff --git a/tools/umi_tools/test/main.nf b/software/umi_tools/test/main.nf
similarity index 100%
rename from tools/umi_tools/test/main.nf
rename to software/umi_tools/test/main.nf
diff --git a/tools/umi_tools/test/nextflow.config b/software/umi_tools/test/nextflow.config
similarity index 100%
rename from tools/umi_tools/test/nextflow.config
rename to software/umi_tools/test/nextflow.config
diff --git a/tools/umi_tools/test/verify-checksum.sh b/software/umi_tools/test/verify-checksum.sh
similarity index 100%
rename from tools/umi_tools/test/verify-checksum.sh
rename to software/umi_tools/test/verify-checksum.sh
diff --git a/tools/umi_tools/umi_tools.yml b/software/umi_tools/umi_tools.yml
similarity index 100%
rename from tools/umi_tools/umi_tools.yml
rename to software/umi_tools/umi_tools.yml
diff --git a/nf-core/module_testing/check_process_outputs.nf b/tests/functions/check_process_outputs.nf
similarity index 100%
rename from nf-core/module_testing/check_process_outputs.nf
rename to tests/functions/check_process_outputs.nf