diff --git a/kibot/yaml/kibot_grp_renders.yaml b/kibot/yaml/kibot_grp_renders.yaml
index 2f9cc14..d78a440 100644
--- a/kibot/yaml/kibot_grp_renders.yaml
+++ b/kibot/yaml/kibot_grp_renders.yaml
@@ -16,7 +16,7 @@ groups:
 import:
 
   # PCB 2D Renders (Bare Board) ------------------------------------------
-  - file: kibot_out_pcbdraw.yaml
+  - file: outputs/kibot_out_pcbdraw.yaml
     definitions:
       NAME: @NAME_PCBDRAW_2D_TOP_PCB_OUTPUT@
       COMMENT: PCB 2D Render (Top)
@@ -25,7 +25,7 @@ import:
       BOTTOM: false
       COMPONENTS: none
 
-  - file: kibot_out_pcbdraw.yaml
+  - file: outputs/kibot_out_pcbdraw.yaml
     definitions:
       NAME: @NAME_PCBDRAW_2D_BOT_PCB_OUTPUT@
       COMMENT: PCB 2D Render (Bottom)
@@ -35,7 +35,7 @@ import:
       COMPONENTS: none
 
   # PCBA 3D Renders (Populated Board; Blender) -------------------------------
-  - file: kibot_out_blender.yaml
+  - file: outputs/kibot_out_blender.yaml
     definitions:
       NAME: @NAME_BLENDER_3D_TOP@
       COMMENT: High Quality 3D Render (Top)
@@ -55,7 +55,7 @@ import:
       ACCENT_LIGHT: 0.1
       SPOT_LIGHT: 0.1
 
-  - file: kibot_out_blender.yaml
+  - file: outputs/kibot_out_blender.yaml
     definitions:
       NAME: @NAME_BLENDER_3D_BOT@
       COMMENT: High Quality 3D Render (Bottom)
@@ -75,7 +75,7 @@ import:
       ACCENT_LIGHT: 0.1
       SPOT_LIGHT: 0.1
 
-  - file: kibot_out_blender.yaml
+  - file: outputs/kibot_out_blender.yaml
     definitions:
       NAME: @NAME_BLENDER_3D_ANGLED_TOP@
       COMMENT: High Quality 3D Render (Angled Top)
@@ -95,7 +95,7 @@ import:
       ACCENT_LIGHT: 0.1
       SPOT_LIGHT: 2.0
 
-  - file: kibot_out_blender.yaml
+  - file: outputs/kibot_out_blender.yaml
     definitions:
       NAME: @NAME_BLENDER_3D_ANGLED_BOT@
       COMMENT: High Quality 3D Render (Angled Bottom)
diff --git a/kibot/yaml/kibot_out_png_3d_viewer.yaml b/kibot/yaml/kibot_out_png_3d_viewer.yaml
deleted file mode 100644
index b987362..0000000
--- a/kibot/yaml/kibot_out_png_3d_viewer.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# KiBot output for 3D Viewer renders in PNG format
-# https://kibot.readthedocs.io/en/latest/configuration/outputs/render_3d.html
-
-kibot:
-  version: 1
-
-outputs:
-- name: @NAME@
-  comment: '@COMMENT@'
-  type: render_3d
-  category: '@DIR@'
-  dir: '@DIR@'
-  options:
-    output: '%f-@SUFFIX@%I%v.%x'
-    auto_crop: true
-    enable_crop_workaround: true
-    rotate_x: @ROTATE_X@
-    rotate_y: @ROTATE_Y@
-    rotate_z: @ROTATE_Z@
-    zoom: @ZOOM@
-    height: @HEIGHT@
-    width: @WIDTH@
-    view: '@VIEW@'
-    force_stackup_colors: true
-    orthographic: true
-    transparent_background: true
-    transparent_background_color: '@KEY_COLOR@'
-    transparent_background_fuzz: 40
-
-...
-definitions:
-  NAME: png_3d_viewer
-  COMMENT: 3D viewer PCB render in PNG format
-  DIR: renders
-  SUFFIX: ""
-  VIEW: top
-  ROTATE_X: 0
-  ROTATE_Y: 0
-  ROTATE_Z: 0
-  ZOOM: 0
-  HEIGHT: 2000
-  WIDTH: 2000
-  KEY_COLOR: '#FF00FF'
diff --git a/kibot/yaml/kibot_out_blender.yaml b/kibot/yaml/outputs/kibot_out_blender.yaml
similarity index 100%
rename from kibot/yaml/kibot_out_blender.yaml
rename to kibot/yaml/outputs/kibot_out_blender.yaml
diff --git a/kibot/yaml/kibot_out_pcbdraw.yaml b/kibot/yaml/outputs/kibot_out_pcbdraw.yaml
similarity index 100%
rename from kibot/yaml/kibot_out_pcbdraw.yaml
rename to kibot/yaml/outputs/kibot_out_pcbdraw.yaml