diff --git a/src/phonenumberutil/generated/metadata.rs b/src/generated/metadata/metadata.rs
similarity index 100%
rename from src/phonenumberutil/generated/metadata.rs
rename to src/generated/metadata/metadata.rs
diff --git a/src/generated/metadata/mod.rs b/src/generated/metadata/mod.rs
new file mode 100644
index 0000000..a9c78b6
--- /dev/null
+++ b/src/generated/metadata/mod.rs
@@ -0,0 +1,6 @@
+mod metadata;
+mod test_metadata;
+
+pub use metadata::METADATA;
+pub use test_metadata::TEST_METADATA;
+
diff --git a/src/phonenumberutil/generated/test_metadata.rs b/src/generated/metadata/test_metadata.rs
similarity index 100%
rename from src/phonenumberutil/generated/test_metadata.rs
rename to src/generated/metadata/test_metadata.rs
diff --git a/src/generated/mod.rs b/src/generated/mod.rs
new file mode 100644
index 0000000..b186c5f
--- /dev/null
+++ b/src/generated/mod.rs
@@ -0,0 +1,2 @@
+pub mod proto;
+pub mod metadata;
diff --git a/src/proto_gen/mod.rs b/src/generated/proto/mod.rs
similarity index 100%
rename from src/proto_gen/mod.rs
rename to src/generated/proto/mod.rs
diff --git a/src/interfaces/mod.rs b/src/interfaces/mod.rs
index 38ed1be..debf76d 100644
--- a/src/interfaces/mod.rs
+++ b/src/interfaces/mod.rs
@@ -1,5 +1,5 @@
 
-use crate::proto_gen::phonemetadata::PhoneNumberDesc;
+use crate::phonemetadata::PhoneNumberDesc;
 /// Internal phonenumber matching API used to isolate the underlying
 /// implementation of the matcher and allow different implementations to be
 /// swapped in easily.
diff --git a/src/lib.rs b/src/lib.rs
index e3d6aa3..35f5eb0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 mod shortnumberinfo;
 mod interfaces;
 /// This module is automatically generated from /resources/*.proto
-mod proto_gen;
+mod generated;
 mod phonenumberutil;
 mod regexp_cache;
 mod regex_based_matcher;
@@ -30,6 +30,6 @@ pub use phonenumberutil::{
     errors,
     enums,
 };
-pub use proto_gen::phonemetadata;
-pub use proto_gen::phonenumber;
+pub use generated::proto::phonemetadata;
+pub use generated::proto::phonenumber;
 mod tests;
