diff --git a/src/damagable/enemy.rs b/src/damagable/enemy.rs
deleted file mode 100644
index e19177b..0000000
--- a/src/damagable/enemy.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use bevy::ecs::component::Component;
-
-#[derive(Component)]
-pub struct Enemy;
diff --git a/src/damagable/mod.rs b/src/damagable/mod.rs
deleted file mode 100644
index deb9cf6..0000000
--- a/src/damagable/mod.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use bevy::prelude::*;
-
-use crate::{
-    collision::{Collided, Collider},
-    damagable::{
-        enemy::Enemy,
-        player::{Player, player_movement_system},
-    },
-};
-
-pub mod enemy;
-pub mod player;
-
-pub struct DamagablePlugin;
-
-impl Plugin for DamagablePlugin {
-    fn build(&self, app: &mut App) {
-        app.insert_resource(Time::<Fixed>::from_hz(60.0))
-            .add_systems(Startup, setup)
-            .add_systems(
-                FixedUpdate,
-                (player_movement_system, movement_system).chain(),
-            );
-    }
-}
-
-#[derive(Component)]
-pub struct Damagable {
-    hp: u32,
-}
-
-#[derive(Component)]
-pub struct Movable {
-    linear_speed: f32,
-    rotation_speed: f32,
-    max_linear_speed: f32,
-    max_rotation_speed: f32,
-}
-
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let player_sprite: Handle<Image> = asset_server.load("player.png");
-    let enemy_sprite: Handle<Image> = asset_server.load("enemy.png");
-
-    commands.spawn(Camera2d);
-
-    //Create player
-    commands.spawn((
-        Player { acceleration: 100. },
-        Movable {
-            linear_speed: 0.,
-            rotation_speed: 0.,
-            max_linear_speed: 500.,
-            max_rotation_speed: f32::to_radians(360.),
-        },
-        Damagable { hp: 10 },
-        Sprite::from_image(player_sprite),
-        Transform::from_xyz(20., 20., 0.),
-        Collider::new(8.),
-    ));
-
-    commands.spawn((
-        Enemy,
-        Movable {
-            linear_speed: 0.,
-            rotation_speed: 0.,
-            max_linear_speed: 500.,
-            max_rotation_speed: f32::to_radians(360.),
-        },
-        Damagable { hp: 10 },
-        Sprite::from_image(enemy_sprite),
-        Transform::from_xyz(0., 0., 0.),
-        Collider::new(8.),
-    ));
-}
-
-fn movement_system(time: Res<Time>, query: Query<(&Movable, &mut Transform)>) {
-    for (movable, mut transform) in query {
-        transform.rotate_z(movable.rotation_speed * time.delta_secs());
-        let movement_direction = transform.rotation * Vec3::X;
-        let movement_distance = movable.linear_speed * time.delta_secs();
-        let translation_delta = movement_direction * movement_distance;
-
-        transform.translation += translation_delta;
-
-        //TODO: Loop on bounds
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 381cd0d..85bb5fb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,18 @@
 use bevy::prelude::*;
 
-use crate::collision::{Collided, Collider, CollisionPlugin};
-use crate::damagable::DamagablePlugin;
+use crate::collision::CollisionPlugin;
+use crate::movable::MovablePlugin;
+use crate::ships::ShipsPlugin;
 
 mod collision;
-mod damagable;
+mod movable;
+mod ships;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(DamagablePlugin)
+        .add_plugins(MovablePlugin)
         .add_plugins(CollisionPlugin)
+        .add_plugins(ShipsPlugin)
         .run();
 }
diff --git a/src/movable.rs b/src/movable.rs
new file mode 100644
index 0000000..4fcd820
--- /dev/null
+++ b/src/movable.rs
@@ -0,0 +1,42 @@
+use bevy::prelude::*;
+
+pub struct MovablePlugin;
+
+impl Plugin for MovablePlugin {
+    fn build(&self, app: &mut App) {
+        app.insert_resource(Time::<Fixed>::from_hz(60.0))
+            .add_systems(FixedUpdate, movement_system);
+    }
+}
+
+#[derive(Component)]
+pub struct Movable {
+    pub linear_speed: f32,
+    pub rotation_speed: f32,
+    pub max_linear_speed: f32,
+    pub max_rotation_speed: f32,
+}
+
+impl Movable {
+    pub fn new(max_linear_speed: f32, max_rotation_speed: f32) -> Movable {
+        Movable {
+            linear_speed: 0.,
+            rotation_speed: 0.,
+            max_linear_speed: max_linear_speed,
+            max_rotation_speed: max_rotation_speed,
+        }
+    }
+}
+
+fn movement_system(time: Res<Time>, query: Query<(&Movable, &mut Transform)>) {
+    for (movable, mut transform) in query {
+        transform.rotate_z(movable.rotation_speed * time.delta_secs());
+        let movement_direction = transform.rotation * Vec3::X;
+        let movement_distance = movable.linear_speed * time.delta_secs();
+        let translation_delta = movement_direction * movement_distance;
+
+        transform.translation += translation_delta;
+
+        //TODO: Loop on bounds
+    }
+}
diff --git a/src/ships/enemy.rs b/src/ships/enemy.rs
new file mode 100644
index 0000000..735dde1
--- /dev/null
+++ b/src/ships/enemy.rs
@@ -0,0 +1,16 @@
+use bevy::prelude::*;
+
+use crate::{collision::Collider, movable::Movable};
+
+#[derive(Component)]
+pub struct Enemy;
+
+pub fn spawn_enemy(commands: &mut Commands, sprite: Handle<Image>, at: Vec2) {
+    commands.spawn((
+        Enemy,
+        Collider::new(8.),
+        Movable::new(500., f32::to_radians(360.)),
+        Sprite::from(sprite),
+        Transform::from_xyz(at.x, at.y, 0.),
+    ));
+}
diff --git a/src/ships/mod.rs b/src/ships/mod.rs
new file mode 100644
index 0000000..ba5e6df
--- /dev/null
+++ b/src/ships/mod.rs
@@ -0,0 +1,24 @@
+use bevy::prelude::*;
+
+pub mod enemy;
+pub mod player;
+
+pub struct ShipsPlugin;
+
+impl Plugin for ShipsPlugin {
+    fn build(&self, app: &mut bevy::app::App) {
+        app.insert_resource(Time::<Fixed>::from_hz(60.))
+            .add_systems(Startup, startup)
+            .add_systems(FixedUpdate, player::player_movement_system);
+    }
+}
+
+fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    let player_sprite: Handle<Image> = asset_server.load("player.png");
+    let enemy_sprite: Handle<Image> = asset_server.load("enemy.png");
+
+    commands.spawn(Camera2d);
+
+    player::spawn_player(&mut commands, player_sprite, Vec2::new(0., 0.));
+    enemy::spawn_enemy(&mut commands, enemy_sprite.clone(), Vec2::new(100., 100.));
+}
diff --git a/src/damagable/player.rs b/src/ships/player.rs
similarity index 73%
rename from src/damagable/player.rs
rename to src/ships/player.rs
index 39f22b9..d961b85 100644
--- a/src/damagable/player.rs
+++ b/src/ships/player.rs
@@ -1,4 +1,4 @@
-use crate::damagable::Movable;
+use crate::{collision::Collider, movable::Movable};
 use bevy::prelude::*;
 
 #[derive(Component)]
@@ -6,6 +6,16 @@ pub struct Player {
     pub(super) acceleration: f32,
 }
 
+pub fn spawn_player(commands: &mut Commands, sprite: Handle<Image>, at: Vec2) {
+    commands.spawn((
+        Player { acceleration: 100. },
+        Collider::new(8.),
+        Movable::new(500., f32::to_radians(360.)),
+        Sprite::from(sprite),
+        Transform::from_xyz(at.x, at.y, 0.),
+    ));
+}
+
 pub(super) fn player_movement_system(
     time: Res<Time>,
     keyboard_input: Res<ButtonInput<KeyCode>>,