diff --git a/demo/inc/demo_game.hpp b/demo/inc/demo_game.hpp
index 96a8081..bae41fb 100644
--- a/demo/inc/demo_game.hpp
+++ b/demo/inc/demo_game.hpp
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include <engine.hpp>
-#include <game.hpp>
+#include <tyra>
 #include "state/state_manager.hpp"
 
 using Tyra::Engine;
diff --git a/demo/inc/states/game/debug_object.hpp b/demo/inc/states/game/debug_object.hpp
index bcb6e34..c3175ad 100644
--- a/demo/inc/states/game/debug_object.hpp
+++ b/demo/inc/states/game/debug_object.hpp
@@ -10,9 +10,7 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
-#include <renderer/renderer.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
 
 using Tyra::Renderer;
diff --git a/demo/inc/states/game/enemy/enemy.hpp b/demo/inc/states/game/enemy/enemy.hpp
index 49b4b1e..18bfdb6 100644
--- a/demo/inc/states/game/enemy/enemy.hpp
+++ b/demo/inc/states/game/enemy/enemy.hpp
@@ -10,13 +10,9 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/dynamic/dynamic_mesh.hpp>
-#include <renderer/3d/pipeline/dynamic/dynpip_options.hpp>
-#include <renderer/3d/mesh/dynamic/animation_sequence_callback.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_dynamic_pair.hpp"
 #include "states/game/terrain/heightmap.hpp"
-#include <renderer/renderer.hpp>
-#include <engine.hpp>
 #include "./enemy_info.hpp"
 
 using Tyra::AnimationSequenceCallback;
diff --git a/demo/inc/states/game/enemy/enemy_manager.hpp b/demo/inc/states/game/enemy/enemy_manager.hpp
index b78d0ef..6eda9ad 100644
--- a/demo/inc/states/game/enemy/enemy_manager.hpp
+++ b/demo/inc/states/game/enemy/enemy_manager.hpp
@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include "states/game/terrain/heightmap.hpp"
-#include "./enemy.hpp"
 #include <tyra>
 #include <vector>
+#include "states/game/terrain/heightmap.hpp"
+#include "./enemy.hpp"
 
 using Tyra::DynamicMesh;
 using Tyra::Engine;
diff --git a/demo/inc/states/game/player/camera.hpp b/demo/inc/states/game/player/camera.hpp
index 5af2036..1e31f18 100644
--- a/demo/inc/states/game/player/camera.hpp
+++ b/demo/inc/states/game/player/camera.hpp
@@ -10,9 +10,7 @@
 
 #pragma once
 
-#include "math/vec4.hpp"
-#include "renderer/core/3d/camera_info_3d.hpp"
-#include "pad/pad.hpp"
+#include <tyra>
 
 using Tyra::CameraInfo3D;
 using Tyra::Pad;
diff --git a/demo/inc/states/game/player/player.hpp b/demo/inc/states/game/player/player.hpp
index e5636c9..0f6e55c 100644
--- a/demo/inc/states/game/player/player.hpp
+++ b/demo/inc/states/game/player/player.hpp
@@ -15,7 +15,8 @@
 #include "states/game/terrain/heightmap.hpp"
 #include "./weapon.hpp"
 #include "./camera.hpp"
-#include <engine.hpp>
+#include "./player_shoot_action.hpp"
+#include <tyra>
 
 using Tyra::Engine;
 using Tyra::Pad;