diff --git a/src/phonenumberutil/generated/mod.rs b/src/phonenumberutil/generated/mod.rs
deleted file mode 100644
index 6c7373e..0000000
--- a/src/phonenumberutil/generated/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod metadata;
-pub mod test_metadata;
-
diff --git a/src/phonenumberutil/helper_functions.rs b/src/phonenumberutil/helper_functions.rs
index 35a2e73..fa16df3 100644
--- a/src/phonenumberutil/helper_functions.rs
+++ b/src/phonenumberutil/helper_functions.rs
@@ -4,10 +4,10 @@ use protobuf::Message;
 use strum::IntoEnumIterator;
 
 use crate::{
-    interfaces::MatcherApi, phonenumberutil::generated::metadata::METADATA, proto_gen::{
+    interfaces::MatcherApi, generated::metadata::METADATA, 
         phonemetadata::{PhoneMetadata, PhoneMetadataCollection, PhoneNumberDesc},
         phonenumber::PhoneNumber,
-    }
+    
 };
 
 use super::{
diff --git a/src/phonenumberutil/helper_types.rs b/src/phonenumberutil/helper_types.rs
index a24d5ad..23905cf 100644
--- a/src/phonenumberutil/helper_types.rs
+++ b/src/phonenumberutil/helper_types.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::proto_gen::phonenumber::phone_number::CountryCodeSource;
+use crate::phonenumber::phone_number::CountryCodeSource;
 
 #[derive(Debug)]
 pub struct PhoneNumberWithCountryCodeSource<'a> {
diff --git a/src/phonenumberutil/mod.rs b/src/phonenumberutil/mod.rs
index 7aa9989..21d2abb 100644
--- a/src/phonenumberutil/mod.rs
+++ b/src/phonenumberutil/mod.rs
@@ -6,7 +6,6 @@ pub mod phonenumberutil;
 mod phone_number_regexps_and_mappings;
 pub(self) mod helper_types;
 pub(self) mod comparisons;
-pub(crate) mod generated;
 
 use std::sync::LazyLock;
 
diff --git a/src/phonenumberutil/phonenumberutil.rs b/src/phonenumberutil/phonenumberutil.rs
index d184ae2..926a84c 100644
--- a/src/phonenumberutil/phonenumberutil.rs
+++ b/src/phonenumberutil/phonenumberutil.rs
@@ -37,10 +37,10 @@ use crate::{
             prefix_number_with_country_calling_code, test_number_length,
             test_number_length_with_unknown_type,
         }, helper_types::{PhoneNumberAndCarrierCode, PhoneNumberWithCountryCodeSource}, MatchType, PhoneNumberFormat, PhoneNumberType, ValidNumberLenType
-    }, proto_gen::{
-        phonemetadata::{NumberFormat, PhoneMetadata, PhoneNumberDesc},
-        phonenumber::{phone_number::CountryCodeSource, PhoneNumber},
-    }, regex_based_matcher::RegexBasedMatcher, regex_util::{RegexConsume, RegexFullMatch}, regexp_cache::ErrorInvalidRegex, string_util::strip_cow_prefix
+    }, 
+    phonemetadata::{NumberFormat, PhoneMetadata, PhoneNumberDesc},
+    phonenumber::{phone_number::CountryCodeSource, PhoneNumber},
+    regex_based_matcher::RegexBasedMatcher, regex_util::{RegexConsume, RegexFullMatch}, regexp_cache::ErrorInvalidRegex, string_util::strip_cow_prefix
 };
 
 use dec_from_char::DecimalExtended;
diff --git a/src/regex_based_matcher.rs b/src/regex_based_matcher.rs
index baa05a1..fcd9e12 100644
--- a/src/regex_based_matcher.rs
+++ b/src/regex_based_matcher.rs
@@ -1,7 +1,7 @@
 use log::{error};
 use super::regex_util::{RegexFullMatch, RegexConsume};
 
-use crate::{interfaces, proto_gen::phonemetadata::PhoneNumberDesc, regexp_cache::{ErrorInvalidRegex, RegexCache}};
+use crate::{interfaces, phonemetadata::PhoneNumberDesc, regexp_cache::{ErrorInvalidRegex, RegexCache}};
 
 pub struct RegexBasedMatcher {
     cache: RegexCache,   
diff --git a/src/tests/tests.rs b/src/tests/tests.rs
index 104ef88..88a0a33 100644
--- a/src/tests/tests.rs
+++ b/src/tests/tests.rs
@@ -17,7 +17,7 @@ use crate::{
 };
 
 use super::region_code::RegionCode;
-use crate::phonenumberutil::generated::test_metadata::TEST_METADATA;
+use crate::generated::metadata::TEST_METADATA;
 
 fn get_phone_util() -> PhoneNumberUtil {
     let metadata = PhoneMetadataCollection::parse_from_bytes(&TEST_METADATA)
diff --git a/tools/scripts/generate_metadata.sh b/tools/scripts/generate_metadata.sh
index 243bb33..c48d46c 100644
--- a/tools/scripts/generate_metadata.sh
+++ b/tools/scripts/generate_metadata.sh
@@ -3,7 +3,7 @@
 filedir="./$(dirname "$0")"
 javadir="$filedir/../java"
 project_home="$filedir/../.."
-generated_dir="$project_home/src/phonenumberutil/generated"
+generated_dir="$project_home/src/generated/metadata"
 echo $generated_dir
 
 resources_dir="$project_home/resources"
@@ -28,6 +28,9 @@ generate "PhoneNumberMetadata.xml" "metadata" "metadata" "METADATA"
 generate "PhoneNumberMetadataForTesting.xml" "test_metadata" "metadata" "TEST_METADATA"
 
 echo "\
-pub mod metadata;
-pub mod test_metadata;
+mod metadata;
+mod test_metadata;
+
+pub use metadata::METADATA;
+pub use test_metadata::TEST_METADATA;
 " > "$generated_dir/mod.rs"
\ No newline at end of file