diff --git a/src/gmon/src/battle.rs b/src/gmon/src/battle.rs
new file mode 100644
index 0000000..f214ac9
--- /dev/null
+++ b/src/gmon/src/battle.rs
@@ -0,0 +1,7 @@
+use ::mon::*;
+
+pub type BattleInstance = mon::battle::Instance;
+pub type BattleEngine = mon::battle::Engine;
+pub type BattleTeam = mon::battle::Team;
+pub type BattleEvent = mon::battle::Event;
+pub type BattleMove = mon::battle::Move;
diff --git a/src/gmon/src/lib.rs b/src/gmon/src/lib.rs
index 2867766..3cced7a 100755
--- a/src/gmon/src/lib.rs
+++ b/src/gmon/src/lib.rs
@@ -3,7 +3,7 @@ use godot::prelude::*;
 struct MyExtension;
 
 #[gdextension]
-unsafe impl ExtensionLibrary for MyExtension {
-}
+unsafe impl ExtensionLibrary for MyExtension {}
 
-pub mod src;
+pub mod battle;
+pub mod mon;
diff --git a/src/gmon/src/mon.rs b/src/gmon/src/mon.rs
new file mode 100644
index 0000000..6be0908
--- /dev/null
+++ b/src/gmon/src/mon.rs
@@ -0,0 +1,5 @@
+use ::mon::*;
+
+pub type MonInstance = mon::mon::Instance;
+pub type MonSpecies = mon::mon::Species;
+pub type MonDex = mon::mon::Dex;
diff --git a/src/mon/src/lib.rs b/src/mon/src/lib.rs
index aa416df..69abd8f 100755
--- a/src/mon/src/lib.rs
+++ b/src/mon/src/lib.rs
@@ -1 +1 @@
-pub mod src;
+pub mod mon;
diff --git a/src/mon/src/src.rs b/src/mon/src/mon.rs
similarity index 100%
rename from src/mon/src/src.rs
rename to src/mon/src/mon.rs