diff --git a/lib/src/css/comment.dart b/lib/src/ast/css/comment.dart
similarity index 100%
rename from lib/src/css/comment.dart
rename to lib/src/ast/css/comment.dart
diff --git a/lib/src/css/declaration.dart b/lib/src/ast/css/declaration.dart
similarity index 92%
rename from lib/src/css/declaration.dart
rename to lib/src/ast/css/declaration.dart
index a3e3d894..d73dd3e6 100644
--- a/lib/src/css/declaration.dart
+++ b/lib/src/ast/css/declaration.dart
@@ -4,7 +4,7 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../value/identifier.dart';
+import '../../value/identifier.dart';
 import 'node.dart';
 import 'value.dart';
 
diff --git a/lib/src/css/node.dart b/lib/src/ast/css/node.dart
similarity index 65%
rename from lib/src/css/node.dart
rename to lib/src/ast/css/node.dart
index 2c6b29c9..e4519b96 100644
--- a/lib/src/css/node.dart
+++ b/lib/src/ast/css/node.dart
@@ -2,8 +2,6 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'package:source_span/source_span.dart';
+import '../node.dart';
 
-abstract class CssNode {
-  SourceSpan get span;
-}
\ No newline at end of file
+abstract class CssNode extends AstNode {}
diff --git a/lib/src/css/style_rule.dart b/lib/src/ast/css/style_rule.dart
similarity index 94%
rename from lib/src/css/style_rule.dart
rename to lib/src/ast/css/style_rule.dart
index 1a5c9892..f343e54e 100644
--- a/lib/src/css/style_rule.dart
+++ b/lib/src/ast/css/style_rule.dart
@@ -4,7 +4,7 @@
 
 import 'package:source_span/source_span.dart';
 
-import '../value/identifier.dart';
+import '../../value/identifier.dart';
 import 'node.dart';
 import 'value.dart';
 
diff --git a/lib/src/css/stylesheet.dart b/lib/src/ast/css/stylesheet.dart
similarity index 100%
rename from lib/src/css/stylesheet.dart
rename to lib/src/ast/css/stylesheet.dart
diff --git a/lib/src/css/value.dart b/lib/src/ast/css/value.dart
similarity index 94%
rename from lib/src/css/value.dart
rename to lib/src/ast/css/value.dart
index 1c7a813a..5fec8994 100644
--- a/lib/src/css/value.dart
+++ b/lib/src/ast/css/value.dart
@@ -5,7 +5,7 @@
 import 'package:source_span/source_span.dart';
 
 import 'node.dart';
-import '../value.dart';
+import '../../value.dart';
 
 class CssValue<T extends Value> implements CssNode {
   final T value;