diff --git a/.gitignore b/.gitignore
index 90c55553b9e42e7b49d9ebd7b5f4cc779edc0fb1..bfe0cc1f89e0e7d8fdf63d0ba9c43a55a166aeeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /.snakemake
 /logs/*
-/resources/*
 /results/*
 /tools/
diff --git a/config/config.yaml b/config/config.yaml
index 90b249f79c2f78865e375007ff42ba9e68623493..a74cc1f2bb21e6c4e4627ccda96717aeb5274a58 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -2,10 +2,10 @@ output_name_prefix:
   "Homo_sapiens_4"
 
 input_HiFi_reads:
-  "test_datasets/dataset3_sim_hChr19.fastq"
+  "dataset3_sim_hChr19.fastq"
 
 input_reference:
-  "test_datasets/Homo_sapiens_ch19.fasta"
+  "Homo_sapiens_ch19.fasta"
 
   
 
@@ -20,7 +20,7 @@ RUN_ISO_SEQ_COLLAPSE:   True
 RUN_GFF_COMPARISON:     True
 
 # Functional annotation (Database needs be configured)
-RUN_BLAST:              False
+RUN_BLAST:              True
 BLAST_DATABASE: "UniRefDB/uniref50.fasta"
 
 
@@ -29,7 +29,7 @@ BLAST_DATABASE: "UniRefDB/uniref50.fasta"
 
 # Split input for TAMA Collapse
 # It's recomended to split larger sam files (>500k reads) 
-TAMA_split_input: True
+TAMA_split_input: False
 TAMA_split_chunk_size_in_thousands: 500
 
 # Choose a preset or configure parameters for TAMA Collapse
diff --git a/resources/.gitignore b/resources/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..86d0cb2726c6c7c179b99520c452dd1b68e7a813
--- /dev/null
+++ b/resources/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/run_snakemake.sh b/run_snakemake.sh
index ce727c8645620acc13be670c91c6a64022e5488f..e3530b31fc3133401d352e0971533f4fff61544f 100644
--- a/run_snakemake.sh
+++ b/run_snakemake.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#cd "$(dirname "$0")"
+cd "$(dirname "$0")"
 
 snakemake --cores 10 --use-conda
 
diff --git a/workflow/Snakefile b/workflow/Snakefile
index cb479791f5a8d0d5070b26a84b88549d2fb1eaf7..53f0aaca787d881595b34e75acacb8a9ab74bf1e 100644
--- a/workflow/Snakefile
+++ b/workflow/Snakefile
@@ -12,7 +12,6 @@ include: "rules/gffcompare.smk"
 include: "rules/functional_annotation.smk"
 
 
-
 myoutput = []
 
 
@@ -20,7 +19,7 @@ if config["RUN_TAMA_COLLAPSE"] and config["TAMA_split_input"]:
     myoutput.append("results/structural_annotation/TAMA_collapse_merged_{output_name}/{output_name}.bed",)
 
 if config["RUN_TAMA_COLLAPSE"] and not config["TAMA_split_input"]:
-    myoutput.append("results/structural_annotation/TAMA_collapse_unmerged_{output_name}/{output_name}.bed")
+    myoutput.append("results/structural_annotation/TAMA_collapse_unmerged_{output_name}/Unmerged_{output_name}.bed")
 
 if config["RUN_STRINGTIE"]:
     myoutput.append("results/structural_annotation/{output_name}_stringtie_assembly.gtf")
diff --git a/workflow/rules/TAMA_single.smk b/workflow/rules/TAMA_single.smk
index cd19b8b77c5c5fd5e7b9683a2758e78c5e9ec7f4..233b7b5ac169e4a2a107cdc1efb560c58ad32368 100644
--- a/workflow/rules/TAMA_single.smk
+++ b/workflow/rules/TAMA_single.smk
@@ -8,9 +8,9 @@ rule tama_collapse_single:
         reference     = input_reference
     output: 
         output_folder = directory("results/structural_annotation/TAMA_collapse_unmerged_{output_name}/"),
-        bed           = "results/structural_annotation/TAMA_collapse_unmerged_{output_name}/{output_name}.bed"
+        bed           = "results/structural_annotation/TAMA_collapse_unmerged_{output_name}/Unmerged_{output_name}.bed"
     params:
-        prefix =        "results/structural_annotation/TAMA_collapse_unmerged_{output_name}/{output_name}",
+        prefix =        "results/structural_annotation/TAMA_collapse_unmerged_{output_name}/Unmerged_{output_name}",
         param_string = get_TAMA_Collapse_param_string()
     log:
         "logs/{output_name}_tama_collapse.log"
diff --git a/workflow/rules/functional_annotation.smk b/workflow/rules/functional_annotation.smk
index 841b25c8e662857f2db93446aec45658bff9846b..038f08fca07b3fb8056e6b99bbba99482f65670f 100644
--- a/workflow/rules/functional_annotation.smk
+++ b/workflow/rules/functional_annotation.smk
@@ -1,8 +1,12 @@
-
+def get_bed():
+    if config["TAMA_split_input"] == True:
+        return "results/structural_annotation/TAMA_collapse_merged_{output_name}/{output_name}.bed"
+    else:
+        return "results/structural_annotation/TAMA_collapse_unmerged_{output_name}/Unmerged_{output_name}.bed"
 
 rule bedtools_bed_to_fasta:
     input:
-        bed = "results/structural_annotation/TAMA_collapse_merged_{output_name}/{output_name}.bed",
+        bed = get_bed(),
         ref = input_reference
     output:
         fasta =  "results/functional_annotation/{output_name}/{output_name}.fasta"
diff --git a/workflow/rules/gffcompare.smk b/workflow/rules/gffcompare.smk
index bae396b5232396717ef606c8ef6e7ca8ab56ccc2..0a1d40906e8e0cd62ebb17229883de01fa001e1b 100644
--- a/workflow/rules/gffcompare.smk
+++ b/workflow/rules/gffcompare.smk
@@ -14,10 +14,10 @@ rule convert_bed_gtf:
 def get_output_files(wildcards):
     input_list=[]
     
-    if config["RUN_TAMA_COLLAPSE"] and config["TAMA_split_input"]:
-        input_list.append("results/structural_annotation/TAMA_collapse_merged_{output_name}/{output_name}.gtf") 
+    #if config["RUN_TAMA_COLLAPSE"] and config["TAMA_split_input"]:
+    #    input_list.append("results/structural_annotation/TAMA_collapse_merged_{output_name}/{output_name}.gtf") 
     if config["RUN_TAMA_COLLAPSE"] and not config["TAMA_split_input"]:
-        input_list.append("results/structural_annotation/TAMA_collapse_unmerged_{output_name}/{output_name}.gtf")
+        input_list.append("results/structural_annotation/TAMA_collapse_unmerged_{output_name}/Unmerged_{output_name}.gtf")
     if config["RUN_ISO_SEQ_COLLAPSE"]:
         input_list.extend(rules.iso_seq_collapse.output)
     if config["RUN_STRINGTIE"]: