diff --git a/crates/swc_css_parser/src/parser/at_rule.rs b/crates/swc_css_parser/src/parser/at_rules/mod.rs
similarity index 99%
rename from crates/swc_css_parser/src/parser/at_rule.rs
rename to crates/swc_css_parser/src/parser/at_rules/mod.rs
index b8130122ad06..3ea79175591c 100644
--- a/crates/swc_css_parser/src/parser/at_rule.rs
+++ b/crates/swc_css_parser/src/parser/at_rules/mod.rs
@@ -4,7 +4,7 @@ use swc_css_ast::*;
 use super::{input::ParserInput, PResult, Parser};
 use crate::{
     error::{Error, ErrorKind},
-    parser::{value::is_math_function, BlockContentsGrammar, Ctx},
+    parser::{values_and_units::is_math_function, BlockContentsGrammar, Ctx},
     Parse,
 };
 
diff --git a/crates/swc_css_parser/src/parser/mod.rs b/crates/swc_css_parser/src/parser/mod.rs
index c9d9d9bd0e75..edef347ecf1c 100644
--- a/crates/swc_css_parser/src/parser/mod.rs
+++ b/crates/swc_css_parser/src/parser/mod.rs
@@ -8,14 +8,14 @@ use crate::{error::Error, Parse};
 
 #[macro_use]
 mod macros;
-mod at_rule;
-mod base;
+mod at_rules;
 pub mod input;
-mod selector;
+mod selectors;
+mod syntax;
 #[cfg(test)]
 mod tests;
 mod util;
-mod value;
+mod values_and_units;
 
 pub type PResult<T> = Result<T, Error>;
 
diff --git a/crates/swc_css_parser/src/parser/selector/tests.rs b/crates/swc_css_parser/src/parser/selector/tests.rs
deleted file mode 100644
index 87c2771955a9..000000000000
--- a/crates/swc_css_parser/src/parser/selector/tests.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(test)]
-mod tests;
diff --git a/crates/swc_css_parser/src/parser/selector/mod.rs b/crates/swc_css_parser/src/parser/selectors/mod.rs
similarity index 100%
rename from crates/swc_css_parser/src/parser/selector/mod.rs
rename to crates/swc_css_parser/src/parser/selectors/mod.rs
diff --git a/crates/swc_css_parser/src/parser/base.rs b/crates/swc_css_parser/src/parser/syntax/mod.rs
similarity index 100%
rename from crates/swc_css_parser/src/parser/base.rs
rename to crates/swc_css_parser/src/parser/syntax/mod.rs
diff --git a/crates/swc_css_parser/src/parser/value/tests.rs b/crates/swc_css_parser/src/parser/value/tests.rs
deleted file mode 100644
index 8b137891791f..000000000000
--- a/crates/swc_css_parser/src/parser/value/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/crates/swc_css_parser/src/parser/value/mod.rs b/crates/swc_css_parser/src/parser/values_and_units/mod.rs
similarity index 99%
rename from crates/swc_css_parser/src/parser/value/mod.rs
rename to crates/swc_css_parser/src/parser/values_and_units/mod.rs
index ed8d880df22f..5c05a071c56d 100644
--- a/crates/swc_css_parser/src/parser/value/mod.rs
+++ b/crates/swc_css_parser/src/parser/values_and_units/mod.rs
@@ -6,8 +6,6 @@ use crate::{
     error::{Error, ErrorKind},
     Parse,
 };
-#[cfg(test)]
-mod tests;
 
 impl<I> Parser<I>
 where