@@ -35,8 +36,11 @@ class Player {
 
   void update(const Heightmap& heightmap);
 
+  PlayerShootAction getShootAction() const;
+
  private:
-  void handlePlayerPosition(const Heightmap& heightmap,const float& terrainHeight);
+  void handlePlayerPosition(const Heightmap& heightmap,
+                            const float& terrainHeight);
 
   float speed;
   Pad* pad;
diff --git a/demo/inc/states/game/player/player_shoot_action.hpp b/demo/inc/states/game/player/player_shoot_action.hpp
new file mode 100644
index 0000000..5227866
--- /dev/null
+++ b/demo/inc/states/game/player/player_shoot_action.hpp
@@ -0,0 +1,25 @@
+/*
+# _____        ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licensed under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include <tyra>
+#include <optional>
+
+using Tyra::Ray;
+
+namespace Demo {
+
+struct PlayerShootAction {
+  bool isShooting = false;
+  std::optional<Ray> ray;
+};
+
+}  // namespace Demo
diff --git a/demo/inc/states/game/player/weapon.hpp b/demo/inc/states/game/player/weapon.hpp
index f223938..9353316 100644
--- a/demo/inc/states/game/player/weapon.hpp
+++ b/demo/inc/states/game/player/weapon.hpp
@@ -10,13 +10,7 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
-#include <renderer/renderer.hpp>
-#include <engine.hpp>
-#include <pad/pad.hpp>
-#include <audio/audio.hpp>
-#include <time/timer.hpp>
+#include <tyra>
 
 using Tyra::Audio;
 using Tyra::Engine;
diff --git a/demo/inc/states/game/renderer/game_renderer.hpp b/demo/inc/states/game/renderer/game_renderer.hpp
index 99ec7c9..89888a4 100644
--- a/demo/inc/states/game/renderer/game_renderer.hpp
+++ b/demo/inc/states/game/renderer/game_renderer.hpp
@@ -10,11 +10,9 @@
 
 #pragma once
 
-#include "renderer/renderer.hpp"
-#include "renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp"
-#include "renderer/3d/pipeline/static/static_pipeline.hpp"
-#include "./renderer_dynamic_pair.hpp"
+#include <tyra>
 #include "./renderer_static_pair.hpp"
+#include "./renderer_dynamic_pair.hpp"
 
 using Tyra::DynamicPipeline;
 using Tyra::Renderer;
diff --git a/demo/inc/states/game/renderer/renderer_dynamic_pair.hpp b/demo/inc/states/game/renderer/renderer_dynamic_pair.hpp
index f6a3710..3e90e4e 100644
--- a/demo/inc/states/game/renderer/renderer_dynamic_pair.hpp
+++ b/demo/inc/states/game/renderer/renderer_dynamic_pair.hpp
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp"
-#include "renderer/3d/mesh/dynamic/dynamic_mesh.hpp"
+#include <tyra>
 
 using Tyra::DynamicMesh;
 using Tyra::DynPipOptions;
diff --git a/demo/inc/states/game/renderer/renderer_static_pair.hpp b/demo/inc/states/game/renderer/renderer_static_pair.hpp
index de1b0f2..2d1547c 100644
--- a/demo/inc/states/game/renderer/renderer_static_pair.hpp
+++ b/demo/inc/states/game/renderer/renderer_static_pair.hpp
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "renderer/3d/pipeline/static/static_pipeline.hpp"
-#include "renderer/3d/mesh/static/static_mesh.hpp"
+#include <tyra>
 
 using Tyra::StaPipOptions;
 using Tyra::StaticMesh;
diff --git a/demo/inc/states/game/ship/ship.hpp b/demo/inc/states/game/ship/ship.hpp
index 2d2db78..4b50637 100644
--- a/demo/inc/states/game/ship/ship.hpp
+++ b/demo/inc/states/game/ship/ship.hpp
@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 
 using Tyra::Renderer;
 using Tyra::StaPipOptions;
diff --git a/demo/inc/states/game/skybox/skybox.hpp b/demo/inc/states/game/skybox/skybox.hpp
index ed39b45..510b590 100644
--- a/demo/inc/states/game/skybox/skybox.hpp
+++ b/demo/inc/states/game/skybox/skybox.hpp
@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 
 using Tyra::Renderer;
 using Tyra::StaPipOptions;
diff --git a/demo/inc/states/game/terrain/heightmap.hpp b/demo/inc/states/game/terrain/heightmap.hpp
index b8e038e..d79bc53 100644
--- a/demo/inc/states/game/terrain/heightmap.hpp
+++ b/demo/inc/states/game/terrain/heightmap.hpp
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "math/vec4.hpp"
-#include "loaders/texture/png_loader.hpp"
+#include <tyra>
 
 using Tyra::Vec4;
 
diff --git a/demo/inc/states/game/terrain/terrain.hpp b/demo/inc/states/game/terrain/terrain.hpp
index fc11d68..5eb5bf4 100644
--- a/demo/inc/states/game/terrain/terrain.hpp
+++ b/demo/inc/states/game/terrain/terrain.hpp
@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 #include "./heightmap.hpp"
 
 using Tyra::StaPipOptions;
diff --git a/demo/inc/states/intro/states/intro_press_key_state.hpp b/demo/inc/states/intro/states/intro_press_key_state.hpp
index b35acc0..cbc6c44 100644
--- a/demo/inc/states/intro/states/intro_press_key_state.hpp
+++ b/demo/inc/states/intro/states/intro_press_key_state.hpp
@@ -12,8 +12,7 @@
 
 #include "state/state.hpp"
 #include "../intro_state_type.hpp"
-#include "renderer/core/2d/sprite/sprite.hpp"
-#include "time/timer.hpp"
+#include <tyra>
 
 using Tyra::Sprite;
 using Tyra::Texture;
diff --git a/demo/inc/states/intro/states/intro_ps2dev_state.hpp b/demo/inc/states/intro/states/intro_ps2dev_state.hpp
index 9274a67..4607f0e 100644
--- a/demo/inc/states/intro/states/intro_ps2dev_state.hpp
+++ b/demo/inc/states/intro/states/intro_ps2dev_state.hpp
@@ -12,8 +12,7 @@
 
 #include "state/state.hpp"
 #include "../intro_state_type.hpp"
-#include "renderer/core/2d/sprite/sprite.hpp"
-#include "time/timer.hpp"
+#include <tyra>
 
 using Tyra::Sprite;
 using Tyra::Texture;
diff --git a/demo/inc/states/intro/states/intro_tyra_state.hpp b/demo/inc/states/intro/states/intro_tyra_state.hpp
index 9714fde..f0058f6 100644
--- a/demo/inc/states/intro/states/intro_tyra_state.hpp
+++ b/demo/inc/states/intro/states/intro_tyra_state.hpp
@@ -12,8 +12,7 @@
 
 #include "state/state.hpp"
 #include "../intro_state_type.hpp"
-#include "renderer/core/2d/sprite/sprite.hpp"
-#include "time/timer.hpp"
+#include <tyra>
 
 using Tyra::Sprite;
 using Tyra::Texture;
diff --git a/demo/src/main.cpp b/demo/src/main.cpp
index 7edfd46..e6b02aa 100644
--- a/demo/src/main.cpp
+++ b/demo/src/main.cpp
@@ -8,7 +8,7 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include "engine.hpp"
+#include <tyra>
 #include "demo_game.hpp"
 
 int main() {
diff --git a/demo/src/states/game/debug_object.cpp b/demo/src/states/game/debug_object.cpp
index 3a6bc69..68a63d0 100644
--- a/demo/src/states/game/debug_object.cpp
+++ b/demo/src/states/game/debug_object.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/debug_object.hpp"
-#include <loaders/3d/obj_loader/obj_loader.hpp>
-#include <file/file_utils.hpp>
 
 using Tyra::Color;
 using Tyra::FileUtils;
diff --git a/demo/src/states/game/enemy/enemy.cpp b/demo/src/states/game/enemy/enemy.cpp
index 8ba7308..852fc5b 100644
--- a/demo/src/states/game/enemy/enemy.cpp
+++ b/demo/src/states/game/enemy/enemy.cpp
@@ -10,7 +10,6 @@
 
 #include "states/game/enemy/enemy.hpp"
 #include <functional>
-#include "debug/debug.hpp"
 
 using Tyra::Math;
 
@@ -49,7 +48,7 @@ Enemy::Enemy(Engine* engine, const EnemyInfo& t_info) {
   mesh->translation.translateY(-5.0F);
 
   audio = &engine->audio;
-  audio->adpcm.setVolume(50, info.adpcmChannel);
+  audio->adpcm.setVolume(30, info.adpcmChannel);
 
   allocateOptions();
 
diff --git a/demo/src/states/game/enemy/enemy_manager.cpp b/demo/src/states/game/enemy/enemy_manager.cpp
index 1b4a8da..e71dedd 100644
--- a/demo/src/states/game/enemy/enemy_manager.cpp
+++ b/demo/src/states/game/enemy/enemy_manager.cpp
@@ -9,10 +9,7 @@
 */
 
 #include "states/game/enemy/enemy_manager.hpp"
-#include "loaders/3d/obj_loader/obj_loader.hpp"
-#include <file/file_utils.hpp>
 #include <functional>
-#include "debug/debug.hpp"
 
 using Tyra::FileUtils;
 using Tyra::Math;
diff --git a/demo/src/states/game/game_state.cpp b/demo/src/states/game/game_state.cpp
index 96ddee6..dbcf8f4 100644
--- a/demo/src/states/game/game_state.cpp
+++ b/demo/src/states/game/game_state.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/game_state.hpp"
-#include "debug/debug.hpp"
-#include "file/file_utils.hpp"
 
 using Tyra::FileUtils;
 
diff --git a/demo/src/states/game/player/camera.cpp b/demo/src/states/game/player/camera.cpp
index 8f72ee1..f4caa66 100644
--- a/demo/src/states/game/player/camera.cpp
+++ b/demo/src/states/game/player/camera.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "states/game/player/camera.hpp"
-#include "debug/debug.hpp"
 
 namespace Demo {
 
diff --git a/demo/src/states/game/player/player.cpp b/demo/src/states/game/player/player.cpp
index 0c50bad..6446248 100644
--- a/demo/src/states/game/player/player.cpp
+++ b/demo/src/states/game/player/player.cpp
@@ -31,6 +31,12 @@ void Player::update(const Heightmap& heightmap) {
   weapon.update();
 }
 
+PlayerShootAction Player::getShootAction() const {
+  PlayerShootAction action;
+
+  return action;
+}
+
 void Player::handlePlayerPosition(const Heightmap& heightmap,
                                   const float& terrainHeight) {
   const auto& leftJoy = pad->getLeftJoyPad();
diff --git a/demo/src/states/game/player/weapon.cpp b/demo/src/states/game/player/weapon.cpp
index e835419..5f6b417 100644
--- a/demo/src/states/game/player/weapon.cpp
+++ b/demo/src/states/game/player/weapon.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/player/weapon.hpp"
-#include <loaders/3d/obj_loader/obj_loader.hpp>
-#include <file/file_utils.hpp>
 
 using Tyra::FileUtils;
 using Tyra::ObjLoader;
diff --git a/demo/src/states/game/renderer/game_renderer.cpp b/demo/src/states/game/renderer/game_renderer.cpp
index 46451d1..51344e7 100644
--- a/demo/src/states/game/renderer/game_renderer.cpp
+++ b/demo/src/states/game/renderer/game_renderer.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "states/game/renderer/game_renderer.hpp"
-#include "thread/threading.hpp"
 
 using Tyra::Threading;
 
diff --git a/demo/src/states/game/ship/ship.cpp b/demo/src/states/game/ship/ship.cpp
index efd5f96..062e1a2 100644
--- a/demo/src/states/game/ship/ship.cpp
+++ b/demo/src/states/game/ship/ship.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/ship/ship.hpp"
-#include <loaders/3d/obj_loader/obj_loader.hpp>
-#include <file/file_utils.hpp>
 
 using Tyra::FileUtils;
 using Tyra::ObjLoader;
diff --git a/demo/src/states/game/skybox/skybox.cpp b/demo/src/states/game/skybox/skybox.cpp
index aaab62c..435cd72 100644
--- a/demo/src/states/game/skybox/skybox.cpp
+++ b/demo/src/states/game/skybox/skybox.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/skybox/skybox.hpp"
-#include <loaders/3d/obj_loader/obj_loader.hpp>
-#include <file/file_utils.hpp>
 
 using Tyra::FileUtils;
 using Tyra::ObjLoader;
diff --git a/demo/src/states/game/terrain/heightmap.cpp b/demo/src/states/game/terrain/heightmap.cpp
index cda09e4..95d7506 100644
--- a/demo/src/states/game/terrain/heightmap.cpp
+++ b/demo/src/states/game/terrain/heightmap.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/terrain/heightmap.hpp"
-#include "file/file_utils.hpp"
-#include "debug/debug.hpp"
 
 using Tyra::FileUtils;
 using Tyra::PngLoader;
diff --git a/demo/src/states/game/terrain/terrain.cpp b/demo/src/states/game/terrain/terrain.cpp
index ebbb193..b4835ba 100644
--- a/demo/src/states/game/terrain/terrain.cpp
+++ b/demo/src/states/game/terrain/terrain.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/game/terrain/terrain.hpp"
-#include <loaders/3d/obj_loader/obj_loader.hpp>
-#include <file/file_utils.hpp>
 
 using Tyra::FileUtils;
 using Tyra::ObjLoader;
diff --git a/demo/src/states/intro/intro_state.cpp b/demo/src/states/intro/intro_state.cpp
index 25e35ea..1139a2c 100644
--- a/demo/src/states/intro/intro_state.cpp
+++ b/demo/src/states/intro/intro_state.cpp
@@ -9,8 +9,6 @@
 */
 
 #include "states/intro/intro_state.hpp"
-#include "file/file_utils.hpp"
-#include "debug/debug.hpp"
 
 #include "states/intro/states/intro_ps2dev_state.hpp"
 #include "states/intro/states/intro_tyra_state.hpp"
diff --git a/demo/src/states/intro/states/intro_press_key_state.cpp b/demo/src/states/intro/states/intro_press_key_state.cpp
index 59a78a0..3079869 100644
--- a/demo/src/states/intro/states/intro_press_key_state.cpp
+++ b/demo/src/states/intro/states/intro_press_key_state.cpp
@@ -9,12 +9,7 @@
 */
 
 #include "states/intro/states/intro_press_key_state.hpp"
-#include "loaders/texture/png_loader.hpp"
-#include "file/file_utils.hpp"
-#include "debug/debug.hpp"
 #include <string>
-#include "thread/threading.hpp"
-#include "math/math.hpp"
 
 using Tyra::FileUtils;
 using Tyra::Math;
diff --git a/demo/src/states/intro/states/intro_ps2dev_state.cpp b/demo/src/states/intro/states/intro_ps2dev_state.cpp
index 0f6eef4..3c10e07 100644
--- a/demo/src/states/intro/states/intro_ps2dev_state.cpp
+++ b/demo/src/states/intro/states/intro_ps2dev_state.cpp
@@ -9,10 +9,6 @@
 */
 
 #include "states/intro/states/intro_ps2dev_state.hpp"
-#include "loaders/texture/png_loader.hpp"
-#include "file/file_utils.hpp"
-#include "debug/debug.hpp"
-#include "thread/threading.hpp"
 
 using Tyra::FileUtils;
 using Tyra::PngLoader;
diff --git a/demo/src/states/intro/states/intro_tyra_state.cpp b/demo/src/states/intro/states/intro_tyra_state.cpp
index 6a98d64..96e730a 100644
--- a/demo/src/states/intro/states/intro_tyra_state.cpp
+++ b/demo/src/states/intro/states/intro_tyra_state.cpp
@@ -9,11 +9,6 @@
 */
 
 #include "states/intro/states/intro_tyra_state.hpp"
-#include "loaders/texture/png_loader.hpp"
-#include "file/file_utils.hpp"
-#include "debug/debug.hpp"
-#include "thread/threading.hpp"
-#include "math/math.hpp"
 
 using Tyra::FileUtils;
 using Tyra::Math;