diff --git a/src/docker_modules/nf_modules/BEDtools/2.25.0/Dockerfile b/src/docker_modules/BEDtools/2.25.0/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/BEDtools/2.25.0/Dockerfile rename to src/docker_modules/BEDtools/2.25.0/Dockerfile diff --git a/src/docker_modules/nf_modules/BEDtools/2.25.0/docker_init.sh b/src/docker_modules/BEDtools/2.25.0/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/BEDtools/2.25.0/docker_init.sh rename to src/docker_modules/BEDtools/2.25.0/docker_init.sh diff --git a/src/docker_modules/nf_modules/Bowtie2/2.3.4.1/Dockerfile b/src/docker_modules/Bowtie2/2.3.4.1/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/2.3.4.1/Dockerfile rename to src/docker_modules/Bowtie2/2.3.4.1/Dockerfile diff --git a/src/docker_modules/nf_modules/Bowtie2/2.3.4.1/docker_init.sh b/src/docker_modules/Bowtie2/2.3.4.1/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/2.3.4.1/docker_init.sh rename to src/docker_modules/Bowtie2/2.3.4.1/docker_init.sh diff --git a/src/docker_modules/nf_modules/Bowtie2/bowtie2.config b/src/docker_modules/Bowtie2/bowtie2.config similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/bowtie2.config rename to src/docker_modules/Bowtie2/bowtie2.config diff --git a/src/docker_modules/nf_modules/Bowtie2/bowtie2.nf b/src/docker_modules/Bowtie2/bowtie2.nf similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/bowtie2.nf rename to src/docker_modules/Bowtie2/bowtie2.nf diff --git a/src/docker_modules/nf_modules/Bowtie2/tests/index.nf b/src/docker_modules/Bowtie2/tests/index.nf similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/tests/index.nf rename to src/docker_modules/Bowtie2/tests/index.nf diff --git a/src/docker_modules/nf_modules/Bowtie2/tests/mapping_paired.nf b/src/docker_modules/Bowtie2/tests/mapping_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/tests/mapping_paired.nf rename to src/docker_modules/Bowtie2/tests/mapping_paired.nf diff --git a/src/docker_modules/nf_modules/Bowtie2/tests/mapping_single.nf b/src/docker_modules/Bowtie2/tests/mapping_single.nf similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/tests/mapping_single.nf rename to src/docker_modules/Bowtie2/tests/mapping_single.nf diff --git a/src/docker_modules/nf_modules/Bowtie2/tests/tests.sh b/src/docker_modules/Bowtie2/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/Bowtie2/tests/tests.sh rename to src/docker_modules/Bowtie2/tests/tests.sh diff --git a/src/docker_modules/nf_modules/FastQC/0.11.5/Dockerfile b/src/docker_modules/FastQC/0.11.5/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/FastQC/0.11.5/Dockerfile rename to src/docker_modules/FastQC/0.11.5/Dockerfile diff --git a/src/docker_modules/nf_modules/FastQC/0.11.5/docker_init.sh b/src/docker_modules/FastQC/0.11.5/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/FastQC/0.11.5/docker_init.sh rename to src/docker_modules/FastQC/0.11.5/docker_init.sh diff --git a/src/docker_modules/nf_modules/HTSeq/0.8.0/Dockerfile b/src/docker_modules/HTSeq/0.8.0/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/0.8.0/Dockerfile rename to src/docker_modules/HTSeq/0.8.0/Dockerfile diff --git a/src/docker_modules/nf_modules/HTSeq/0.8.0/docker_init.sh b/src/docker_modules/HTSeq/0.8.0/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/0.8.0/docker_init.sh rename to src/docker_modules/HTSeq/0.8.0/docker_init.sh diff --git a/src/docker_modules/nf_modules/HTSeq/htseq.config b/src/docker_modules/HTSeq/htseq.config similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/htseq.config rename to src/docker_modules/HTSeq/htseq.config diff --git a/src/docker_modules/nf_modules/HTSeq/htseq.nf b/src/docker_modules/HTSeq/htseq.nf similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/htseq.nf rename to src/docker_modules/HTSeq/htseq.nf diff --git a/src/docker_modules/nf_modules/HTSeq/tests/counting.nf b/src/docker_modules/HTSeq/tests/counting.nf similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/tests/counting.nf rename to src/docker_modules/HTSeq/tests/counting.nf diff --git a/src/docker_modules/nf_modules/HTSeq/tests/tests.sh b/src/docker_modules/HTSeq/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/HTSeq/tests/tests.sh rename to src/docker_modules/HTSeq/tests/tests.sh diff --git a/src/docker_modules/nf_modules/Kallisto/0.43.1/Dockerfile b/src/docker_modules/Kallisto/0.43.1/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/0.43.1/Dockerfile rename to src/docker_modules/Kallisto/0.43.1/Dockerfile diff --git a/src/docker_modules/nf_modules/Kallisto/0.43.1/docker_init.sh b/src/docker_modules/Kallisto/0.43.1/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/0.43.1/docker_init.sh rename to src/docker_modules/Kallisto/0.43.1/docker_init.sh diff --git a/src/docker_modules/nf_modules/Kallisto/kallisto.config b/src/docker_modules/Kallisto/kallisto.config similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/kallisto.config rename to src/docker_modules/Kallisto/kallisto.config diff --git a/src/docker_modules/nf_modules/Kallisto/kallisto.nf b/src/docker_modules/Kallisto/kallisto.nf similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/kallisto.nf rename to src/docker_modules/Kallisto/kallisto.nf diff --git a/src/docker_modules/nf_modules/Kallisto/tests/index.nf b/src/docker_modules/Kallisto/tests/index.nf similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/tests/index.nf rename to src/docker_modules/Kallisto/tests/index.nf diff --git a/src/docker_modules/nf_modules/Kallisto/tests/mapping_paired.nf b/src/docker_modules/Kallisto/tests/mapping_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/tests/mapping_paired.nf rename to src/docker_modules/Kallisto/tests/mapping_paired.nf diff --git a/src/docker_modules/nf_modules/Kallisto/tests/mapping_single.nf b/src/docker_modules/Kallisto/tests/mapping_single.nf similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/tests/mapping_single.nf rename to src/docker_modules/Kallisto/tests/mapping_single.nf diff --git a/src/docker_modules/nf_modules/Kallisto/tests/tests.sh b/src/docker_modules/Kallisto/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/Kallisto/tests/tests.sh rename to src/docker_modules/Kallisto/tests/tests.sh diff --git a/src/docker_modules/nf_modules/MultiQC/1.0/Dockerfile b/src/docker_modules/MultiQC/1.0/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/MultiQC/1.0/Dockerfile rename to src/docker_modules/MultiQC/1.0/Dockerfile diff --git a/src/docker_modules/nf_modules/MultiQC/1.0/docker_init.sh b/src/docker_modules/MultiQC/1.0/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/MultiQC/1.0/docker_init.sh rename to src/docker_modules/MultiQC/1.0/docker_init.sh diff --git a/src/docker_modules/nf_modules/RSEM/1.3.0/Dockerfile b/src/docker_modules/RSEM/1.3.0/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/RSEM/1.3.0/Dockerfile rename to src/docker_modules/RSEM/1.3.0/Dockerfile diff --git a/src/docker_modules/nf_modules/RSEM/1.3.0/docker_init.sh b/src/docker_modules/RSEM/1.3.0/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/RSEM/1.3.0/docker_init.sh rename to src/docker_modules/RSEM/1.3.0/docker_init.sh diff --git a/src/docker_modules/nf_modules/RSEM/rsem.config b/src/docker_modules/RSEM/rsem.config similarity index 100% rename from src/docker_modules/nf_modules/RSEM/rsem.config rename to src/docker_modules/RSEM/rsem.config diff --git a/src/docker_modules/nf_modules/RSEM/rsem.nf b/src/docker_modules/RSEM/rsem.nf similarity index 100% rename from src/docker_modules/nf_modules/RSEM/rsem.nf rename to src/docker_modules/RSEM/rsem.nf diff --git a/src/docker_modules/nf_modules/RSEM/tests/index.nf b/src/docker_modules/RSEM/tests/index.nf similarity index 100% rename from src/docker_modules/nf_modules/RSEM/tests/index.nf rename to src/docker_modules/RSEM/tests/index.nf diff --git a/src/docker_modules/nf_modules/RSEM/tests/quantification_paired.nf b/src/docker_modules/RSEM/tests/quantification_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/RSEM/tests/quantification_paired.nf rename to src/docker_modules/RSEM/tests/quantification_paired.nf diff --git a/src/docker_modules/nf_modules/RSEM/tests/quantification_single.nf b/src/docker_modules/RSEM/tests/quantification_single.nf similarity index 100% rename from src/docker_modules/nf_modules/RSEM/tests/quantification_single.nf rename to src/docker_modules/RSEM/tests/quantification_single.nf diff --git a/src/docker_modules/nf_modules/RSEM/tests/tests.sh b/src/docker_modules/RSEM/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/RSEM/tests/tests.sh rename to src/docker_modules/RSEM/tests/tests.sh diff --git a/src/docker_modules/nf_modules/SAMtools/1.7/Dockerfile b/src/docker_modules/SAMtools/1.7/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/1.7/Dockerfile rename to src/docker_modules/SAMtools/1.7/Dockerfile diff --git a/src/docker_modules/nf_modules/SAMtools/1.7/docker_init.sh b/src/docker_modules/SAMtools/1.7/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/1.7/docker_init.sh rename to src/docker_modules/SAMtools/1.7/docker_init.sh diff --git a/src/docker_modules/nf_modules/SAMtools/samtools.config b/src/docker_modules/SAMtools/samtools.config similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/samtools.config rename to src/docker_modules/SAMtools/samtools.config diff --git a/src/docker_modules/nf_modules/SAMtools/samtools.nf b/src/docker_modules/SAMtools/samtools.nf similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/samtools.nf rename to src/docker_modules/SAMtools/samtools.nf diff --git a/src/docker_modules/nf_modules/SAMtools/tests/filter_bams.nf b/src/docker_modules/SAMtools/tests/filter_bams.nf similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/tests/filter_bams.nf rename to src/docker_modules/SAMtools/tests/filter_bams.nf diff --git a/src/docker_modules/nf_modules/SAMtools/tests/index_bams.nf b/src/docker_modules/SAMtools/tests/index_bams.nf similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/tests/index_bams.nf rename to src/docker_modules/SAMtools/tests/index_bams.nf diff --git a/src/docker_modules/nf_modules/SAMtools/tests/sort_bams.nf b/src/docker_modules/SAMtools/tests/sort_bams.nf similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/tests/sort_bams.nf rename to src/docker_modules/SAMtools/tests/sort_bams.nf diff --git a/src/docker_modules/nf_modules/SAMtools/tests/split_bams.nf b/src/docker_modules/SAMtools/tests/split_bams.nf similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/tests/split_bams.nf rename to src/docker_modules/SAMtools/tests/split_bams.nf diff --git a/src/docker_modules/nf_modules/SAMtools/tests/tests.sh b/src/docker_modules/SAMtools/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/SAMtools/tests/tests.sh rename to src/docker_modules/SAMtools/tests/tests.sh diff --git a/src/docker_modules/nf_modules/SRAtoolkit/2.8.2/Dockerfile b/src/docker_modules/SRAtoolkit/2.8.2/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/SRAtoolkit/2.8.2/Dockerfile rename to src/docker_modules/SRAtoolkit/2.8.2/Dockerfile diff --git a/src/docker_modules/nf_modules/SRAtoolkit/2.8.2/docker_init.sh b/src/docker_modules/SRAtoolkit/2.8.2/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/SRAtoolkit/2.8.2/docker_init.sh rename to src/docker_modules/SRAtoolkit/2.8.2/docker_init.sh diff --git a/src/docker_modules/nf_modules/Salmon/0.8.2/Dockerfile b/src/docker_modules/Salmon/0.8.2/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/Salmon/0.8.2/Dockerfile rename to src/docker_modules/Salmon/0.8.2/Dockerfile diff --git a/src/docker_modules/nf_modules/Salmon/0.8.2/docker_init.sh b/src/docker_modules/Salmon/0.8.2/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/Salmon/0.8.2/docker_init.sh rename to src/docker_modules/Salmon/0.8.2/docker_init.sh diff --git a/src/docker_modules/nf_modules/TopHat/2.1.1/Dockerfile b/src/docker_modules/TopHat/2.1.1/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/TopHat/2.1.1/Dockerfile rename to src/docker_modules/TopHat/2.1.1/Dockerfile diff --git a/src/docker_modules/nf_modules/TopHat/2.1.1/docker_init.sh b/src/docker_modules/TopHat/2.1.1/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/TopHat/2.1.1/docker_init.sh rename to src/docker_modules/TopHat/2.1.1/docker_init.sh diff --git a/src/docker_modules/nf_modules/Trimmomatic/0.36/Dockerfile b/src/docker_modules/Trimmomatic/0.36/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/Trimmomatic/0.36/Dockerfile rename to src/docker_modules/Trimmomatic/0.36/Dockerfile diff --git a/src/docker_modules/nf_modules/Trimmomatic/0.36/docker_init.sh b/src/docker_modules/Trimmomatic/0.36/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/Trimmomatic/0.36/docker_init.sh rename to src/docker_modules/Trimmomatic/0.36/docker_init.sh diff --git a/src/docker_modules/nf_modules/UrQt/d62c1f8/Dockerfile b/src/docker_modules/UrQt/d62c1f8/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/UrQt/d62c1f8/Dockerfile rename to src/docker_modules/UrQt/d62c1f8/Dockerfile diff --git a/src/docker_modules/nf_modules/UrQt/d62c1f8/docker_init.sh b/src/docker_modules/UrQt/d62c1f8/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/UrQt/d62c1f8/docker_init.sh rename to src/docker_modules/UrQt/d62c1f8/docker_init.sh diff --git a/src/docker_modules/nf_modules/UrQt/tests/tests.sh b/src/docker_modules/UrQt/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/UrQt/tests/tests.sh rename to src/docker_modules/UrQt/tests/tests.sh diff --git a/src/docker_modules/nf_modules/UrQt/tests/trimming_paired.nf b/src/docker_modules/UrQt/tests/trimming_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/UrQt/tests/trimming_paired.nf rename to src/docker_modules/UrQt/tests/trimming_paired.nf diff --git a/src/docker_modules/nf_modules/UrQt/tests/trimming_single.nf b/src/docker_modules/UrQt/tests/trimming_single.nf similarity index 100% rename from src/docker_modules/nf_modules/UrQt/tests/trimming_single.nf rename to src/docker_modules/UrQt/tests/trimming_single.nf diff --git a/src/docker_modules/nf_modules/UrQt/urqt.config b/src/docker_modules/UrQt/urqt.config similarity index 100% rename from src/docker_modules/nf_modules/UrQt/urqt.config rename to src/docker_modules/UrQt/urqt.config diff --git a/src/docker_modules/nf_modules/UrQt/urqt.nf b/src/docker_modules/UrQt/urqt.nf similarity index 100% rename from src/docker_modules/nf_modules/UrQt/urqt.nf rename to src/docker_modules/UrQt/urqt.nf diff --git a/src/docker_modules/nf_modules/canu/1.6/Dockerfile b/src/docker_modules/canu/1.6/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/canu/1.6/Dockerfile rename to src/docker_modules/canu/1.6/Dockerfile diff --git a/src/docker_modules/nf_modules/canu/1.6/docker_init.sh b/src/docker_modules/canu/1.6/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/canu/1.6/docker_init.sh rename to src/docker_modules/canu/1.6/docker_init.sh diff --git a/src/docker_modules/nf_modules/cutadapt/1.14/Dockerfile b/src/docker_modules/cutadapt/1.14/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/1.14/Dockerfile rename to src/docker_modules/cutadapt/1.14/Dockerfile diff --git a/src/docker_modules/nf_modules/cutadapt/1.14/docker_init.sh b/src/docker_modules/cutadapt/1.14/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/1.14/docker_init.sh rename to src/docker_modules/cutadapt/1.14/docker_init.sh diff --git a/src/docker_modules/nf_modules/cutadapt/cutadapt.config b/src/docker_modules/cutadapt/cutadapt.config similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/cutadapt.config rename to src/docker_modules/cutadapt/cutadapt.config diff --git a/src/docker_modules/nf_modules/cutadapt/cutadapt.nf b/src/docker_modules/cutadapt/cutadapt.nf similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/cutadapt.nf rename to src/docker_modules/cutadapt/cutadapt.nf diff --git a/src/docker_modules/nf_modules/cutadapt/tests/adaptor_removal_paired.nf b/src/docker_modules/cutadapt/tests/adaptor_removal_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/tests/adaptor_removal_paired.nf rename to src/docker_modules/cutadapt/tests/adaptor_removal_paired.nf diff --git a/src/docker_modules/nf_modules/cutadapt/tests/adaptor_removal_single.nf b/src/docker_modules/cutadapt/tests/adaptor_removal_single.nf similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/tests/adaptor_removal_single.nf rename to src/docker_modules/cutadapt/tests/adaptor_removal_single.nf diff --git a/src/docker_modules/nf_modules/cutadapt/tests/tests.sh b/src/docker_modules/cutadapt/tests/tests.sh similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/tests/tests.sh rename to src/docker_modules/cutadapt/tests/tests.sh diff --git a/src/docker_modules/nf_modules/cutadapt/tests/trimming_paired.nf b/src/docker_modules/cutadapt/tests/trimming_paired.nf similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/tests/trimming_paired.nf rename to src/docker_modules/cutadapt/tests/trimming_paired.nf diff --git a/src/docker_modules/nf_modules/cutadapt/tests/trimming_single.nf b/src/docker_modules/cutadapt/tests/trimming_single.nf similarity index 100% rename from src/docker_modules/nf_modules/cutadapt/tests/trimming_single.nf rename to src/docker_modules/cutadapt/tests/trimming_single.nf diff --git a/src/docker_modules/nf_modules/deepTools/3.0.2/Dockerfile b/src/docker_modules/deepTools/3.0.2/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/deepTools/3.0.2/Dockerfile rename to src/docker_modules/deepTools/3.0.2/Dockerfile diff --git a/src/docker_modules/nf_modules/deepTools/3.0.2/docker_init.sh b/src/docker_modules/deepTools/3.0.2/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/deepTools/3.0.2/docker_init.sh rename to src/docker_modules/deepTools/3.0.2/docker_init.sh diff --git a/src/docker_modules/nf_modules/file_handle/0.1.1/Dockerfile b/src/docker_modules/file_handle/0.1.1/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/file_handle/0.1.1/Dockerfile rename to src/docker_modules/file_handle/0.1.1/Dockerfile diff --git a/src/docker_modules/nf_modules/file_handle/0.1.1/docker_init.sh b/src/docker_modules/file_handle/0.1.1/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/file_handle/0.1.1/docker_init.sh rename to src/docker_modules/file_handle/0.1.1/docker_init.sh diff --git a/src/docker_modules/nf_modules/pigz/2.4/Dockerfile b/src/docker_modules/pigz/2.4/Dockerfile similarity index 100% rename from src/docker_modules/nf_modules/pigz/2.4/Dockerfile rename to src/docker_modules/pigz/2.4/Dockerfile diff --git a/src/docker_modules/nf_modules/pigz/2.4/docker_init.sh b/src/docker_modules/pigz/2.4/docker_init.sh similarity index 100% rename from src/docker_modules/nf_modules/pigz/2.4/docker_init.sh rename to src/docker_modules/pigz/2.4/docker_init.sh