diff --git a/engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_bag.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_bag.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_core.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_core.hpp
new file mode 100644
index 0000000..3159f54
--- /dev/null
+++ b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_core.hpp
@@ -0,0 +1,41 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include <tamtypes.h>
+#include "./bag/dynpip_bag.hpp"
+#include "renderer/core/renderer_core.hpp"
+
+namespace Tyra {
+
+class DynPipCore {
+ public:
+  DynPipCore();
+  ~DynPipCore();
+
+  void init(RendererCore* t_core);
+
+  /** Render 3D via "bags" */
+  void render(DynPipBag* data);
+
+  /**
+   * - Uploads standard VU1 programs.
+   * - Sends static "Tyra Renderer3D" VU1 data.
+   * - Sets double buffers exactly for "Tyra Renderer3D"
+   * Should be called if VU1 was used by your non standard programs.
+   */
+  void reinitStandardVU1Programs();
+
+ private:
+  RendererCore* rendererCore;
+};
+
+}  // namespace Tyra
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynpip_options.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_options.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/dynpip_options.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_options.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynpip_program_name.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_program_name.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/dynpip_program_name.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_program_name.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynpip_programs_repository.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/dynpip_programs_repository.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynpip_qbuffer.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/dynpip_qbuffer.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynpip_vu1_program.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/dynpip_vu1_program.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.hpp b/engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.hpp
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.hpp
rename to engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.hpp
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h b/engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h
similarity index 100%
rename from engine/inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h
rename to engine/inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h
diff --git a/engine/inc/renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp b/engine/inc/renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp
index 118141d..da923bd 100644
--- a/engine/inc/renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp
+++ b/engine/inc/renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp
@@ -12,7 +12,8 @@
 
 #include <tamtypes.h>
 #include "../renderer_3d_pipeline.hpp"
-#include "./dynpip_options.hpp"
+#include "./core/dynpip_options.hpp"
+#include "./core/dynpip_core.hpp"
 #include "renderer/core/renderer_core.hpp"
 #include "renderer/3d/mesh/dynamic/dynamic_mesh.hpp"
 
@@ -23,10 +24,16 @@ class DynamicPipeline : public Renderer3DPipeline {
   DynamicPipeline();
   ~DynamicPipeline();
 
+  DynPipCore core;
+
   void init(RendererCore* core);
 
   void onUse();
 
+  /**
+   * Render 3D via "meshes".
+   * This render() method is a bridge to core.render() method.
+   */
   void render(DynamicMesh* mesh, const DynPipOptions* options = nullptr);
 };
 
