diff --git a/runs/kallisto_collect/isa.dataset.xlsx b/runs/kallisto_collect/out/isa.dataset.xlsx
similarity index 100%
rename from runs/kallisto_collect/isa.dataset.xlsx
rename to runs/kallisto_collect/out/isa.dataset.xlsx
diff --git a/runs/kallisto_collect/kallisto_mappingStats.csv b/runs/kallisto_collect/out/kallisto_mappingStats.csv
similarity index 100%
rename from runs/kallisto_collect/kallisto_mappingStats.csv
rename to runs/kallisto_collect/out/kallisto_mappingStats.csv
diff --git a/runs/kallisto_collect/kallisto_tpmMatrix.csv b/runs/kallisto_collect/out/kallisto_tpmMatrix.csv
similarity index 100%
rename from runs/kallisto_collect/kallisto_tpmMatrix.csv
rename to runs/kallisto_collect/out/kallisto_tpmMatrix.csv
diff --git a/workflows/shiny_prep/shiny_plots.Rmd b/runs/shiny_plots.Rmd
similarity index 100%
rename from workflows/shiny_prep/shiny_plots.Rmd
rename to runs/shiny_plots.Rmd
diff --git a/runs/shiny_prep/out/shiny_prep.RData b/runs/shiny_prep/out/shiny_prep.RData
index 05ad3fdef0add3ebd7bb6a027e4f7b575e33bb22..ae56a9cb309ac5e6b27e0c2a7c916035cbcc9dae 100644
Binary files a/runs/shiny_prep/out/shiny_prep.RData and b/runs/shiny_prep/out/shiny_prep.RData differ
diff --git a/runs/shiny_prep/run.cwl b/runs/shiny_prep/run.cwl
index 4f5b2adc81b5e022925d3e753a1531d528e867a1..aa7ea15dbeb66f345b610edc8c2ba3b0043d7851 100644
--- a/runs/shiny_prep/run.cwl
+++ b/runs/shiny_prep/run.cwl
@@ -1,21 +1,29 @@
 #!/usr/bin/env cwl-runner
+
 cwlVersion: v1.2
-class: Workflow
+class: CommandLineTool
+
 inputs:
-  out_folder:
-    type: string
-  in_kallisto_df:
-    type: File
+- id: r_script
+  type: File
+  inputBinding:
+    position: 0
+- id: out_folder
+  type: string
+  inputBinding:
+    position: 1
+- id: in_kallisto_df
+  type: File
+  inputBinding:
+    position: 2
+
 outputs:
-  out_dir:
-    type:
-      type: array
-      items: Directory
-    outputSource: shiny_prep/outdir
-steps:
-  shiny_prep:
-    run: ../../workflows/shiny_prep/workflow.cwl
-    in:
-      in_kallisto_df: in_kallisto_df
-      out_folder: out_folder
-    out: [outdir]
+- id: outdir
+  type:
+    type: array
+    items: Directory
+  outputBinding:
+    glob: $(runtime.outdir)/$(inputs.out_folder)
+
+baseCommand:
+- Rscript
diff --git a/runs/shiny_prep/run.yml b/runs/shiny_prep/run.yml
index 60c9636bed76b7f71ec8609c0c6c05cd0ed41085..7124f42d4bf3c475754e9f72ef0bddfd7c4d9dc7 100644
--- a/runs/shiny_prep/run.yml
+++ b/runs/shiny_prep/run.yml
@@ -1,5 +1,8 @@
 cores: 1
-in_kallisto_df:
+r_script:
   class: File
-  path: ../kallisto_collect/kallisto_df.csv
-out_folder: out
+  path: ../../workflows/shiny_prep/shiny_prep.R
+in_kallisto_df: 
+  class: File
+  path: ../kallisto_collect/out/kallisto_df.csv
+out_folder: out
\ No newline at end of file
diff --git a/workflows/shiny_prep/shiny_prep.R b/workflows/shiny_prep/shiny_prep.R
index 07c44659bcacade29394ee895d9f9c38427e45bd..804ad85db72c912c214f19b868e6073316524bab 100644
--- a/workflows/shiny_prep/shiny_prep.R
+++ b/workflows/shiny_prep/shiny_prep.R
@@ -1,19 +1,5 @@
 #!/usr/bin/env Rscript
 
-################################################
-#### CWL-independent tests
-################################################
-
-# arc_root <- "~/gitlab_dataplant/samplearc_rnaseq_adrian/"
-# out_folder <- "runs/shiny_prep"
-# in_kallisto_df <- "runs/kallisto_collect/kallisto_df.csv"
-
-################################################
-#### Load required library
-################################################
-
-
-
 ################################################
 #### Read arguments from CLI
 ################################################
diff --git a/workflows/shiny_prep/workflow.cwl b/workflows/shiny_prep/workflow.cwl
deleted file mode 100644
index 0e059d4968947b2f925c583b15b17e96d929a02d..0000000000000000000000000000000000000000
--- a/workflows/shiny_prep/workflow.cwl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env cwl-runner
-cwlVersion: v1.2
-class: CommandLineTool
-hints:
-  DockerRequirement:
-    dockerPull: zimmera95/rnaseq:latest
-requirements:
-  - class: InitialWorkDirRequirement
-    listing:
-      - class: File
-        location: shiny_prep.R
-baseCommand:
-- Rscript
-arguments:
-  - position: 0
-    valueFrom: shiny_prep.R
-inputs:
-- id: out_folder
-  type: string
-  inputBinding:
-    position: 1
-- id: in_kallisto_df
-  type: File
-  inputBinding:
-    position: 2
-outputs:
-- id: outdir
-  type:
-    type: array
-    items: Directory
-  outputBinding:
-    glob: $(runtime.outdir)/$(inputs.out_folder)