diff --git a/immediate_stats_macros/src/bevy.rs b/immediate_stats_macros/src/bevy.rs
deleted file mode 100644
index 25b1eaa..0000000
--- a/immediate_stats_macros/src/bevy.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(feature = "bevy_butler")]
-pub mod butler;
diff --git a/immediate_stats_macros/src/bevy/butler.rs b/immediate_stats_macros/src/bevy_butler.rs
similarity index 98%
rename from immediate_stats_macros/src/bevy/butler.rs
rename to immediate_stats_macros/src/bevy_butler.rs
index 10f797a..5a9f1ac 100644
--- a/immediate_stats_macros/src/bevy/butler.rs
+++ b/immediate_stats_macros/src/bevy_butler.rs
@@ -4,7 +4,8 @@ use proc_macro2::{Ident, TokenStream};
 use quote::{ToTokens, format_ident, quote};
 use syn::{DeriveInput, Expr, Meta, Path};
 
-// Todo Fix error handling and add documentation.
+// Todo Add documentation.
+
 pub fn register_systems(input: DeriveInput) -> darling::Result<TokenStream> {
     let struct_name = &input.ident;
 
diff --git a/immediate_stats_macros/src/lib.rs b/immediate_stats_macros/src/lib.rs
index aef4a35..b40233b 100644
--- a/immediate_stats_macros/src/lib.rs
+++ b/immediate_stats_macros/src/lib.rs
@@ -1,5 +1,5 @@
-#[cfg(feature = "bevy")]
-mod bevy;
+#[cfg(feature = "bevy_butler")]
+mod bevy_butler;
 
 use proc_macro_error::{
     emit_call_site_error, emit_call_site_warning, emit_warning, proc_macro_error,
@@ -22,7 +22,7 @@ pub fn stat_container_derive(item: proc_macro::TokenStream) -> proc_macro::Token
         Data::Struct(s) => stat_container_struct(s),
         Data::Enum(e) => stat_container_enum(e),
         Data::Union(_) => {
-            emit_call_site_error!("This trait cannot be derived for unions.");
+            emit_call_site_error!("This trait cannot be derived from unions.");
             return proc_macro::TokenStream::new();
         }
     };
@@ -35,7 +35,7 @@ pub fn stat_container_derive(item: proc_macro::TokenStream) -> proc_macro::Token
 
     #[cfg(feature = "bevy_butler")]
     {
-        let systems = bevy::butler::register_systems(tree);
+        let systems = bevy_butler::register_systems(tree);
 
         match systems {
             Ok(systems) => quote! { #result #systems }.into(),