diff --git a/engine/inc/renderer/3d/pipeline/static/core/static_pipeline_core.hpp b/engine/inc/renderer/3d/pipeline/static/core/stapip_core.hpp
similarity index 94%
rename from engine/inc/renderer/3d/pipeline/static/core/static_pipeline_core.hpp
rename to engine/inc/renderer/3d/pipeline/static/core/stapip_core.hpp
index 6cfb27b..02dea03 100644
--- a/engine/inc/renderer/3d/pipeline/static/core/static_pipeline_core.hpp
+++ b/engine/inc/renderer/3d/pipeline/static/core/stapip_core.hpp
@@ -19,14 +19,14 @@
 
 namespace Tyra {
 
-class StaPipelineCore {
+class StaPipCore {
  public:
-  StaPipelineCore();
-  ~StaPipelineCore();
+  StaPipCore();
+  ~StaPipCore();
 
   void init(RendererCore* t_core);
 
-  /** Render 3D data via "bags" */
+  /** Render 3D via "bags" */
   void render(StaPipBag* data, StaPipBagPackagesBBox* bbox = nullptr);
 
   /** Get max vert count of VU1 qbuffer (for optimizations) */
diff --git a/engine/inc/renderer/3d/pipeline/static/static_pipeline.hpp b/engine/inc/renderer/3d/pipeline/static/static_pipeline.hpp
index c35a857..46b77db 100644
--- a/engine/inc/renderer/3d/pipeline/static/static_pipeline.hpp
+++ b/engine/inc/renderer/3d/pipeline/static/static_pipeline.hpp
@@ -15,7 +15,7 @@
 #include "./stapip_options.hpp"
 #include "renderer/core/renderer_core.hpp"
 #include "renderer/3d/mesh/dynamic/dynamic_mesh.hpp"
-#include "./core/static_pipeline_core.hpp"
+#include "./core/stapip_core.hpp"
 
 namespace Tyra {
 
@@ -24,6 +24,8 @@ class StaticPipeline : public Renderer3DPipeline {
   StaticPipeline();
   ~StaticPipeline();
 
+  StaPipCore core;
+
   void init(RendererCore* core);
 
   void onUse();
@@ -35,7 +37,6 @@ class StaticPipeline : public Renderer3DPipeline {
   void render(DynamicMesh* mesh, const StaPipOptions* options = nullptr);
 
  private:
-  StaPipelineCore core;
   RendererCore* rendererCore;
   Vec4* colorsCache;
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_bag.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.cpp
similarity index 97%
rename from engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_bag.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.cpp
index a840cfe..983054f 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_bag.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/bag/dynpip_bag.hpp"
+#include "renderer/3d/pipeline/dynamic/core/bag/dynpip_bag.hpp"
 #include <sstream>
 #include <iomanip>
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.cpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.cpp
index d2031b9..d196bcd 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.hpp"
+#include "renderer/3d/pipeline/dynamic/core/bag/dynpip_color_bag.hpp"
 
 namespace Tyra {
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.cpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.cpp
index 05750eb..8d6872c 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.hpp"
+#include "renderer/3d/pipeline/dynamic/core/bag/dynpip_lighting_bag.hpp"
 
 namespace Tyra {
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.cpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.cpp
index d755d54..ccfc152 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.hpp"
+#include "renderer/3d/pipeline/dynamic/core/bag/dynpip_texture_bag.hpp"
 
 namespace Tyra {
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_core.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_core.cpp
new file mode 100644
index 0000000..2ae3adc
--- /dev/null
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_core.cpp
@@ -0,0 +1,27 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#include "renderer/3d/pipeline/dynamic/core/dynpip_core.hpp"
+#include <sstream>
+#include <iomanip>
+
+namespace Tyra {
+
+DynPipCore::DynPipCore() {}
+
+DynPipCore::~DynPipCore() {}
+
+void DynPipCore::init(RendererCore* t_core) { rendererCore = t_core; }
+
+void DynPipCore::reinitStandardVU1Programs() {}
+
+void DynPipCore::render(DynPipBag* bag) {}
+
+}  // namespace Tyra
diff --git a/engine/src/renderer/3d/pipeline/dynamic/dynpip_programs_repository.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.cpp
similarity index 89%
rename from engine/src/renderer/3d/pipeline/dynamic/dynpip_programs_repository.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.cpp
index fca3f17..d07db08 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/dynpip_programs_repository.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/dynpip_programs_repository.hpp"
+#include "renderer/3d/pipeline/dynamic/core/dynpip_programs_repository.hpp"
 
 namespace Tyra {
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/dynpip_qbuffer.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.cpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/dynpip_qbuffer.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.cpp
index 2537cc0..4136fe6 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/dynpip_qbuffer.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/dynpip_qbuffer.hpp"
+#include "renderer/3d/pipeline/dynamic/core/dynpip_qbuffer.hpp"
 #include <sstream>
 #include <iomanip>
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/dynpip_vu1_program.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.cpp
similarity index 94%
rename from engine/src/renderer/3d/pipeline/dynamic/dynpip_vu1_program.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.cpp
index 958a012..165c1f8 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/dynpip_vu1_program.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/dynamic/dynpip_vu1_program.hpp"
+#include "renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.hpp"
 
 namespace Tyra {
 
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1.vclpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1.vclpp
similarity index 86%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1.vclpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1.vclpp
index 93308c8..0d3cec6 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1.vclpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1.vclpp
@@ -21,7 +21,7 @@
 
 #include "src/renderer/3d/pipeline/shared/vcl_sml.i"
 #include "src/renderer/3d/pipeline/shared/tyra_macros.i"
-#include "inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h"
+#include "inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h"
 
 #define RGBA_STORE_OFFSET   0
 #define XYZ2_STORE_OFFSET   1
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.cpp
similarity index 91%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.cpp
index 1c6089b..4a76c80 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "debug/debug.hpp"
-#include "renderer/3d/pipeline/dynamic/programs/dynpip_c_vu1_program.hpp"
+#include "renderer/3d/pipeline/dynamic/core/programs/dynpip_c_vu1_program.hpp"
 
 extern u32 DynPipVU1_C_CodeStart __attribute__((section(".vudata")));
 extern u32 DynPipVU1_C_CodeEnd __attribute__((section(".vudata")));
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1.vclpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1.vclpp
similarity index 86%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1.vclpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1.vclpp
index 34290f7..b5f6e8b 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1.vclpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1.vclpp
@@ -21,7 +21,7 @@
 
 #include "src/renderer/3d/pipeline/shared/vcl_sml.i"
 #include "src/renderer/3d/pipeline/shared/tyra_macros.i"
-#include "inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h"
+#include "inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h"
 
 #define RGBA_STORE_OFFSET   0
 #define XYZ2_STORE_OFFSET   1
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.cpp
similarity index 92%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.cpp
index a551212..c7bc969 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "debug/debug.hpp"
-#include "renderer/3d/pipeline/dynamic/programs/dynpip_d_vu1_program.hpp"
+#include "renderer/3d/pipeline/dynamic/core/programs/dynpip_d_vu1_program.hpp"
 
 extern u32 DynPipVU1_D_CodeStart __attribute__((section(".vudata")));
 extern u32 DynPipVU1_D_CodeEnd __attribute__((section(".vudata")));
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1.vclpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1.vclpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1.vclpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1.vclpp
index 93a2ad7..cd13d85 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1.vclpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1.vclpp
@@ -21,7 +21,7 @@
 
 #include "src/renderer/3d/pipeline/shared/vcl_sml.i"
 #include "src/renderer/3d/pipeline/shared/tyra_macros.i"
-#include "inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h"
+#include "inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h"
 
 #define STQ_STORE_OFFSET    0
 #define RGBA_STORE_OFFSET   1
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.cpp
similarity index 92%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.cpp
index 790dead..4a85c77 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "debug/debug.hpp"
-#include "renderer/3d/pipeline/dynamic/programs/dynpip_tc_vu1_program.hpp"
+#include "renderer/3d/pipeline/dynamic/core/programs/dynpip_tc_vu1_program.hpp"
 
 extern u32 DynPipVU1_TC_CodeStart __attribute__((section(".vudata")));
 extern u32 DynPipVU1_TC_CodeEnd __attribute__((section(".vudata")));
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1.vclpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1.vclpp
similarity index 87%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1.vclpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1.vclpp
index cc4f20d..a71f104 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1.vclpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1.vclpp
@@ -21,7 +21,7 @@
 
 #include "src/renderer/3d/pipeline/shared/vcl_sml.i"
 #include "src/renderer/3d/pipeline/shared/tyra_macros.i"
-#include "inc/renderer/3d/pipeline/dynamic/programs/dynpip_vu1_shared_defines.h"
+#include "inc/renderer/3d/pipeline/dynamic/core/programs/dynpip_vu1_shared_defines.h"
 
 #define STQ_STORE_OFFSET    0
 #define RGBA_STORE_OFFSET   1
diff --git a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.cpp b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.cpp
similarity index 93%
rename from engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.cpp
rename to engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.cpp
index 50e206f..84abba6 100644
--- a/engine/src/renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.cpp
+++ b/engine/src/renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "debug/debug.hpp"
-#include "renderer/3d/pipeline/dynamic/programs/dynpip_td_vu1_program.hpp"
+#include "renderer/3d/pipeline/dynamic/core/programs/dynpip_td_vu1_program.hpp"
 
 extern u32 DynPipVU1_TD_CodeStart __attribute__((section(".vudata")));
 extern u32 DynPipVU1_TD_CodeEnd __attribute__((section(".vudata")));
diff --git a/engine/src/renderer/3d/pipeline/static/core/static_pipeline_core.cpp b/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
similarity index 89%
rename from engine/src/renderer/3d/pipeline/static/core/static_pipeline_core.cpp
rename to engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
index 898afc2..cd84602 100644
--- a/engine/src/renderer/3d/pipeline/static/core/static_pipeline_core.cpp
+++ b/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "renderer/3d/pipeline/static/core/static_pipeline_core.hpp"
+#include "renderer/3d/pipeline/static/core/stapip_core.hpp"
 #include "renderer/core/renderer_core.hpp"
 #include "thread/threading.hpp"
 
@@ -22,34 +22,32 @@
 
 namespace Tyra {
 
-StaPipelineCore::StaPipelineCore() { maxVertCount = 0; }
+StaPipCore::StaPipCore() { maxVertCount = 0; }
 
-StaPipelineCore::~StaPipelineCore() {}
+StaPipCore::~StaPipCore() {}
 
-void StaPipelineCore::init(RendererCore* t_core) {
+void StaPipCore::init(RendererCore* t_core) {
   rendererCore = t_core;
   qbufferRenderer.init(t_core);
   packager.init(&rendererCore->renderer3D.frustumPlanes);
 }
 
-void StaPipelineCore::reinitStandardVU1Programs() {
-  qbufferRenderer.reinitVU1();
-}
+void StaPipCore::reinitStandardVU1Programs() { qbufferRenderer.reinitVU1(); }
 
-u32 StaPipelineCore::getMaxVertCountByBag(const StaPipBag* bag) {
+u32 StaPipCore::getMaxVertCountByBag(const StaPipBag* bag) {
   return qbufferRenderer.getCullProgramByBag(bag)->getMaxVertCount(
       bag->color->many == nullptr, qbufferRenderer.getBufferSize());
 }
 
-u32 StaPipelineCore::getMaxVertCountByParams(const bool& isSingleColor,
-                                             const bool& isLightingEnabled,
-                                             const bool& isTextureEnabled) {
+u32 StaPipCore::getMaxVertCountByParams(const bool& isSingleColor,
+                                        const bool& isLightingEnabled,
+                                        const bool& isTextureEnabled) {
   return qbufferRenderer
       .getCullProgramByParams(isLightingEnabled, isTextureEnabled)
       ->getMaxVertCount(isSingleColor, qbufferRenderer.getBufferSize());
 }
 
-void StaPipelineCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
+void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
   if (bag->count <= 0) return;
 
   TYRA_ASSERT(bag->vertices != nullptr,
@@ -143,7 +141,7 @@ void StaPipelineCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
   Verbose("Render finished");
 }
 
-void StaPipelineCore::renderPkgs(StaPipBagPackage* packages, u16 count) {
+void StaPipCore::renderPkgs(StaPipBagPackage* packages, u16 count) {
   for (u16 i = 0; i < count; i++) {
     if (packages[i].isInFrustum == IN_FRUSTUM) {
       Verbose(i, " - package in frustum -> cull");
@@ -163,7 +161,7 @@ void StaPipelineCore::renderPkgs(StaPipBagPackage* packages, u16 count) {
   }
 }
 
-void StaPipelineCore::renderSubpkgs(StaPipBagPackage* subpkgs, u16 count) {
+void StaPipCore::renderSubpkgs(StaPipBagPackage* subpkgs, u16 count) {
   std::vector<u16> doneIndexes;
   std::vector<u16> loadedIndexes;
 
@@ -220,7 +218,7 @@ void StaPipelineCore::renderSubpkgs(StaPipBagPackage* subpkgs, u16 count) {
   }
 }
 
-void StaPipelineCore::setMaxVertCount(const u32& count) {
+void StaPipCore::setMaxVertCount(const u32& count) {
   maxVertCount = count;
   packager.setMaxVertCount(count);
   qbufferRenderer.setMaxVertCount(count);