diff --git a/src/docker_modules/Bowtie2/bowtie2.config b/src/nf_modules/Bowtie2/bowtie2.config
similarity index 100%
rename from src/docker_modules/Bowtie2/bowtie2.config
rename to src/nf_modules/Bowtie2/bowtie2.config
diff --git a/src/docker_modules/Bowtie2/bowtie2.nf b/src/nf_modules/Bowtie2/bowtie2.nf
similarity index 100%
rename from src/docker_modules/Bowtie2/bowtie2.nf
rename to src/nf_modules/Bowtie2/bowtie2.nf
diff --git a/src/docker_modules/Bowtie2/tests/index.nf b/src/nf_modules/Bowtie2/tests/index.nf
similarity index 100%
rename from src/docker_modules/Bowtie2/tests/index.nf
rename to src/nf_modules/Bowtie2/tests/index.nf
diff --git a/src/docker_modules/Bowtie2/tests/mapping_paired.nf b/src/nf_modules/Bowtie2/tests/mapping_paired.nf
similarity index 100%
rename from src/docker_modules/Bowtie2/tests/mapping_paired.nf
rename to src/nf_modules/Bowtie2/tests/mapping_paired.nf
diff --git a/src/docker_modules/Bowtie2/tests/mapping_single.nf b/src/nf_modules/Bowtie2/tests/mapping_single.nf
similarity index 100%
rename from src/docker_modules/Bowtie2/tests/mapping_single.nf
rename to src/nf_modules/Bowtie2/tests/mapping_single.nf
diff --git a/src/docker_modules/HTSeq/htseq.config b/src/nf_modules/HTSeq/htseq.config
similarity index 100%
rename from src/docker_modules/HTSeq/htseq.config
rename to src/nf_modules/HTSeq/htseq.config
diff --git a/src/docker_modules/HTSeq/htseq.nf b/src/nf_modules/HTSeq/htseq.nf
similarity index 100%
rename from src/docker_modules/HTSeq/htseq.nf
rename to src/nf_modules/HTSeq/htseq.nf
diff --git a/src/docker_modules/HTSeq/tests/counting.nf b/src/nf_modules/HTSeq/tests/counting.nf
similarity index 100%
rename from src/docker_modules/HTSeq/tests/counting.nf
rename to src/nf_modules/HTSeq/tests/counting.nf
diff --git a/src/docker_modules/Kallisto/kallisto.config b/src/nf_modules/Kallisto/kallisto.config
similarity index 100%
rename from src/docker_modules/Kallisto/kallisto.config
rename to src/nf_modules/Kallisto/kallisto.config
diff --git a/src/docker_modules/Kallisto/kallisto.nf b/src/nf_modules/Kallisto/kallisto.nf
similarity index 100%
rename from src/docker_modules/Kallisto/kallisto.nf
rename to src/nf_modules/Kallisto/kallisto.nf
diff --git a/src/docker_modules/Kallisto/tests/index.nf b/src/nf_modules/Kallisto/tests/index.nf
similarity index 100%
rename from src/docker_modules/Kallisto/tests/index.nf
rename to src/nf_modules/Kallisto/tests/index.nf
diff --git a/src/docker_modules/Kallisto/tests/mapping_paired.nf b/src/nf_modules/Kallisto/tests/mapping_paired.nf
similarity index 100%
rename from src/docker_modules/Kallisto/tests/mapping_paired.nf
rename to src/nf_modules/Kallisto/tests/mapping_paired.nf
diff --git a/src/docker_modules/Kallisto/tests/mapping_single.nf b/src/nf_modules/Kallisto/tests/mapping_single.nf
similarity index 100%
rename from src/docker_modules/Kallisto/tests/mapping_single.nf
rename to src/nf_modules/Kallisto/tests/mapping_single.nf
diff --git a/src/docker_modules/RSEM/rsem.config b/src/nf_modules/RSEM/rsem.config
similarity index 100%
rename from src/docker_modules/RSEM/rsem.config
rename to src/nf_modules/RSEM/rsem.config
diff --git a/src/docker_modules/RSEM/rsem.nf b/src/nf_modules/RSEM/rsem.nf
similarity index 100%
rename from src/docker_modules/RSEM/rsem.nf
rename to src/nf_modules/RSEM/rsem.nf
diff --git a/src/docker_modules/RSEM/tests/index.nf b/src/nf_modules/RSEM/tests/index.nf
similarity index 100%
rename from src/docker_modules/RSEM/tests/index.nf
rename to src/nf_modules/RSEM/tests/index.nf
diff --git a/src/docker_modules/RSEM/tests/quantification_paired.nf b/src/nf_modules/RSEM/tests/quantification_paired.nf
similarity index 100%
rename from src/docker_modules/RSEM/tests/quantification_paired.nf
rename to src/nf_modules/RSEM/tests/quantification_paired.nf
diff --git a/src/docker_modules/RSEM/tests/quantification_single.nf b/src/nf_modules/RSEM/tests/quantification_single.nf
similarity index 100%
rename from src/docker_modules/RSEM/tests/quantification_single.nf
rename to src/nf_modules/RSEM/tests/quantification_single.nf
diff --git a/src/docker_modules/SAMtools/samtools.config b/src/nf_modules/SAMtools/samtools.config
similarity index 100%
rename from src/docker_modules/SAMtools/samtools.config
rename to src/nf_modules/SAMtools/samtools.config
diff --git a/src/docker_modules/SAMtools/samtools.nf b/src/nf_modules/SAMtools/samtools.nf
similarity index 100%
rename from src/docker_modules/SAMtools/samtools.nf
rename to src/nf_modules/SAMtools/samtools.nf
diff --git a/src/docker_modules/SAMtools/tests/filter_bams.nf b/src/nf_modules/SAMtools/tests/filter_bams.nf
similarity index 100%
rename from src/docker_modules/SAMtools/tests/filter_bams.nf
rename to src/nf_modules/SAMtools/tests/filter_bams.nf
diff --git a/src/docker_modules/SAMtools/tests/index_bams.nf b/src/nf_modules/SAMtools/tests/index_bams.nf
similarity index 100%
rename from src/docker_modules/SAMtools/tests/index_bams.nf
rename to src/nf_modules/SAMtools/tests/index_bams.nf
diff --git a/src/docker_modules/SAMtools/tests/sort_bams.nf b/src/nf_modules/SAMtools/tests/sort_bams.nf
similarity index 100%
rename from src/docker_modules/SAMtools/tests/sort_bams.nf
rename to src/nf_modules/SAMtools/tests/sort_bams.nf
diff --git a/src/docker_modules/SAMtools/tests/split_bams.nf b/src/nf_modules/SAMtools/tests/split_bams.nf
similarity index 100%
rename from src/docker_modules/SAMtools/tests/split_bams.nf
rename to src/nf_modules/SAMtools/tests/split_bams.nf
diff --git a/src/docker_modules/UrQt/tests/trimming_paired.nf b/src/nf_modules/UrQt/tests/trimming_paired.nf
similarity index 100%
rename from src/docker_modules/UrQt/tests/trimming_paired.nf
rename to src/nf_modules/UrQt/tests/trimming_paired.nf
diff --git a/src/docker_modules/UrQt/tests/trimming_single.nf b/src/nf_modules/UrQt/tests/trimming_single.nf
similarity index 100%
rename from src/docker_modules/UrQt/tests/trimming_single.nf
rename to src/nf_modules/UrQt/tests/trimming_single.nf
diff --git a/src/docker_modules/UrQt/urqt.config b/src/nf_modules/UrQt/urqt.config
similarity index 100%
rename from src/docker_modules/UrQt/urqt.config
rename to src/nf_modules/UrQt/urqt.config
diff --git a/src/docker_modules/UrQt/urqt.nf b/src/nf_modules/UrQt/urqt.nf
similarity index 100%
rename from src/docker_modules/UrQt/urqt.nf
rename to src/nf_modules/UrQt/urqt.nf
diff --git a/src/docker_modules/cutadapt/cutadapt.config b/src/nf_modules/cutadapt/cutadapt.config
similarity index 100%
rename from src/docker_modules/cutadapt/cutadapt.config
rename to src/nf_modules/cutadapt/cutadapt.config
diff --git a/src/docker_modules/cutadapt/cutadapt.nf b/src/nf_modules/cutadapt/cutadapt.nf
similarity index 100%
rename from src/docker_modules/cutadapt/cutadapt.nf
rename to src/nf_modules/cutadapt/cutadapt.nf
diff --git a/src/docker_modules/cutadapt/tests/adaptor_removal_paired.nf b/src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf
similarity index 100%
rename from src/docker_modules/cutadapt/tests/adaptor_removal_paired.nf
rename to src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf
diff --git a/src/docker_modules/cutadapt/tests/adaptor_removal_single.nf b/src/nf_modules/cutadapt/tests/adaptor_removal_single.nf
similarity index 100%
rename from src/docker_modules/cutadapt/tests/adaptor_removal_single.nf
rename to src/nf_modules/cutadapt/tests/adaptor_removal_single.nf
diff --git a/src/docker_modules/cutadapt/tests/trimming_paired.nf b/src/nf_modules/cutadapt/tests/trimming_paired.nf
similarity index 100%
rename from src/docker_modules/cutadapt/tests/trimming_paired.nf
rename to src/nf_modules/cutadapt/tests/trimming_paired.nf
diff --git a/src/docker_modules/cutadapt/tests/trimming_single.nf b/src/nf_modules/cutadapt/tests/trimming_single.nf
similarity index 100%
rename from src/docker_modules/cutadapt/tests/trimming_single.nf
rename to src/nf_modules/cutadapt/tests/trimming_single.nf